From 7497d18719dc3d7246c52343b106554c1a7238ad Mon Sep 17 00:00:00 2001 From: Jay Graber Date: Fri, 25 Aug 2017 11:59:37 -0700 Subject: [PATCH] Rm comments --- xcat/bitcoinRPC.py | 7 +++---- xcat/zcashRPC.py | 8 +++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xcat/bitcoinRPC.py b/xcat/bitcoinRPC.py index c5684af..b8e638f 100644 --- a/xcat/bitcoinRPC.py +++ b/xcat/bitcoinRPC.py @@ -17,11 +17,10 @@ from bitcoin.wallet import CBitcoinAddress, CBitcoinSecret, P2SHBitcoinAddress, from xcat.utils import * from xcat.zcashRPC import parse_script -# SelectParams('testnet') -SelectParams('regtest') +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(timeout=90) +bitcoind = bitcoin.rpc.Proxy(timeout=900) FEE = 0.001*COIN def validateaddress(addr): diff --git a/xcat/zcashRPC.py b/xcat/zcashRPC.py index 049ce73..8ffe56b 100644 --- a/xcat/zcashRPC.py +++ b/xcat/zcashRPC.py @@ -18,11 +18,9 @@ from zcash.wallet import CBitcoinAddress, CBitcoinSecret, P2SHBitcoinAddress, P2 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(timeout=90) +SelectParams('testnet') +# SelectParams('regtest') +zcashd = zcash.rpc.Proxy(timeout=900) FEE = 0.001*COIN def x2s(hexstring):