create dispatcher class; redefine processors as threads

[electrum-server.git] / abe_backend.py

diff --git a/abe_backend.py b/abe_backend.py
index ae43dfd..dc7056a 100644 (file)
--- a/abe_backend.py
+++ b/abe_backend.py
@@ -31,12 +31,11 @@ class AbeStore(Datastore_class):
         self.address_queue = Queue()
 
         self.dblock = thread.allocate_lock()
-        self.block_number = -1
-        self.watched_addresses = []
 
 
 
     def import_block(self, b, chain_ids=frozenset()):
+        #print "import block"
         block_id = super(AbeStore, self).import_block(b, chain_ids)
         for pos in xrange(len(b['transactions'])):
             tx = b['transactions'][pos]
@@ -369,27 +368,69 @@ class AbeStore(Datastore_class):
 
         return block_number
 
+
+from processor import Processor
+
+class AbeProcessor(Processor):
+
+    def __init__(self, config):
+        Processor.__init__(self)
+        self.store = AbeStore(config)
+        self.block_number = -1
+        self.watched_addresses = []
+
+    def process(self, request):
+        message_id = request['id']
+        method = request['method']
+        params = request.get('params',[])
+        result = ''
+        if method == 'blockchain.numblocks.subscribe':
+            result = self.block_number
+        elif method == 'blockchain.address.subscribe':
+            address = params[0]
+            self.watch_address(address)
+            status = self.store.get_status(address)
+            result = status
+        elif method == 'blockchain.address.get_history':
+            address = params[0]
+            result = self.store.get_history( address ) 
+        elif method == 'blockchain.transaction.broadcast':
+            txo = self.store.send_tx(params[0])
+            print "sent tx:", txo
+            result = txo 
+        else:
+            print "unknown method", request
+
+        if result != '':
+            response = { 'id':message_id, 'method':method, 'params':params, 'result':result }
+            self.push_response(response)
+
+
     def watch_address(self, addr):
         if addr not in self.watched_addresses:
             self.watched_addresses.append(addr)
 
-    def run(self, processor):
+
+    def run(self):
         
         old_block_number = None
-        while not processor.shared.stopped():
-            self.block_number = self.main_iteration()
+        while not self.shared.stopped():
+            self.block_number = self.store.main_iteration()
 
             if self.block_number != old_block_number:
                 old_block_number = self.block_number
-                processor.push_response({ 'method':'numblocks.subscribe', 'result':self.block_number })
+                self.push_response({ 'method':'blockchain.numblocks.subscribe', 'result':self.block_number })
 
             while True:
                 try:
-                    addr = self.address_queue.get(False)
+                    addr = self.store.address_queue.get(False)
                 except:
                     break
                 if addr in self.watched_addresses:
                     status = self.get_status( addr )
-                    processor.push_response({ 'method':'address.subscribe', 'params':[addr], 'result':status })
+                    self.push_response({ 'method':'blockchain.address.subscribe', 'params':[addr], 'result':status })
 
             time.sleep(10)
+
+
+