electrum

commit 0dce31eedf59b98696a0ac2c040188aef952d9a1
parent d8524ac8d0481f71e46d64b06f6b10ce5414e4f7
Author: ThomasV <thomasv1@gmx.de>
Date:   Thu, 19 Sep 2013 01:46:02 -0700

Merge pull request #311 from rofl0r/master

fix error to create a wallet due to missing pick_random_server decl
Diffstat:
M
lib/__init__.py
 | 
2
+-
M
lib/interface.py
 | 
4
----
M
lib/network.py
 | 
3
+++

3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/__init__.py b/lib/__init__.py
@@ -3,7 +3,7 @@ from util import format_satoshis, print_msg, print_json, print_error, set_verbos
 from wallet import WalletSynchronizer, WalletStorage
 from wallet_factory import WalletFactory as Wallet
 from verifier import TxVerifier
-from network import Network, DEFAULT_SERVERS, DEFAULT_PORTS
+from network import Network, DEFAULT_SERVERS, DEFAULT_PORTS, pick_random_server
 from interface import Interface
 from simple_config import SimpleConfig
 import bitcoin
diff --git a/lib/interface.py b/lib/interface.py
@@ -28,10 +28,6 @@ DEFAULT_TIMEOUT = 5
 proxy_modes = ['socks4', 'socks5', 'http']
 
 
-def pick_random_server():
-    return random.choice( filter_protocol(DEFAULT_SERVERS,'s') )
-
-
 class Interface(threading.Thread):
 
 
diff --git a/lib/network.py b/lib/network.py
@@ -33,6 +33,9 @@ def filter_protocol(servers, p):
     return l
     
 
+def pick_random_server():
+    return random.choice( filter_protocol(DEFAULT_SERVERS,'s') )
+
 
 class Network(threading.Thread):