sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

bitcoin -> dash

Browse Source 
Signed-off-by: Pasta <pasta@dashboost.org>
This commit is contained in:
Pasta 2019-07-10 09:45:09 -05:00
parent eb1b61b364
commit 722c373f51
No known key found for this signature in database
GPG Key ID: D362C9F7142766AE
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/functional/multi_rpc.py
View File

@ -28,7 +28,7 @@ class HTTPBasicsTest (BitcoinTestFramework):
with open(os.path.join(self.options.tmpdir+"/node0", "dash.conf"), 'a', encoding='utf8') as f:
f.write(rpcauth+"\n")
f.write(rpcauth2+"\n")
with open(os.path.join(self.options.tmpdir+"/node1", "bitcoin.conf"), 'a', encoding='utf8') as f:
with open(os.path.join(self.options.tmpdir+"/node1", "dash.conf"), 'a', encoding='utf8') as f:
f.write(rpcuser+"\n")
f.write(rpcpassword+"\n")

6
test/functional/test_framework/util.py
View File

@ -218,8 +218,8 @@ def get_datadir_path(dirname, n):
def get_auth_cookie(datadir, n):
user = None
password = None
if os.path.isfile(os.path.join(datadir, "bitcoin.conf")):
with open(os.path.join(datadir, "bitcoin.conf"), 'r') as f:
if os.path.isfile(os.path.join(datadir, "dash.conf")):
with open(os.path.join(datadir, "dash.conf"), 'r') as f:
for line in f:
if line.startswith("rpcuser="):
assert user is None # Ensure that there is only one rpcuser line
@ -268,7 +268,7 @@ def wait_for_bitcoind_start(process, datadir, i, rpchost=None):
except JSONRPCException as e: # Initialization phase
if e.error['code'] != -28: # RPC in warmup?
raise # unknown JSON RPC exception
except ValueError as e: # cookie file not found and no rpcuser or rpcassword. bitcoind still starting
except ValueError as e: # cookie file not found and no rpcuser or rpcassword. dashd still starting
if "No RPC credentials" not in str(e):
raise
time.sleep(0.25)