Port numbers adjustment

diff --git a/backends/irc/__init__.py b/backends/irc/__init__.py
index 5511d8f..d8f2e15 100644 (file)
--- a/backends/irc/__init__.py
+++ b/backends/irc/__init__.py
@@ -57,7 +57,7 @@ class IrcThread(threading.Thread):
             s += 'p' + self.pruning_limit + ' '
 
         def add_port(letter, number):
-            DEFAULT_PORTS = {'t':'50001', 's':'50002', 'h':'8081', 'g':'8082'}
+            DEFAULT_PORTS = {'t':'40001', 's':'40002', 'h':'7081', 'g':'7082'}
             if not number: return ''
             if DEFAULT_PORTS[letter] == number:
                 return letter + ' '

diff --git a/electrum.conf.sample b/electrum.conf.sample
index 39d6bc9..3fc14b3 100644 (file)
--- a/electrum.conf.sample
+++ b/electrum.conf.sample
@@ -1,13 +1,13 @@
 [server]
 host = localhost
 #report_host = 
-stratum_tcp_port = 50001
-stratum_http_port = 8081
-#stratum_tcp_ssl_port = 50002
-#stratum_http_ssl_port = 8082
-#report_stratum_tcp_port = 50001
+stratum_tcp_port = 40001
+stratum_http_port = 7081
+#stratum_tcp_ssl_port = 40002
+#stratum_http_ssl_port = 7082
+#report_stratum_tcp_port = 40001
 #report_stratum_http_port = 80
-#report_stratum_tcp_ssl_port = 50002
+#report_stratum_tcp_ssl_port = 40002
 #report_stratum_http_ssl_port = 443
 password = secret
 banner = Welcome to Electrum!

diff --git a/server.py b/server.py
index 4cc6832..2a504a1 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -47,10 +47,10 @@ def create_config():
     config.set('server', 'banner', 'Welcome to Electrum!')
     config.set('server', 'host', 'localhost')
     config.set('server', 'report_host', '')
-    config.set('server', 'stratum_tcp_port', '50001')
-    config.set('server', 'stratum_http_port', '8081')
-    config.set('server', 'stratum_tcp_ssl_port', '50002')
-    config.set('server', 'stratum_http_ssl_port', '8082')
+    config.set('server', 'stratum_tcp_port', '40001')
+    config.set('server', 'stratum_http_port', '7081')
+    config.set('server', 'stratum_tcp_ssl_port', '40002')
+    config.set('server', 'stratum_http_ssl_port', '7082')
     config.set('server', 'report_stratum_tcp_port', '')
     config.set('server', 'report_stratum_http_port', '')
     config.set('server', 'report_stratum_tcp_ssl_port', '')
@@ -85,7 +85,7 @@ def create_config():
 def run_rpc_command(params):
     cmd = params[0]
     import xmlrpclib
-    server = xmlrpclib.ServerProxy('http://localhost:8000')
+    server = xmlrpclib.ServerProxy('http://localhost:7000')
     func = getattr(server, cmd)
     r = func(*params[1:])
 
@@ -223,7 +223,7 @@ if __name__ == '__main__':
     
 
     from SimpleXMLRPCServer import SimpleXMLRPCServer
-    server = SimpleXMLRPCServer(('localhost',8000), allow_none=True, logRequests=False)
+    server = SimpleXMLRPCServer(('localhost',7000), allow_none=True, logRequests=False)
     server.register_function(lambda: os.getpid(), 'getpid')
     server.register_function(shared.stop, 'stop')
     server.register_function(cmd_info, 'info')