feat(btc): Minor changes in tw_tests

rust/tw_tests/src/lib.rs

@@ -1,5 +1,3 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 // Copyright © 2017 Trust Wallet.
-
-pub mod common;

rust/tw_tests/tests/chains/bitcoin/bitcoin_compile/brc20.rs

@@ -2,16 +2,16 @@
 //
 // Copyright © 2017 Trust Wallet.
 
+use crate::chains::common::bitcoin::{
+    btc_info, compile, dust_threshold, input, output, preimage, DUST, SIGHASH_ALL,
+};
 use tw_coin_registry::coin_type::CoinType;
 use tw_encoding::hex::ToHex;
 use tw_hash::H256;
 use tw_keypair::traits::SigningKeyTrait;
 use tw_keypair::{ecdsa, schnorr};
 use tw_misc::traits::ToBytesVec;
 use tw_proto::BitcoinV2::Proto;
-use tw_tests::common::bitcoin::{
-    btc_info, compile, dust_threshold, input, output, preimage, DUST, SIGHASH_ALL,
-};
 
 const BRC20_COMMIT_TX_ID: &str = "797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1";
 const BRC20_REVEAL_TX_ID: &str = "7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca";

rust/tw_tests/tests/chains/bitcoin/bitcoin_compile/compile_error.rs

@@ -2,14 +2,14 @@
 //
 // Copyright © 2017 Trust Wallet.
 
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, DUST, MINER_FEE, ONE_BTC, SIGHASH_ALL,
+};
 use tw_any_coin::test_utils::sign_utils::CompilerHelper;
 use tw_coin_registry::coin_type::CoinType;
 use tw_encoding::hex::DecodeHex;
 use tw_proto::BitcoinV2::Proto;
 use tw_proto::Common::Proto::SigningError;
