Skip to content

Commit a1c5e4c

Browse files
committed
removed testnet addrs from rust-bitcoin
Signed-off-by: Dikshant <[email protected]>
1 parent 1fbeda6 commit a1c5e4c

File tree

1 file changed

+16
-21
lines changed
  • modules/rustbitcoin/rust_bitcoin_lib/src

1 file changed

+16
-21
lines changed

modules/rustbitcoin/rust_bitcoin_lib/src/lib.rs

+16-21
Original file line numberDiff line numberDiff line change
@@ -83,28 +83,23 @@ pub unsafe extern "C" fn rust_bitcoin_address_parse(address: *const c_char) -> *
8383

8484
match Address::from_str(address_str) {
8585
Ok(addr_unchecked) => {
86-
let addr = match addr_unchecked.clone().require_network(bitcoin::Network::Bitcoin) {
87-
Ok(checked_addr) => checked_addr,
88-
Err(_) => {
89-
match addr_unchecked.require_network(bitcoin::Network::Testnet) {
90-
Ok(testnet_addr) => testnet_addr,
91-
Err(_) => return str_to_c_string("INVALID_NETWORK"),
92-
}
93-
}
94-
};
86+
match addr_unchecked.require_network(bitcoin::Network::Bitcoin) {
87+
Ok(addr) => {
88+
let prefix = match addr.address_type() {
89+
Some(bitcoin::address::AddressType::P2pkh) => "PKH:",
90+
Some(bitcoin::address::AddressType::P2sh) => "SH:",
91+
Some(bitcoin::address::AddressType::P2wpkh) => "WPKH:",
92+
Some(bitcoin::address::AddressType::P2wsh) => "WSH:",
93+
Some(bitcoin::address::AddressType::P2tr) => "TR:",
94+
Some(_) => "UNK:",
95+
None => "UNK:",
96+
};
9597

96-
let prefix = match addr.address_type() {
97-
Some(bitcoin::address::AddressType::P2pkh) => "PKH:",
98-
Some(bitcoin::address::AddressType::P2sh) => "SH:",
99-
Some(bitcoin::address::AddressType::P2wpkh) => "WPKH:",
100-
Some(bitcoin::address::AddressType::P2wsh) => "WSH:",
101-
Some(bitcoin::address::AddressType::P2tr) => "TR:",
102-
Some(_) => "UNK:",
103-
None => "UNK:",
104-
};
105-
106-
let result = format!("{}{:}", prefix, addr);
107-
str_to_c_string(&result)
98+
let result = format!("{}{:}", prefix, addr);
99+
str_to_c_string(&result)
100+
},
101+
Err(_) => str_to_c_string("INVALID"),
102+
}
108103
},
109104
Err(_) => str_to_c_string("INVALID"),
110105
}

0 commit comments

Comments
 (0)