Improved exception handling of submit()

[stratum-mining.git] / mining / interfaces.py

diff --git a/mining/interfaces.py b/mining/interfaces.py
index 812f0d0..179c85e 100644 (file)
--- a/mining/interfaces.py
+++ b/mining/interfaces.py
@@ -5,19 +5,30 @@
 ''' 
 
 import time
+from twisted.internet import reactor, defer
 
 import stratum.logger
 log = stratum.logger.get_logger('interfaces')
 
 class WorkerManagerInterface(object):
+    def __init__(self):
+        # Fire deferred when manager is ready
+        self.on_load = defer.Deferred()
+        self.on_load.callback(True)
+        
     def authorize(self, worker_name, worker_password):
         return True
 
 class ShareManagerInterface(object):
+    def __init__(self):
+        # Fire deferred when manager is ready
+        self.on_load = defer.Deferred()
+        self.on_load.callback(True)
+
     def on_submit_share(self, worker_name, block_header, block_hash, shares, timestamp, is_valid):
-        log.info("%s %s %s" % ('Valid' if is_valid else 'INVALID', worker_name, block_hash))
+        log.info("%s %s %s" % (block_hash, 'valid' if is_valid else 'INVALID', worker_name))
     
-    def on_submit_block(self, worker_name, block_header, block_hash, timestamp, is_accepted):
+    def on_submit_block(self, is_accepted, worker_name, block_header, block_hash, timestamp):
         log.info("Block %s %s" % (block_hash, 'ACCEPTED' if is_accepted else 'REJECTED'))
     
 class TimestamperInterface(object):