Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/eth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -418,12 +418,12 @@ fn get_value(
.get(&typ.struct_name)
.ok_or(format!(
"could not lookup type of name: {}",
&typ.struct_name
typ.struct_name
))?
.get(*element as usize)
.ok_or(format!(
"could not lookup member #{} of type: {}",
*element, &typ.struct_name
*element, typ.struct_name
))?;
value = Either::JsonValue(
value
Expand Down
4 changes: 4 additions & 0 deletions tests/simulators.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,9 @@
{
"url": "https://github.com/BitBoxSwiss/bitbox02-firmware/releases/download/firmware%2Fv9.26.1/bitbox02-multi-v9.26.1-simulator1.0.0-linux-amd64",
"sha256": "91ddf47eb0653ce8b3d3344a8e329fc7fef90adfa51e39c5214830cf6e21cccf"
},
{
"url": "https://github.com/BitBoxSwiss/bitbox02-firmware/releases/download/firmware%2Fv9.26.3/bitbox02-multi-v9.26.3-simulator1.0.0-linux-amd64",
"sha256": "606e1fe6845430a47d1ecbda1df77a3b5e43a5dd164d2568431bbfdc882004dc"
}
]
8 changes: 4 additions & 4 deletions tests/test_btc_psbt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ async fn test_btc_psbt_multisig_p2wsh() {

let multi_descriptor: miniscript::Descriptor<miniscript::DescriptorPublicKey> = format!(
"wsh(sortedmulti({},[{}/48'/1'/0'/2']{}/<0;1>/*,{}/<0;1>/*))",
threshold, our_root_fingerprint, &our_xpub, &some_xpub
threshold, our_root_fingerprint, our_xpub, some_xpub
)
.parse::<miniscript::Descriptor<miniscript::DescriptorPublicKey>>()
.unwrap();
Expand Down Expand Up @@ -612,7 +612,7 @@ async fn test_btc_psbt_policy_wsh() {
let multi_descriptor: miniscript::Descriptor<miniscript::DescriptorPublicKey> = policy
.replace(
"@0",
&format!("[{}/48'/1'/0'/3']{}", &our_root_fingerprint, &our_xpub),
&format!("[{}/48'/1'/0'/3']{}", our_root_fingerprint, our_xpub),
)
.replace("@1", &some_xpub.to_string())
.parse::<miniscript::Descriptor<miniscript::DescriptorPublicKey>>()
Expand Down Expand Up @@ -775,7 +775,7 @@ async fn test_btc_psbt_policy_tr_keyspend() {
let multi_descriptor: miniscript::Descriptor<miniscript::DescriptorPublicKey> = policy
.replace(
"@0",
&format!("[{}/48'/1'/0'/3']{}", &our_root_fingerprint, &our_xpub),
&format!("[{}/48'/1'/0'/3']{}", our_root_fingerprint, our_xpub),
)
.parse::<miniscript::Descriptor<miniscript::DescriptorPublicKey>>()
.unwrap();
Expand Down Expand Up @@ -934,7 +934,7 @@ async fn test_btc_psbt_policy_tr_scriptspend() {
let multi_descriptor: miniscript::Descriptor<miniscript::DescriptorPublicKey> = policy
.replace(
"@1",
&format!("[{}/48'/1'/0'/3']{}", &our_root_fingerprint, &our_xpub),
&format!("[{}/48'/1'/0'/3']{}", our_root_fingerprint, our_xpub),
)
.replace("@0", &some_xpub.to_string())
.parse::<miniscript::Descriptor<miniscript::DescriptorPublicKey>>()
Expand Down