Move non-consensus-critical constants out of bitcoin.core

petertodd · petertodd · commit 0806dcec0b11 · 2014-12-17T03:23:12.000-05:00
Also deleted MIN_PROTO_VERSION and BIP0031_VERSION as the
python-bitcoinlib codebase doesn't even use them.

 [ yapified by gitreformat (github/ghtdak) on Mon Nov 30 21:11:11 2015 ]
diff --git a/bitcoin/core/__init__.py b/bitcoin/core/__init__.py
@@ -28,12 +28,6 @@
 MAX_BLOCK_SIZE = 1000000
 MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE / 50
 
-BIP0031_VERSION = 60000
-PROTO_VERSION = 60002
-MIN_PROTO_VERSION = 209
-
-CADDR_TIME_VERSION = 31402
-
 
 def MoneyRange(nValue):
     return 0 <= nValue <= MAX_MONEY
diff --git a/bitcoin/net.py b/bitcoin/net.py
@@ -18,6 +18,9 @@
 from .core import PROTO_VERSION, CADDR_TIME_VERSION
 from .core.serialize import *
 
+PROTO_VERSION = 60002
+CADDR_TIME_VERSION = 31402
+
 
 class CAddress(Serializable):
 
