Skip to content

Commit 2bcd1c0

Browse files
OttoAllmendingerllm-git
andcommitted
feat(wasm-utxo): move RootWalletKeys to fixed_script_wallet module
Make fixed_script_wallet a public module and update imports to use the new location for RootWalletKeys. Remove the re-export from lib.rs. Issue: BTC-2652 Co-authored-by: llm-git <[email protected]>
1 parent 32d40f0 commit 2bcd1c0

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

packages/wasm-utxo/src/fixed_script_wallet/test_utils/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use super::wallet_scripts::{Chain, WalletScripts};
77
use crate::bitcoin::bip32::{DerivationPath, Fingerprint, Xpriv, Xpub};
88
use crate::bitcoin::psbt::{Input as PsbtInput, Output as PsbtOutput, Psbt};
99
use crate::bitcoin::{Transaction, TxIn, TxOut};
10-
use crate::{Network, RootWalletKeys};
10+
use crate::{fixed_script_wallet::RootWalletKeys, Network};
1111
use std::collections::BTreeMap;
1212
use std::str::FromStr;
1313

packages/wasm-utxo/src/fixed_script_wallet/wallet_keys.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ impl RootWalletKeys {
9494
pub mod tests {
9595
use crate::bitcoin::bip32::{Xpriv, Xpub};
9696
use crate::bitcoin::hashes::{sha256, Hash};
97-
use crate::RootWalletKeys;
97+
use crate::fixed_script_wallet::RootWalletKeys;
9898

9999
pub type XprivTriple = [Xpriv; 3];
100100

packages/wasm-utxo/src/fixed_script_wallet/wallet_scripts/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ use crate::address::networks::OutputScriptSupport;
1616
use crate::bitcoin::bip32::{ChildNumber, DerivationPath};
1717
use crate::bitcoin::ScriptBuf;
1818
use crate::error::WasmUtxoError;
19-
use crate::fixed_script_wallet::wallet_keys::{to_pub_triple, PubTriple, XpubTriple};
20-
use crate::RootWalletKeys;
19+
use crate::fixed_script_wallet::wallet_keys::{to_pub_triple, PubTriple, RootWalletKeys, XpubTriple};
2120
use std::convert::TryFrom;
2221
use std::str::FromStr;
2322

packages/wasm-utxo/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,3 @@ pub use address::{
1515

1616
pub use networks::Network;
1717
pub use wasm::{WrapDescriptor, WrapMiniscript, WrapPsbt};
18-
19-
pub use crate::fixed_script_wallet::*;

0 commit comments

Comments
 (0)