unified naming of network definitions

diff --git a/p2pool/i0coin.py b/p2pool/bitcoin/i0coin.py
similarity index 95%
rename from p2pool/i0coin.py
rename to p2pool/bitcoin/i0coin.py
index 2bdd36a..03441d8 100644 (file)
--- a/p2pool/i0coin.py
+++ b/p2pool/bitcoin/i0coin.py
@@ -1,6 +1,6 @@
 from twisted.internet import defer
 
-class I0coinMainnet(object):
+class Mainnet(object):
     BITCOIN_P2P_PREFIX = 'f1b2b3d4'.decode('hex')
     BITCOIN_P2P_PORT = 7333
     BITCOIN_ADDRESS_VERSION = 105
@@ -14,7 +14,7 @@ class I0coinMainnet(object):
     BITCOIN_SUBSIDY_FUNC = staticmethod(lambda height: 48*100000000 >> (height + 1)//218750)
     BITCOIN_SYMBOL = 'I0C'
 
-class I0coinTestnet(object):
+class Testnet(object):
     BITCOIN_P2P_PREFIX = 'f5b6b7d8'.decode('hex')
     BITCOIN_P2P_PORT = 17333
     BITCOIN_ADDRESS_VERSION = 112

diff --git a/p2pool/ixcoin.py b/p2pool/bitcoin/ixcoin.py
similarity index 95%
rename from p2pool/ixcoin.py
rename to p2pool/bitcoin/ixcoin.py
index 7a5eed9..4aa1b46 100644 (file)
--- a/p2pool/ixcoin.py
+++ b/p2pool/bitcoin/ixcoin.py
@@ -1,6 +1,6 @@
 from twisted.internet import defer
 
-class IxcoinMainnet(object):
+class Mainnet(object):
     BITCOIN_P2P_PREFIX = 'f9beb4d9'.decode('hex')
     BITCOIN_P2P_PORT = 8337
     BITCOIN_ADDRESS_VERSION = 138
@@ -13,7 +13,7 @@ class IxcoinMainnet(object):
     BITCOIN_SUBSIDY_FUNC = staticmethod(lambda height: 96*100000000 >> (height + 1)//210000)
     BITCOIN_SYMBOL = 'IXC'
 
-class IxcoinTestnet(object):
+class Testnet(object):
     BITCOIN_P2P_PREFIX = 'fabfb5da'.decode('hex')
     BITCOIN_P2P_PORT = 18337
     BITCOIN_ADDRESS_VERSION = 111

diff --git a/p2pool/litecoin.py b/p2pool/bitcoin/litecoin.py
similarity index 94%
rename from p2pool/litecoin.py
rename to p2pool/bitcoin/litecoin.py
index 1a2a6ac..b83da0a 100644 (file)
--- a/p2pool/litecoin.py
+++ b/p2pool/bitcoin/litecoin.py
@@ -1,6 +1,6 @@
 from twisted.internet import defer
 
-class LitecoinMainnet(object):
+class Mainnet(object):
     BITCOIN_P2P_PREFIX = 'fbc0b6db'.decode('hex')
     BITCOIN_P2P_PORT = 9333
     BITCOIN_ADDRESS_VERSION = 48
@@ -13,7 +13,7 @@ class LitecoinMainnet(object):
     BITCOIN_POW_SCRYPT = True;
     BITCOIN_SYMBOL = 'LTC'
 
-class LitecoinTestnet(object):
+class Testnet(object):
     BITCOIN_P2P_PREFIX = 'fcc1b7dc'.decode('hex')
     BITCOIN_P2P_PORT = 19333
     BITCOIN_ADDRESS_VERSION = 111

diff --git a/p2pool/namecoin.py b/p2pool/bitcoin/namecoin.py
similarity index 94%
rename from p2pool/namecoin.py
rename to p2pool/bitcoin/namecoin.py
index 4c98afb..bdead37 100644 (file)
--- a/p2pool/namecoin.py
+++ b/p2pool/bitcoin/namecoin.py
@@ -1,6 +1,6 @@
 from twisted.internet import defer
 
-class NamecoinMainnet(object):
+class Mainnet(object):
     BITCOIN_P2P_PREFIX = 'f9beb4fe'.decode('hex')
     BITCOIN_P2P_PORT = 8334
     BITCOIN_ADDRESS_VERSION = 52
@@ -13,7 +13,7 @@ class NamecoinMainnet(object):
     BITCOIN_SUBSIDY_FUNC = staticmethod(lambda height: 50*100000000 >> (height + 1)//210000)
     BITCOIN_SYMBOL = 'NMC'
 
-class NamecoinTestnet(object):
+class Testnet(object):
     BITCOIN_P2P_PREFIX = 'fabfb5fe'.decode('hex')
     BITCOIN_P2P_PORT = 18334
     BITCOIN_ADDRESS_VERSION = 111

diff --git a/p2pool/bitcoin/p2p.py b/p2pool/bitcoin/p2p.py
index d54a870..a979899 100644 (file)
--- a/p2pool/bitcoin/p2p.py
+++ b/p2pool/bitcoin/p2p.py
@@ -429,7 +429,7 @@ class HeightTracker(object):
         self._clear_task.stop()
 
 if __name__ == '__main__':
-    factory = ClientFactory(bitcoin_data.Mainnet)
+    factory = ClientFactory(bitcoin_data.BitcoinMainnet)
     reactor.connectTCP('127.0.0.1', 8333, factory)
     h = HeightTracker(factory)
     

diff --git a/p2pool/solidcoin.py b/p2pool/bitcoin/solidcoin.py
similarity index 94%
rename from p2pool/solidcoin.py
rename to p2pool/bitcoin/solidcoin.py
index 40bda63..763f3c0 100644 (file)
--- a/p2pool/solidcoin.py
+++ b/p2pool/bitcoin/solidcoin.py
@@ -1,6 +1,6 @@
 from twisted.internet import defer
 
-class SolidcoinMainnet(object):
+class Mainnet(object):
     BITCOIN_P2P_PREFIX = 'deadbabe'.decode('hex')
     BITCOIN_P2P_PORT = 7555
     BITCOIN_ADDRESS_VERSION = 125

diff --git a/p2pool/data.py b/p2pool/data.py
index ea1c31a..a3f2d9a 100644 (file)
--- a/p2pool/data.py
+++ b/p2pool/data.py
@@ -8,8 +8,8 @@ import os
 from twisted.python import log
 
 import p2pool
-from p2pool import skiplists, namecoin, ixcoin, i0coin, solidcoin, litecoin
-from p2pool.bitcoin import data as bitcoin_data, script
+from p2pool import skiplists
+from p2pool.bitcoin import data as bitcoin_data, script, namecoin, ixcoin, i0coin, solidcoin, litecoin
 from p2pool.util import memoize, expiring_dict, math
 
 
@@ -547,7 +547,7 @@ class ShareStore(object):
             os.remove(filename)
             print "REMOVED", filename
 
-class Mainnet(bitcoin_data.Mainnet):
+class BitcoinMainnet(bitcoin_data.Mainnet):
     SHARE_PERIOD = 10 # seconds
     CHAIN_LENGTH = 24*60*60//5 # shares
     TARGET_LOOKBEHIND = 200 # shares
@@ -561,7 +561,7 @@ class Mainnet(bitcoin_data.Mainnet):
     PERSIST = True
     WORKER_PORT = 9332
 
-class Testnet(bitcoin_data.Testnet):
+class BitcoinTestnet(bitcoin_data.Testnet):
     SHARE_PERIOD = 1 # seconds
     CHAIN_LENGTH = 24*60*60//5 # shares
     TARGET_LOOKBEHIND = 200 # shares
@@ -575,7 +575,7 @@ class Testnet(bitcoin_data.Testnet):
     PERSIST = False
     WORKER_PORT = 19332
 
-class NamecoinMainnet(namecoin.NamecoinMainnet):
+class NamecoinMainnet(namecoin.Mainnet):
     SHARE_PERIOD = 10 # seconds
     CHAIN_LENGTH = 24*60*60//10 # shares
     TARGET_LOOKBEHIND = 3600//10 # shares
@@ -589,7 +589,7 @@ class NamecoinMainnet(namecoin.NamecoinMainnet):
     PERSIST = True
     WORKER_PORT = 9331
 
-class NamecoinTestnet(namecoin.NamecoinTestnet):
+class NamecoinTestnet(namecoin.Testnet):
     SHARE_PERIOD = 1 # seconds
     CHAIN_LENGTH = 24*60*60//5 # shares
     TARGET_LOOKBEHIND = 200 # shares
@@ -603,7 +603,7 @@ class NamecoinTestnet(namecoin.NamecoinTestnet):
     PERSIST = False
     WORKER_PORT = 19331
 
-class IxcoinMainnet(ixcoin.IxcoinMainnet):
+class IxcoinMainnet(ixcoin.Mainnet):
     SHARE_PERIOD = 10 # seconds
     CHAIN_LENGTH = 24*60*60//10 # shares
     TARGET_LOOKBEHIND = 3600//10 # shares
@@ -617,7 +617,7 @@ class IxcoinMainnet(ixcoin.IxcoinMainnet):
     PERSIST = True
     WORKER_PORT = 9330
 
-class IxcoinTestnet(ixcoin.IxcoinTestnet):
+class IxcoinTestnet(ixcoin.Testnet):
     SHARE_PERIOD = 1 # seconds
     CHAIN_LENGTH = 24*60*60//5 # shares
     TARGET_LOOKBEHIND = 200 # shares
@@ -631,7 +631,7 @@ class IxcoinTestnet(ixcoin.IxcoinTestnet):
     PERSIST = False
     WORKER_PORT = 19330
 
-class I0coinMainnet(i0coin.I0coinMainnet):
+class I0coinMainnet(i0coin.Mainnet):
     SHARE_PERIOD = 10 # seconds
     CHAIN_LENGTH = 24*60*60//10 # shares
     TARGET_LOOKBEHIND = 3600//10 # shares
@@ -645,7 +645,7 @@ class I0coinMainnet(i0coin.I0coinMainnet):
     PERSIST = False
     WORKER_PORT = 9329
 
-class I0coinTestnet(i0coin.I0coinTestnet):
+class I0coinTestnet(i0coin.Testnet):
     SHARE_PERIOD = 1 # seconds
     CHAIN_LENGTH = 24*60*60//5 # shares
     TARGET_LOOKBEHIND = 200 # shares
@@ -659,12 +659,12 @@ class I0coinTestnet(i0coin.I0coinTestnet):
     PERSIST = False
     WORKER_PORT = 19329
 
-class SolidcoinMainnet(solidcoin.SolidcoinMainnet):
+class SolidcoinMainnet(solidcoin.Mainnet):
     SHARE_PERIOD = 10
     CHAIN_LENGTH = 24*60*60//10 # shares
     TARGET_LOOKBEHIND = 3600//10 # shares
     SPREAD = 3 # blocks
-    SCRIPT = bitcoin_data.pubkey_hash_to_script2(bitcoin_data.address_to_pubkey_hash('sMKZ1yxHETxPYKh4Z2anWnwZDJZU7ztroy', solidcoin.SolidcoinMainnet))
+    SCRIPT = bitcoin_data.pubkey_hash_to_script2(bitcoin_data.address_to_pubkey_hash('sMKZ1yxHETxPYKh4Z2anWnwZDJZU7ztroy', solidcoin.Mainnet))
     IDENTIFIER = '9cc9c421cca258cd'.decode('hex')
     PREFIX = 'c059125b8070f00a'.decode('hex')
     NAME = 'solidcoin'
@@ -673,7 +673,7 @@ class SolidcoinMainnet(solidcoin.SolidcoinMainnet):
     PERSIST = True
     WORKER_PORT = 9328
 
-class LitecoinMainnet(litecoin.LitecoinMainnet):
+class LitecoinMainnet(litecoin.Mainnet):
     SHARE_PERIOD = 10 # seconds
     CHAIN_LENGTH = 24*60*60//5 # shares
     TARGET_LOOKBEHIND = 200 # shares
@@ -687,7 +687,7 @@ class LitecoinMainnet(litecoin.LitecoinMainnet):
     PERSIST = True
     WORKER_PORT = 9327
 
-class LitecoinTestnet(litecoin.LitecoinTestnet):
+class LitecoinTestnet(litecoin.Testnet):
     SHARE_PERIOD = 1 # seconds
     CHAIN_LENGTH = 24*60*60//5 # shares
     TARGET_LOOKBEHIND = 200 # shares
@@ -701,4 +701,4 @@ class LitecoinTestnet(litecoin.LitecoinTestnet):
     PERSIST = False
     WORKER_PORT = 19327
 
-nets = dict((net.NAME, net) for net in set([Mainnet, Testnet, NamecoinMainnet, NamecoinTestnet, IxcoinMainnet, IxcoinTestnet, I0coinMainnet, I0coinTestnet, SolidcoinMainnet, LitecoinMainnet, LitecoinTestnet]))
+nets = dict((net.NAME, net) for net in set([BitcoinMainnet, BitcoinTestnet, NamecoinMainnet, NamecoinTestnet, IxcoinMainnet, IxcoinTestnet, I0coinMainnet, I0coinTestnet, SolidcoinMainnet, LitecoinMainnet, LitecoinTestnet]))