fixed ordering of "Testing bitcoind XXX connection" messages during startup
authorForrest Voight <forrest@forre.st>
Fri, 19 Oct 2012 03:19:19 +0000 (23:19 -0400)
committerForrest Voight <forrest@forre.st>
Sun, 21 Oct 2012 01:48:41 +0000 (21:48 -0400)
p2pool/main.py

index 1202209..ff85aac 100644 (file)
@@ -98,9 +98,6 @@ def main(args, net, datadir_path, merged_urls, worker_endpoint):
         yield check()
         temp_work = yield getwork(bitcoind)
         
-        if not args.testnet:
-            factory = yield connect_p2p()
-        
         bitcoind_warning_var = variable.Variable(None)
         @defer.inlineCallbacks
         def poll_warnings():
@@ -114,6 +111,9 @@ def main(args, net, datadir_path, merged_urls, worker_endpoint):
         print '    Current block height: %i' % (temp_work['height'] - 1,)
         print
         
+        if not args.testnet:
+            factory = yield connect_p2p()
+        
         print 'Determining payout address...'
         if args.pubkey_hash is None:
             address_path = os.path.join(datadir_path, 'cached_payout_address')