prevent collision on daemon port. Add Imported_Wallet (bolkin)

This commit is contained in:
ThomasV 2014-06-10 20:40:42 +02:00
parent 958f764dae
commit 4ec31b9fe9
2 changed files with 2 additions and 2 deletions

View File

@ -1,7 +1,7 @@
from version import ELECTRUM_VERSION
from util import format_satoshis, print_msg, print_json, print_error, set_verbosity
from wallet import WalletSynchronizer, WalletStorage
from wallet import Wallet, Wallet_2of2, Wallet_2of3
from wallet import Wallet, Wallet_2of2, Wallet_2of3, Imported_Wallet
from verifier import TxVerifier
from network import Network, DEFAULT_SERVERS, DEFAULT_PORTS, pick_random_server
from interface import Interface

View File

@ -307,7 +307,7 @@ class NetworkServer:
self.network = network
self.server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
self.daemon_port = config.get('daemon_port', 8000)
self.daemon_port = config.get('daemon_port', 8001)
self.server.bind(('', self.daemon_port))
self.server.listen(5)
self.server.settimeout(1)