X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=blobdiff_plain;f=server.py;h=914a6bbb08278b55381c5512d2341eccf8c2b35b;hp=8141273b70bb515ed158e4f8ad1100a3bf312dab;hb=da84c75f9a5006b9b10b527eec8e0c27de5b8abd;hpb=09f0e2f27acc188f8786a1340f1374539c59dfd3 diff --git a/server.py b/server.py index 8141273..914a6bb 100755 --- a/server.py +++ b/server.py @@ -34,7 +34,6 @@ def create_config(): config.add_section('server') config.set('server', 'banner', 'Welcome to Electrum!') config.set('server', 'host', 'localhost') - config.set('server', 'native_port', '50000') config.set('server', 'stratum_tcp_port', '50001') config.set('server', 'stratum_http_port', '8081') config.set('server', 'password', '') @@ -80,7 +79,6 @@ if __name__ == '__main__': config = create_config() password = config.get('server', 'password') host = config.get('server', 'host') - native_port = config.get('server', 'native_port') stratum_tcp_port = config.get('server', 'stratum_tcp_port') stratum_http_port = config.get('server', 'stratum_http_port') @@ -89,16 +87,9 @@ if __name__ == '__main__': sys.exit(0) from processor import Dispatcher - from transports.stratum_http import HttpServer - from transports.stratum_tcp import TcpServer - from transports.native import NativeServer from backends.irc import ServerProcessor backend_name = config.get('server', 'backend') - if backend_name == "libbitcoin": - # NativeServer cannot be used with libbitcoin - native_port = None - config.set('server', 'native_port', '') try: backend = __import__("backends." + backend_name, fromlist=["BlockchainProcessor"]) @@ -119,17 +110,13 @@ if __name__ == '__main__': transports = [] # Create various transports we need - if native_port: - server_banner = config.get('server','banner') - native_server = NativeServer(shared, chain_proc, server_proc, - server_banner, host, int(native_port)) - transports.append(native_server) - if stratum_tcp_port: + from transports.stratum_tcp import TcpServer tcp_server = TcpServer(dispatcher, host, int(stratum_tcp_port)) transports.append(tcp_server) if stratum_http_port: + from transports.stratum_http import HttpServer http_server = HttpServer(dispatcher, host, int(stratum_http_port)) transports.append(http_server)