-use tw_tests::common::bitcoin::{
-    btc_info, dust_threshold, input, output, DUST, MINER_FEE, ONE_BTC, SIGHASH_ALL,
-};
 
 #[test]
 fn test_bitcoin_compile_p2pkh_error() {

rust/tw_tests/tests/chains/bitcoin/bitcoin_compile/p2pkh.rs

@@ -2,16 +2,16 @@
 //
 // Copyright © 2017 Trust Wallet.
 
+use crate::chains::common::bitcoin::{
+    btc_info, compile, dust_threshold, input, output, preimage, DUST, MINER_FEE, ONE_BTC,
+    SIGHASH_ALL,
+};
 use tw_coin_registry::coin_type::CoinType;
 use tw_encoding::hex::{DecodeHex, ToHex};
 use tw_keypair::ecdsa;
 use tw_keypair::traits::SigningKeyTrait;
 use tw_misc::traits::ToBytesVec;
 use tw_proto::BitcoinV2::Proto;
-use tw_tests::common::bitcoin::{
-    btc_info, compile, dust_threshold, input, output, preimage, DUST, MINER_FEE, ONE_BTC,
-    SIGHASH_ALL,
-};
 
 /// Note this test contains a sample transaction that has never been broadcasted.
 #[test]

rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_exact.rs

@@ -2,9 +2,9 @@
 //
 // Copyright © 2017 Trust Wallet.
 
+use crate::chains::common::bitcoin::{plan, Amount, DUST};
 use tw_coin_registry::coin_type::CoinType;
 use tw_proto::BitcoinV2::Proto;
-use tw_tests::common::bitcoin::{plan, Amount, DUST};
 
 #[test]
 fn test_exact_selector_with_change_1() {

rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_exact_error.rs

@@ -2,11 +2,11 @@
 //
 // Copyright © 2017 Trust Wallet.
 
+use crate::chains::common::bitcoin::{plan, Amount, DUST};
 use tw_any_coin::test_utils::plan_utils::AnyPlannerHelper;
 use tw_coin_registry::coin_type::CoinType;
 use tw_proto::BitcoinV2::Proto;
 use tw_proto::Common::Proto as CommonProto;
-use tw_tests::common::bitcoin::{plan, Amount, DUST};
 
 #[test]
 fn test_exact_selector_insufficient() {

rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_max.rs

@@ -2,8 +2,8 @@
 //
 // Copyright © 2017 Trust Wallet.
 
+use crate::chains::common::bitcoin::{plan, Amount, DUST};
 use tw_coin_registry::coin_type::CoinType;
-use tw_tests::common::bitcoin::{plan, Amount, DUST};
 
 #[test]
 fn test_max_selector_1() {

rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_max_error.rs

@@ -2,11 +2,11 @@
 //
 // Copyright © 2017 Trust Wallet.
 
+use crate::chains::common::bitcoin::{plan, Amount, DUST};
 use tw_any_coin::test_utils::plan_utils::AnyPlannerHelper;
 use tw_coin_registry::coin_type::CoinType;
 use tw_proto::BitcoinV2::Proto;
 use tw_proto::Common::Proto as CommonProto;
-use tw_tests::common::bitcoin::{plan, Amount, DUST};
 
 #[test]
 fn test_max_selector_insufficient_to_cover_fee() {

rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_psbt.rs

@@ -2,13 +2,13 @@
 //
 // Copyright © 2017 Trust Wallet.
 
+use crate::chains::common::bitcoin::input::out_point;
+use crate::chains::common::bitcoin::psbt_plan::BitcoinPsbtPlanHelper;
+use crate::chains::common::bitcoin::{btc_info, input, output, RecipientType};
 use tw_coin_registry::coin_type::CoinType;
 use tw_encoding::hex::DecodeHex;
 use tw_keypair::ecdsa;
 use tw_proto::BitcoinV2::Proto;
-use tw_tests::common::bitcoin::input::out_point;
-use tw_tests::common::bitcoin::psbt_plan::BitcoinPsbtPlanHelper;
-use tw_tests::common::bitcoin::{btc_info, input, output, RecipientType};
 
 #[test]
 fn test_bitcoin_plan_psbt_thorchain_swap_witness() {

rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/brc20.rs

@@ -1,11 +1,11 @@
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, plan, sign, DUST, SIGHASH_ALL,
+};
 use tw_coin_registry::coin_type::CoinType;
 use tw_encoding::hex::DecodeHex;
 use tw_keypair::{ecdsa, schnorr};
 use tw_misc::traits::ToBytesVec;
 use tw_proto::BitcoinV2::Proto;
-use tw_tests::common::bitcoin::{
-    btc_info, dust_threshold, input, output, plan, sign, DUST, SIGHASH_ALL,
-};
 
 const ALICE_PRIVATE_KEY: &str = "e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129";
 

rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/op_return.rs

@@ -2,10 +2,10 @@
 //
 // Copyright © 2017 Trust Wallet.
 
+use crate::chains::common::bitcoin::{dust_threshold, input, output, sign, DUST, SIGHASH_ALL};
 use tw_coin_registry::coin_type::CoinType;
 use tw_encoding::hex::DecodeHex;
 use tw_proto::BitcoinV2::Proto;
-use tw_tests::common::bitcoin::{dust_threshold, input, output, sign, DUST, SIGHASH_ALL};
 
 /// Deposit 0.0001 BTC from bc1q2sphzvc2uqmxqte2w9dd4gzy4sy9vvfv0me9ke to 0xa8491D40d4F71A752cA41DA0516AEd80c33a1B56 on ZETA mainnet.
 /// https://www.zetachain.com/docs/developers/omnichain/bitcoin/#example-1-deposit-btc-into-an-account-in-zevm

rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2pkh.rs

@@ -1,13 +1,13 @@
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, plan, sign, BITCOIN_P2PKH_PREFIX, DUST, MINER_FEE,
+    ONE_BTC, SIGHASH_ALL,
+};
 use tw_coin_registry::coin_type::CoinType;
 use tw_encoding::hex::DecodeHex;
 use tw_hash::hasher::sha256_ripemd;
 use tw_keypair::ecdsa;
 use tw_misc::traits::ToBytesVec;
 use tw_proto::BitcoinV2::Proto;
-use tw_tests::common::bitcoin::{
-    btc_info, dust_threshold, input, output, plan, sign, BITCOIN_P2PKH_PREFIX, DUST, MINER_FEE,
-    ONE_BTC, SIGHASH_ALL,
-};
 use tw_utxo::address::legacy::LegacyAddress;
 
 enum P2PKHClaimingScriptType {

rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2sh.rs

@@ -1,13 +1,13 @@
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, sign, BITCOIN_P2SH_PREFIX, DUST, MINER_FEE, ONE_BTC,
+    SIGHASH_ALL,
+};
 use tw_coin_registry::coin_type::CoinType;
 use tw_encoding::hex::DecodeHex;
 use tw_hash::hasher::sha256_ripemd;
 use tw_hash::H160;
 use tw_keypair::ecdsa;
 use tw_proto::BitcoinV2::Proto;
-use tw_tests::common::bitcoin::{
-    btc_info, dust_threshold, input, output, sign, BITCOIN_P2SH_PREFIX, DUST, MINER_FEE, ONE_BTC,
-    SIGHASH_ALL,
-};
 use tw_utxo::address::legacy::LegacyAddress;
 use tw_utxo::script::standard_script::conditions;
 

rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2tr_key_path.rs

@@ -1,12 +1,12 @@
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, sign, BITCOIN_HRP, DUST, MINER_FEE, ONE_BTC,
+    SIGHASH_ALL,
+};
 use tw_coin_registry::coin_type::CoinType;
 use tw_encoding::hex::DecodeHex;
 use tw_keypair::{ecdsa, schnorr};
 use tw_misc::traits::ToBytesVec;
 use tw_proto::BitcoinV2::Proto;
-use tw_tests::common::bitcoin::{
-    btc_info, dust_threshold, input, output, sign, BITCOIN_HRP, DUST, MINER_FEE, ONE_BTC,
-    SIGHASH_ALL,
-};
 use tw_utxo::address::taproot::TaprootAddress;
 use tw_utxo::script::standard_script::conditions;
 

rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2tr_script_path.rs

@@ -1,9 +1,11 @@
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, sign, DUST, SIGHASH_ALL,
+};
 use tw_coin_registry::coin_type::CoinType;
 use tw_encoding::hex::DecodeHex;
 use tw_keypair::schnorr;
 use tw_misc::traits::ToBytesVec;
 use tw_proto::BitcoinV2::Proto;
-use tw_tests::common::bitcoin::{btc_info, dust_threshold, input, output, sign, DUST, SIGHASH_ALL};
 use tw_utxo::transaction::asset::brc20::{BRC20TransferInscription, Brc20Ticker};
 
 const ALICE_PRIVATE_KEY: &str = "e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129";

rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2wpkh.rs

@@ -2,12 +2,14 @@
 //
 // Copyright © 2017 Trust Wallet.
 
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, sign, DUST, SIGHASH_ALL,
+};
 use tw_coin_registry::coin_type::CoinType;
 use tw_encoding::hex::DecodeHex;
 use tw_keypair::ecdsa;
 use tw_misc::traits::{ToBytesVec, ToBytesZeroizing};
 use tw_proto::BitcoinV2::Proto;
-use tw_tests::common::bitcoin::{btc_info, dust_threshold, input, output, sign, DUST, SIGHASH_ALL};
 
 #[test]
 fn test_bitcoin_sign_p2wpkh_input_different_builders() {

rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2wsh.rs

@@ -1,3 +1,7 @@
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, sign, BITCOIN_HRP, DUST, MINER_FEE, ONE_BTC,
+    SIGHASH_ALL,
+};
 use tw_coin_registry::coin_type::CoinType;
 use tw_encoding::hex::DecodeHex;
 use tw_hash::hasher::sha256_ripemd;
@@ -6,10 +10,6 @@ use tw_hash::H160;
 use tw_keypair::ecdsa;
 use tw_misc::traits::ToBytesVec;
 use tw_proto::BitcoinV2::Proto;
-use tw_tests::common::bitcoin::{
-    btc_info, dust_threshold, input, output, sign, BITCOIN_HRP, DUST, MINER_FEE, ONE_BTC,
-    SIGHASH_ALL,
-};
 use tw_utxo::address::segwit::SegwitAddress;
 use tw_utxo::script::standard_script::conditions;
 use tw_utxo::script::Script;

rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/psbt.rs

@@ -2,10 +2,10 @@
 //
 // Copyright © 2017 Trust Wallet.
 
+use crate::chains::common::bitcoin::psbt_sign::{BitcoinPsbtSignHelper, Expected};
 use tw_coin_registry::coin_type::CoinType;
 use tw_encoding::hex::DecodeHex;
 use tw_proto::BitcoinV2::Proto;
-use tw_tests::common::bitcoin::psbt_sign::{BitcoinPsbtSignHelper, Expected};
 
 #[test]
 fn test_bitcoin_sign_psbt_thorchain_swap_witness() {

rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/send_to_address.rs

@@ -1,10 +1,12 @@
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, sign, DUST, SIGHASH_ALL,
+};
 use std::str::FromStr;
 use tw_coin_registry::coin_type::CoinType;
 use tw_encoding::hex::DecodeHex;
 use tw_keypair::ecdsa;
 use tw_misc::traits::{ToBytesVec, ToBytesZeroizing};
 use tw_proto::BitcoinV2::Proto;
-use tw_tests::common::bitcoin::{btc_info, dust_threshold, input, output, sign, DUST, SIGHASH_ALL};
 use tw_utxo::address::legacy::LegacyAddress;
 use tw_utxo::address::segwit::SegwitAddress;
 use tw_utxo::script::standard_script::conditions;

rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/sighash_single.rs

@@ -2,14 +2,14 @@
 //
 // Copyright © 2017 Trust Wallet.
 
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, sign, DUST, SIGHASH_SINGLE,
+};
 use tw_coin_registry::coin_type::CoinType;
 use tw_encoding::hex::DecodeHex;
 use tw_keypair::ecdsa;
 use tw_misc::traits::ToBytesVec;
 use tw_proto::BitcoinV2::Proto;
