From 97785d23229eaecc95502071ab44b84114f6a077 Mon Sep 17 00:00:00 2001
From: nisdas <nish1993@hotmail.com>
Date: Wed, 16 May 2018 01:12:58 +0800
Subject: [PATCH] sharding: Cleaning up (#92)

Former-commit-id: be930e31eea223934f0fa9aea28e306817746bc1 [formerly e8988d068f485c08bd3b30b6c53a39ce60864ac6]
Former-commit-id: 6d2dbb09d7fb965ee202c9834526f28a0be58ae8
---
 sharding/collation.go | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/sharding/collation.go b/sharding/collation.go
index 56367e39e..4948674cb 100644
--- a/sharding/collation.go
+++ b/sharding/collation.go
@@ -94,9 +94,9 @@ func (c *Collation) Body() []byte { return c.body }
 
 // Transactions returns an array of tx's in the collation.
 var (
-	collationsizelimit = int64(math.Pow(float64(2), float64(20)))
+	collationSizelimit = int64(math.Pow(float64(2), float64(20)))
 	chunkSize          = int64(32)
-	numberOfChunks     = collationsizelimit / chunkSize
+	numberOfChunks     = collationSizelimit / chunkSize
 )
 
 // Transactions returns an array of tx's in the collation.
@@ -159,30 +159,31 @@ func (c *Collation) Serialize() ([]byte, error) {
 		return nil, fmt.Errorf("%v", err)
 	}
 
-	serializedtx, err := utils.Serialize(blobs)
+	serializedTx, err := utils.Serialize(blobs)
 
 	if err != nil {
 		return nil, fmt.Errorf("%v", err)
 	}
 
-	if int64(len(serializedtx)) > collationsizelimit {
-		serializedtx = serializedtx[0:collationsizelimit]
+	if int64(len(serializedTx)) > collationSizelimit {
+
+		return nil, fmt.Errorf("The serialized body exceeded the collation size limit", serializedTx)
 
 	}
 
-	return serializedtx, nil
+	return serializedTx, nil
 
 }
 
 // Deserialize takes a byte array and converts its back to its original transactions.
-func (c *Collation) Deserialize(serialisedblob []byte) error {
+func (c *Collation) Deserialize(serialisedBlob []byte) error {
 
-	deserializedblobs, err := utils.Deserialize(serialisedblob)
+	deserializedBlobs, err := utils.Deserialize(serialisedBlob)
 	if err != nil {
 		return fmt.Errorf("%v", err)
 	}
 
-	err = c.ConvertBacktoTx(deserializedblobs)
+	err = c.ConvertBacktoTx(deserializedBlobs)
 
 	if err != nil {
 		return fmt.Errorf("%v", err)