Skip to content

Commit

Permalink
Merge pull request #28 from zfcpowell/fix-functional-tests
Browse files Browse the repository at this point in the history
fixes test/functional/rpc_signmessage.py
  • Loading branch information
van-orton authored Jul 19, 2021
2 parents 9cfd1eb + 1e76edc commit 27d4bd8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion test/functional/rpc_createmultisig.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def do_multisig(self):
mredeem = msig["redeemScript"]
assert_equal(desc, msig['descriptor'])
if self.output_type == 'bech32':
assert madd[0:4] == "bcrt" # actually a bech32 address
assert madd[0:4] == "rbgl" # actually a bech32 address

# compare against addmultisigaddress
msigw = wmulti.addmultisigaddress(self.nsigs, self.pub, None, self.output_type)
Expand Down
6 changes: 3 additions & 3 deletions test/functional/rpc_signmessage.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ def run_test(self):
message = 'This is just a test message'

self.log.info('test signing with priv_key')
priv_key = 'cUeKHd5orzT3mz8P9pxyREHfsWtVfgsfDjiZZBcjUBAaGk1BTj7N'
address = 'mpLQjfK79b7CCV4VMJWEWAj5Mpx8Up5zxB'
expected_signature = 'INbVnW4e6PeRmsv2Qgu8NuopvrVjkcxob+sX8OcZG0SALhWybUjzMLPdAsXI46YZGb0KQTRii+wWIQzRpG/U+S0='
priv_key = 'cU2MAEpFKrHYzpUQUajkxoerJ33rKwF6ViLoHw2xRu7yy7dXkK5U'
address = 'Ejt5fCe8NyLDC3nRk5ptc85PWSubNDUY4D'
expected_signature = 'H28itpEwmM/PUOfLsKTHwtpl3nXwbenOYYW9WBkgYdybYJ71uwQL37f1Ahc0aKlyZ8D1pU5IlZpVSngJHhw2VNs='
signature = self.nodes[0].signmessagewithprivkey(priv_key, message)
assert_equal(expected_signature, signature)
assert self.nodes[0].verifymessage(address, signature, message)
Expand Down
4 changes: 0 additions & 4 deletions test/functional/wallet_keypool_topup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

def run_test(self):
<<<<<<< HEAD
wallet_path = os.path.join(self.nodes[1].datadir, "regtest", "wallets", "wallet.dat")
=======
wallet_path = os.path.join(self.nodes[1].datadir, self.chain, "wallets", self.default_wallet_name, self.wallet_data_filename)
>>>>>>> ed3acda33... test, refactor: add default_wallet_name and wallet_data_filename variables
wallet_backup_path = os.path.join(self.nodes[1].datadir, "wallet.bak")
self.nodes[0].generate(101)

Expand Down

0 comments on commit 27d4bd8

Please sign in to comment.