Use 'params=None' approach for params parameter

in to_bytes() and stream_deaerialize()

Author: Flowdalic

bitcoin/messages.py

@@ -33,7 +33,7 @@
 from bitcoin.core import *
 from bitcoin.core.serialize import *
 from bitcoin.net import *
-from bitcoin import MainParams
+import bitcoin
 
 MSG_TX = 1
 MSG_BLOCK = 2
@@ -51,7 +51,9 @@ def msg_ser(self, f):
     def msg_deser(cls, f, protover=PROTO_VERSION):
         raise NotImplementedError
 
-    def to_bytes(self, params=MainParams()):
+    def to_bytes(self, params=None):
+        if params is None:
+            params = bitcoin.params
         f = _BytesIO()
         self.msg_ser(f)
         body = f.getvalue()
@@ -74,7 +76,9 @@ def from_bytes(cls, b, protover=PROTO_VERSION):
         return MsgSerializable.stream_deserialize(f, protover=protover)
 
     @classmethod
-    def stream_deserialize(cls, f, params=MainParams(), protover=PROTO_VERSION):
+    def stream_deserialize(cls, f, params=None, protover=PROTO_VERSION):
+        if params is None:
+            params = bitcoin.params
         recvbuf = ser_read(f, 4 + 12 + 4 + 4)
 
         # check magic

bitcoin/tests/test_params.py

@@ -0,0 +1,43 @@
+# Copyright (C) 2013-2014 The python-bitcoinlib developers
+#
+# This file is part of python-bitcoinlib.
+#
+# It is subject to the license terms in the LICENSE file found in the top-level
+# directory of this distribution.
+#
+# No part of python-bitcoinlib, including this file, may be copied, modified,
+# propagated, or distributed except according to the terms contained in the
+# LICENSE file.
+
+import unittest
+import bitcoin
+
+from bitcoin.messages import msg_addr
+
+class Test_params(unittest.TestCase):
+    def tearDown(self):
+        bitcoin.SelectParams('mainnet')
+
+    def test_mainnet_magic_byte(self):
+        bitcoin.SelectParams('mainnet')
+        self.assertEquals(bitcoin.MainParams().MESSAGE_START, msg_addr().to_bytes()[0:4])
+
+    def test_testnet_magic_byte(self):
+        bitcoin.SelectParams('testnet')
+        self.assertEquals(bitcoin.TestNetParams().MESSAGE_START, msg_addr().to_bytes()[0:4])
+
+    def test_mainnet_params_magic_byte(self):
+        bitcoin.SelectParams('testnet')
+        self.assertEquals(bitcoin.MainParams().MESSAGE_START, msg_addr().to_bytes(params=bitcoin.MainParams())[0:4])
+
+    def test_testnet_params_magic_byte(self):
+    	bitcoin.SelectParams('mainnet')
+        self.assertEquals(bitcoin.TestNetParams().MESSAGE_START, msg_addr().to_bytes(params=bitcoin.TestNetParams())[0:4])
+
+
+
+
+
+
+
+