Skip to content

Commit

Permalink
tmp
Browse files Browse the repository at this point in the history
  • Loading branch information
sgliner-ledger committed Mar 11, 2024
1 parent 72a291c commit 86423c4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,11 @@ def run_bitcoind():
print(bitcoind)
print(bitcoind)
bitcoind = "bitcoind"
bitcoind = "/bitcoin/bin/bitcoind"
bitcoind = "bitcoind"

shutil.copy(os.path.join(os.path.dirname(__file__), "bitcoin.conf"), BITCOIN_DIRNAME)
subprocess.Popen([bitcoind, f"--datadir={BITCOIN_DIRNAME}"])
subprocess.Popen([bitcoind, f"--datadir={BITCOIN_DIRNAME}"], shell=True)

# Make sure the node is ready, and generate some initial blocks
setup_node()
Expand Down
2 changes: 1 addition & 1 deletion tests/test_e2e_tapscripts.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ def test_e2e_tapscript_one_of_three_keypath(navigator: Navigator, firmware: Firm
])

run_test_e2e(navigator, client, wallet_policy, [], rpc, rpc_test_wallet, speculos_globals,
e2e_register_wallet_instruction(firmware), e2e_register_wallet_instruction(firmware), test_name)
e2e_register_wallet_instruction(firmware), e2e_sign_psbt_instruction(firmware), test_name)


def test_e2e_tapscript_one_of_three_scriptpath(navigator: Navigator, firmware: Firmware, client:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_get_wallet_address.py
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ def test_get_wallet_address_large_addr_index(client: RaggerClient):
client.get_wallet_address(wallet, wallet_hmac, 0, 2**31, False)


def test_get_wallet_address_miniscript_all_fragments(client: RaggerClient, speculos_globals: SpeculosGlobals, rpc):
def test_get_wallet_address_miniscript_all_fragments(client: Client, speculos_globals: SpeculosGlobals, rpc):
# Create some miniscripts to exercise all possible fragments at least once,
# by comparing with the addresses generated by bitcoin-core.

Expand Down

0 comments on commit 86423c4

Please sign in to comment.