SerializationException + other minor serialization changed

Involves dartcoin#2

Author: stevenroose

lib/core/core.dart

@@ -36,9 +36,12 @@ import "package:cipher/modes/cbc.dart";
 part "../src/core/utils.dart";
 part "../src/core/units.dart";
 part "../src/core/sha256hash.dart";
-part "../src/core/varint.dart";
-part "../src/core/varstr.dart";
-part "../src/core/bitcoin_serialization.dart";
+
+// serialization
+part "../src/serialization/varint.dart";
+part "../src/serialization/varstr.dart";
+part "../src/serialization/bitcoin_serialization.dart";
+part "../src/serialization/serialization_exception.dart";
 
 // addresses and private keys
 part "../src/core/address.dart";

lib/src/core/bloom_filter.dart

@@ -113,11 +113,11 @@ class BloomFilter extends Object with BitcoinSerialization {
     _data = bytes.sublist(offset, offset + size.value);
     offset += size.value;
     if (_data.length > MAX_FILTER_SIZE)
-      throw new Exception ("Bloom filter out of size range.");
+      throw new SerializationException("Bloom filter out of size range.");
     _hashFuncs = Utils.bytesToUintLE(bytes.sublist(offset), 4);
     offset += 4;
     if (_hashFuncs > MAX_HASH_FUNCS)
-      throw new Exception("Bloom filter hash function count out of range");
+      throw new SerializationException("Bloom filter hash function count out of range");
     _nTweak = Utils.bytesToUintLE(bytes.sublist(offset), 4);
     offset += 4;
     _nFlags = bytes[offset];

lib/src/core/transaction_outpoint.dart

@@ -48,8 +48,8 @@ class TransactionOutPoint extends Object with BitcoinSerialization {
 
   @override
   operator ==(TransactionOutPoint other) {
-    if(!(other is TransactionOutPoint)) return false;
-    return txid == other.txid &&
+    return other is TransactionOutPoint &&
+        txid == other.txid &&
         index == other.index &&
         (transaction == null || other.transaction == null || transaction == other.transaction);
   }

lib/src/core/transaction_output.dart

@@ -60,8 +60,8 @@ class TransactionOutput extends Object with BitcoinSerialization {
 
   @override
   operator ==(TransactionOutput other) {
-    if(!(other is TransactionOutput)) return false;
-    return value == other.value &&
+    return other is TransactionOutput &&
+        value == other.value &&
         scriptPubKey == other.scriptPubKey &&
         (parentTransaction == null || other.parentTransaction == null || parentTransaction == other.parentTransaction);
   }

lib/src/core/bitcoin_serialization.dart lib/src/serialization/bitcoin_serialization.dart

@@ -0,0 +1,9 @@
+part of dartcoin.core;
+
+class SerializationException implements Exception {
+  
+  final String message;
+  
+  SerializationException([String this.message]);
+  
+}

lib/src/serialization/serialization_exception.dart

@@ -68,13 +68,13 @@ abstract class Message extends Object with BitcoinSerialization {
    * - verifies the command string from the serialization with [message.command]
    *    (TODO it might be a possibility to make it possible to skip this check when it has already been performed)
    */
-  static int _preparePayloadSerialization(Uint8List bytes, Message message) {
+  static int _preparePayloadDeserialization(Uint8List bytes, Message message) {
     if(bytes.length < 16) 
-      throw new Exception("Cannot deserialize because serialization is too short.");
+      throw new SerializationException("Cannot deserialize because serialization is too short.");
     message._magic = Utils.bytesToUintLE(bytes, 4);
     String cmd = _parseCommand(bytes.sublist(4, HEADER_LENGTH));
     if(cmd != message.command)
-      throw new Exception("Deserialization error: serialization belongs to different message type.");
+      throw new SerializationException("Deserialization error: serialization belongs to different message type.");
     return HEADER_LENGTH;
   }
 
@@ -110,7 +110,7 @@ abstract class Message extends Object with BitcoinSerialization {
 
   Uint8List _serialize() {
     if(command.length > 12)
-      throw new Exception("Command length should not be greater than 12.");
+      throw new SerializationException("Command length should not be greater than 12.");
     List<int> result = new List<int>();
     // the magic value
     result.addAll(Utils.uintToBytesLE(magic, 4));

lib/src/core/varint.dart lib/src/serialization/varint.dart

@@ -17,7 +17,7 @@ class BlockMessage extends Message {
           new BitcoinSerialization.deserialize(new BlockMessage(null), bytes, length: length, lazy: lazy, params: params, protocolVersion: protocolVersion);
 
   int _deserialize(Uint8List bytes) {
-    int offset = Message._preparePayloadSerialization(bytes, this);
+    int offset = Message._preparePayloadDeserialization(bytes, this);
     _block = new Block.deserialize(bytes.sublist(offset), lazy: false);
     offset += _block.serializationLength;
     return offset;

lib/src/core/varstr.dart lib/src/serialization/varstr.dart

@@ -21,7 +21,7 @@ class FilterAddMessage extends Message {
           new BitcoinSerialization.deserialize(new FilterAddMessage(null), bytes, length: length, lazy: lazy, params: params, protocolVersion: protocolVersion);
 
   int _deserialize(Uint8List bytes) {
-    int offset = Message._preparePayloadSerialization(bytes, this);
+    int offset = Message._preparePayloadDeserialization(bytes, this);
     VarInt dataSize = new VarInt.deserialize(bytes, lazy: false);
     offset += dataSize.size;
     _data = bytes.sublist(offset, offset + dataSize.value);

lib/src/wire/message.dart

@@ -8,7 +8,7 @@ class FilterClearMessage extends Message {
       new BitcoinSerialization.deserialize(new FilterClearMessage(), bytes, length: length, lazy: lazy, params: params, protocolVersion: protocolVersion);
 
   int _deserialize(Uint8List bytes) {
-    int offset = Message._preparePayloadSerialization(bytes, this);
+    int offset = Message._preparePayloadDeserialization(bytes, this);
     return offset;
   }
 

lib/src/wire/messages/block_message.dart

@@ -17,7 +17,7 @@ class FilterLoadMessage extends Message {
   }
 
   int _deserialize(Uint8List bytes) {
-    int offset = Message._preparePayloadSerialization(bytes, this);
+    int offset = Message._preparePayloadDeserialization(bytes, this);
     _filter = new BloomFilter.deserialize(bytes.sublist(offset), lazy: false);
     offset += _filter.serializationLength;
     return offset;

lib/src/wire/messages/filteradd_message.dart

@@ -8,7 +8,7 @@ class GetAddrMessage extends Message {
           new BitcoinSerialization.deserialize(new GetAddrMessage(), bytes, length: Message.HEADER_LENGTH, lazy: lazy, params: params, protocolVersion: protocolVersion);
 
   int _deserialize(Uint8List bytes) {
-    int offset = Message._preparePayloadSerialization(bytes, this);
+    int offset = Message._preparePayloadDeserialization(bytes, this);
     return offset;
   }
 

lib/src/wire/messages/filterclear_message.dart

@@ -18,7 +18,7 @@ class HeadersMessage extends Message {
 
   //TODO there's something phishy with the 80 vs 81 block header size
   int _deserialize(Uint8List bytes) {
-    int offset = Message._preparePayloadSerialization(bytes, this);
+    int offset = Message._preparePayloadDeserialization(bytes, this);
     VarInt nbHeaders = new VarInt.deserialize(bytes.sublist(offset), lazy: false);
     offset += nbHeaders.size;
     _headers = new List<Block>(nbHeaders.value);

lib/src/wire/messages/filterload_message.dart

@@ -17,7 +17,7 @@ abstract class InventoryItemContainerMessage extends Message {
   }
 
   int _deserialize(Uint8List bytes) {
-    int offset = Message._preparePayloadSerialization(bytes, this);
+    int offset = Message._preparePayloadDeserialization(bytes, this);
     VarInt nbItems = new VarInt.deserialize(bytes.sublist(offset));
     offset += nbItems.size;
     _items = new List<InventoryItem>();

lib/src/wire/messages/getaddr_message.dart

@@ -8,7 +8,7 @@ class MemPoolMessage extends Message {
       new BitcoinSerialization.deserialize(new MemPoolMessage(), bytes, length: length, lazy: lazy, params: params, protocolVersion: protocolVersion);
 
   int _deserialize(Uint8List bytes) {
-    int offset = Message._preparePayloadSerialization(bytes, this);
+    int offset = Message._preparePayloadDeserialization(bytes, this);
     return offset;
   }
 

lib/src/wire/messages/headers_message.dart

@@ -17,7 +17,7 @@ class MerkleBlockMessage extends Message {
   }
 
   int _deserialize(Uint8List bytes) {
-    int offset = Message._preparePayloadSerialization(bytes, this);
+    int offset = Message._preparePayloadDeserialization(bytes, this);
     _block = new FilteredBlock.deserialize(bytes.sublist(offset), lazy: false);
     offset += _block.serializationLength;
     return offset;

lib/src/wire/messages/inventory_item_container_message.dart

@@ -28,7 +28,7 @@ class PingMessage extends Message {
   }
 
   int _deserialize(Uint8List bytes) {
-    int offset = Message._preparePayloadSerialization(bytes, this);
+    int offset = Message._preparePayloadDeserialization(bytes, this);
     _nonce = Utils.bytesToUintLE(bytes.sublist(offset), 8);
     offset += 8;
     return offset;

lib/src/wire/messages/mempool_message.dart

@@ -30,7 +30,7 @@ class PongMessage extends Message {
   }
 
   int _deserialize(Uint8List bytes) {
-    int offset = Message._preparePayloadSerialization(bytes, this);
+    int offset = Message._preparePayloadDeserialization(bytes, this);
     _nonce = Utils.bytesToUintLE(bytes.sublist(offset), 8);
     offset += 8;
     return offset;

lib/src/wire/messages/merkleblock_message.dart

@@ -30,10 +30,10 @@ abstract class RequestMessage extends Message {
   }
 
   int _deserialize(Uint8List bytes) {
-    int offset = Message._preparePayloadSerialization(bytes, this);
+    int offset = Message._preparePayloadDeserialization(bytes, this);
     int version = Utils.bytesToUintLE(bytes.sublist(offset), 4);
     if(version != _VERSION)
-      throw new Exception("Version mismatch!");
+      throw new SerializationException("Version mismatch!");
     offset += 4;
     VarInt nbLocators = new VarInt.deserialize(bytes.sublist(offset));
     offset += nbLocators.size;

lib/src/wire/messages/ping_message.dart

@@ -17,7 +17,7 @@ class TxMessage extends Message {
   }
 
   int _deserialize(Uint8List bytes) {
-    int offset = Message._preparePayloadSerialization(bytes, this);
+    int offset = Message._preparePayloadDeserialization(bytes, this);
     _tx = new Transaction.deserialize(bytes.sublist(offset), lazy: false);
     offset += _tx.serializationLength;
     return offset; 

lib/src/wire/messages/pong_message.dart

@@ -8,7 +8,7 @@ class VerackMessage extends Message {
           new BitcoinSerialization.deserialize(new VerackMessage(), bytes, length: Message.HEADER_LENGTH, lazy: lazy, params: params, protocolVersion: protocolVersion);
 
   int _deserialize(Uint8List bytes) {
-    int offset = Message._preparePayloadSerialization(bytes, this);
+    int offset = Message._preparePayloadDeserialization(bytes, this);
     return offset;
   }
 

lib/src/wire/messages/request_message.dart

@@ -127,7 +127,7 @@ class VersionMessage extends Message {
   }
 
   int _deserialize(Uint8List bytes) {
-    int offset = Message._preparePayloadSerialization(bytes, this);
+    int offset = Message._preparePayloadDeserialization(bytes, this);
     clientVersion = Utils.bytesToUintLE(bytes, 4);
     offset += 4;
     services = Utils.bytesToUBigIntLE(bytes.sublist(offset), 8);