-use tw_tests::common::bitcoin::{
-    btc_info, dust_threshold, input, output, sign, DUST, SIGHASH_SINGLE,
-};
 
 /// In this test we check not only SIGHASH_SINGLE, but also multiple private keys,
 /// also legacy and witness UTXOs at the same time.

rust/tw_tests/src/common/bitcoin/compile.rs → rust/tw_tests/tests/chains/common/bitcoin/compile.rs

@@ -2,13 +2,13 @@
 //
 // Copyright © 2017 Trust Wallet.
 
-use crate::common::bitcoin::sign;
+use crate::chains::common::bitcoin::sign;
 use tw_any_coin::test_utils::sign_utils::CompilerHelper;
 use tw_coin_registry::coin_type::CoinType;
 use tw_memory::Data;
 use tw_proto::BitcoinV2::Proto;
 
-pub use crate::common::bitcoin::sign::Expected;
+pub use crate::chains::common::bitcoin::sign::Expected;
 
 pub struct BitcoinCompileHelper<'a> {
     input: &'a Proto::SigningInput<'a>,

rust/tw_tests/tests/chains/mod.rs

@@ -5,6 +5,7 @@
 mod aptos;
 mod binance;
 mod bitcoin;
+mod common;
 mod cosmos;
 mod dydx;
 mod ethereum;