reorganised and tidied files up.

diff --git a/begin.py b/begin.py
new file mode 100644 (file)
index 0000000..04eeef7
--- /dev/null
+++ b/begin.py
@@ -0,0 +1,8 @@
+import sys
+import stratum
+
+if __name__ == "__main__":
+    backend = __import__("modules." + sys.argv[1], fromlist=["run"])
+    stratum_frontend = stratum.Stratum()
+    backend.run(stratum_frontend)
+

diff --git a/modules/__init__.py b/modules/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/modules/__init__.pyc b/modules/__init__.pyc
new file mode 100644 (file)
index 0000000..f6cbf88
Binary files /dev/null and b/modules/__init__.pyc differ

diff --git a/server-genjix.py b/modules/python_bitcoin/__init__.py
similarity index 98%
rename from server-genjix.py
rename to modules/python_bitcoin/__init__.py
index 6df53f6..fd3afd8 100644 (file)
--- a/server-genjix.py
+++ b/modules/python_bitcoin/__init__.py
@@ -163,8 +163,8 @@ class LibbitcoinProcessor(stratum.Processor):
         # Execute and when ready, you call
         # session.push_response(response)
 
-if __name__ == "__main__":
+def run(stratum):
+    print "Warning: pre-alpha prototype. Full of bugs."
     processor = LibbitcoinProcessor()
-    app = stratum.Stratum()
-    app.start(processor)
+    stratum.start(processor)
 

diff --git a/modules/python_bitcoin/__init__.pyc b/modules/python_bitcoin/__init__.pyc
new file mode 100644 (file)
index 0000000..ecdac5c
Binary files /dev/null and b/modules/python_bitcoin/__init__.pyc differ

diff --git a/composed.py b/modules/python_bitcoin/composed.py
similarity index 99%
rename from composed.py
rename to modules/python_bitcoin/composed.py
index 4ba18d0..5f17d70 100644 (file)
--- a/composed.py
+++ b/modules/python_bitcoin/composed.py
@@ -174,7 +174,7 @@ if __name__ == "__main__":
     service = bitcoin.async_service(1)
     prefix = "/home/genjix/libbitcoin/database"
     chain = bitcoin.bdb_blockchain(service, prefix)
-    address = "1FpES68UNcxnXeoaFciqvUSGiKGZ33gbfQ"
+    address = "1LzBzVqEeuQyjD2mRWHes3dgWrT9titxvq"
     print "Looking up", address
     payment_history(chain, address, finish)
     raw_input()

diff --git a/stratum.py b/stratum.py
index 949fb9f..6643815 100644 (file)
--- a/stratum.py
+++ b/stratum.py
@@ -178,7 +178,7 @@ class TcpServer(threading.Thread):
         print "TCP server started."
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        sock.bind(("localhost", 50001))
+        sock.bind(("176.31.24.241", 50001))
         sock.listen(1)
         while not self.shared.stopped():
             session = Session(*sock.accept())