Rm hardcoded username pw

This commit is contained in:
Jay Graber 2017-08-03 09:04:51 -07:00
parent a8540b8cbe
commit b7f108e15a
3 changed files with 5 additions and 2 deletions

View File

@ -20,7 +20,8 @@ from xcat.zcashRPC import parse_script
# SelectParams('testnet')
SelectParams('regtest')
# TODO: Accurately read user and pw info
bitcoind = bitcoin.rpc.Proxy(service_url="http://user:password@127.0.0.1:18332")
# bitcoind = bitcoin.rpc.Proxy(service_url="http://user:password@127.0.0.1:18332")
bitcoind = bitcoin.rpc.Proxy()
FEE = 0.001*COIN
def validateaddress(addr):

View File

@ -139,6 +139,7 @@ def checktrade(tradeid):
trade = db.get(tradeid)
if find_role(trade.sell) == 'test':
input("Is this a test? Both buyer and seller addresses are yours, press 'enter' to test.")
checkSellStatus(tradeid)
checkBuyStatus(tradeid)
checkSellStatus(tradeid)
checkBuyStatus(tradeid)

View File

@ -21,7 +21,8 @@ from xcat.utils import *
# SelectParams('testnet')
SelectParams('regtest')
# TODO: accurately read user and pw info
zcashd = zcash.rpc.Proxy(service_url="http://user:password@127.0.0.1:18232")
# zcashd = zcash.rpc.Proxy(service_url="http://user:password@127.0.0.1:18232")
zcashd = zcash.rpc.Proxy()
FEE = 0.001*COIN
def x2s(hexstring):