removed transitional NEW_* network parameters (meant to happen in d874cb7)

[p2pool.git] / p2pool / networks.py

diff --git a/p2pool/networks.py b/p2pool/networks.py
index 89b4552..4ff1b7a 100644 (file)
--- a/p2pool/networks.py
+++ b/p2pool/networks.py
@@ -11,12 +11,10 @@ nets = dict(
     bitcoin=math.Object(
         PARENT=networks.nets['bitcoin'],
         SHARE_PERIOD=30, # seconds
-        NEW_SHARE_PERIOD=30, # seconds
         CHAIN_LENGTH=24*60*60//10, # shares
         REAL_CHAIN_LENGTH=24*60*60//10, # shares
         TARGET_LOOKBEHIND=200, # shares
         SPREAD=3, # blocks
-        NEW_SPREAD=3, # blocks
         IDENTIFIER='fc70035c7a81bc6f'.decode('hex'),
         PREFIX='2472ef181efcd37b'.decode('hex'),
         P2P_PORT=9333,
@@ -30,13 +28,11 @@ nets = dict(
     ),
     bitcoin_testnet=math.Object(
         PARENT=networks.nets['bitcoin_testnet'],
-        SHARE_PERIOD=10, # seconds
-        NEW_SHARE_PERIOD=30, # seconds
+        SHARE_PERIOD=30, # seconds
         CHAIN_LENGTH=60*60//10, # shares
         REAL_CHAIN_LENGTH=60*60//10, # shares
         TARGET_LOOKBEHIND=200, # shares
         SPREAD=3, # blocks
-        NEW_SPREAD=3, # blocks
         IDENTIFIER='5fc2be2d4f0d6bfb'.decode('hex'),
         PREFIX='3f6057a15036f441'.decode('hex'),
         P2P_PORT=19333,
@@ -51,13 +47,11 @@ nets = dict(
     
     litecoin=math.Object(
         PARENT=networks.nets['litecoin'],
-        SHARE_PERIOD=10, # seconds
-        NEW_SHARE_PERIOD=15, # seconds
+        SHARE_PERIOD=15, # seconds
         CHAIN_LENGTH=24*60*60//10, # shares
         REAL_CHAIN_LENGTH=24*60*60//10, # shares
         TARGET_LOOKBEHIND=200, # shares
-        SPREAD=12, # blocks
-        NEW_SPREAD=3, # blocks
+        SPREAD=3, # blocks
         IDENTIFIER='e037d5b8c6923410'.decode('hex'),
         PREFIX='7208c1a53ef629b0'.decode('hex'),
         P2P_PORT=9338,
@@ -71,13 +65,11 @@ nets = dict(
     ),
     litecoin_testnet=math.Object(
         PARENT=networks.nets['litecoin_testnet'],
-        SHARE_PERIOD=3, # seconds
-        NEW_SHARE_PERIOD=4, # seconds
+        SHARE_PERIOD=4, # seconds
         CHAIN_LENGTH=20*60//3, # shares
         REAL_CHAIN_LENGTH=20*60//3, # shares
         TARGET_LOOKBEHIND=200, # shares
-        SPREAD=12, # blocks
-        NEW_SPREAD=3, # blocks
+        SPREAD=3, # blocks
         IDENTIFIER='cca5e24ec6408b1e'.decode('hex'),
         PREFIX='ad9614f6466a39cf'.decode('hex'),
         P2P_PORT=19338,
@@ -93,12 +85,10 @@ nets = dict(
     terracoin=math.Object(
         PARENT=networks.nets['terracoin'],
         SHARE_PERIOD=30, # seconds
-        NEW_SHARE_PERIOD=30, # seconds
         CHAIN_LENGTH=24*60*60//30, # shares
         REAL_CHAIN_LENGTH=24*60*60//30, # shares
         TARGET_LOOKBEHIND=200, # shares
         SPREAD=15, # blocks
-        NEW_SPREAD=15, # blocks
         IDENTIFIER='a41b2356a1b7d35e'.decode('hex'),
         PREFIX='5623b62178d2b8a3'.decode('hex'),
         P2P_PORT=9323,
@@ -113,12 +103,10 @@ nets = dict(
     terracoin_testnet=math.Object(
         PARENT=networks.nets['terracoin_testnet'],
         SHARE_PERIOD=30, # seconds
-        NEW_SHARE_PERIOD=30, # seconds
         CHAIN_LENGTH=60*60//30, # shares
         REAL_CHAIN_LENGTH=60*60//30, # shares
         TARGET_LOOKBEHIND=200, # shares
         SPREAD=15, # blocks
-        NEW_SPREAD=15, # blocks
         IDENTIFIER='b41b2356a5b7d35d'.decode('hex'),
         PREFIX='1623b92172d2b8a2'.decode('hex'),
         P2P_PORT=19323,