AaronFiore/electrum
1
0
Fork 0
Code Activity

big refactoring: command line options and electrum.conf options override settings in wallet file.

Browse Source
This commit is contained in:
thomasv
2012-10-11 20:10:12 +02:00
parent 0d11aa75c4
commit 5444f55e6b
13 changed files with 384 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/merchant.py
View File

@@ -21,7 +21,7 @@ import time, thread, sys, socket, os
import urllib2,json
import MySQLdb as mdb
import Queue
from electrum import Wallet, TcpStratumInterface
from electrum import Wallet, Interface
import ConfigParser
config = ConfigParser.ConfigParser()
@@ -157,7 +157,7 @@ if __name__ == '__main__':
print "using database", db_name
conn = mdb.connect(db_instance, db_user, db_password, db_name);
i = TcpStratumInterface(electrum_server, 50001)
i = Interface({'server':"%s:%d:t"%(electrum_server, 50001)})
i.init_socket()
i.start()