Skip to content

test: extract wallet setup into TestWalletContext #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xdustinface wants to merge 1 commit into
base: v0.42-dev
Choose a base branch
from
+138 −262
Open

test: extract wallet setup into TestWalletContext #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions key-wallet/src/test_utils/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
mod account;
mod utxo;
mod wallet;

pub use wallet::TestWalletContext;
48 changes: 46 additions & 2 deletions key-wallet/src/test_utils/wallet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,53 @@
use dashcore::Network;
use dashcore::{Address, Network};

use crate::wallet::ManagedWalletInfo;
use crate::wallet::initialization::WalletAccountCreationOptions;
use crate::wallet::{ManagedWalletInfo, Wallet};
use crate::ExtendedPubKey;

impl ManagedWalletInfo {
pub fn dummy(id: u8) -> Self {
ManagedWalletInfo::new(Network::Regtest, [id; 32])
}
}

/// Pre-built wallet context for transaction checking tests.
///
/// Provides a testnet wallet with a default BIP44 account, a pre-derived
/// receive address, and the corresponding extended public key.
pub struct TestWalletContext {
pub managed_wallet: ManagedWalletInfo,
pub wallet: Wallet,
pub receive_address: Address,
pub xpub: ExtendedPubKey,
}

impl TestWalletContext {
/// Creates a new random testnet wallet with a BIP44 account and one
/// pre-derived receive address.
pub fn new_random() -> Self {
let wallet = Wallet::new_random(Network::Testnet, WalletAccountCreationOptions::Default)
.expect("Should create wallet");
let mut managed_wallet =
ManagedWalletInfo::from_wallet_with_name(&wallet, "Test".to_string());

let xpub = wallet
.accounts
.standard_bip44_accounts
.get(&0)
.expect("Should have BIP44 account")
.account_xpub;

let receive_address = managed_wallet
.first_bip44_managed_account_mut()
.expect("Should have managed account")
.next_receive_address(Some(&xpub), true)
.expect("Should get address");

Self {
managed_wallet,
wallet,
receive_address,
xpub,
}
}
}
60 changes: 13 additions & 47 deletions key-wallet/src/transaction_checking/transaction_router/tests/asset_unlock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
//! Tests for asset unlock transaction handling

use super::helpers::create_test_transaction;
use crate::test_utils::TestWalletContext;
use crate::transaction_checking::transaction_router::{
AccountTypeToCheck, TransactionRouter, TransactionType,
};
use crate::transaction_checking::{TransactionContext, WalletTransactionChecker};
use crate::wallet::initialization::WalletAccountCreationOptions;
use crate::wallet::{ManagedWalletInfo, Wallet};
use crate::Network;
use dashcore::blockdata::transaction::special_transaction::asset_unlock::qualified_asset_unlock::AssetUnlockPayload;
use dashcore::blockdata::transaction::special_transaction::asset_unlock::request_info::AssetUnlockRequestInfo;
use dashcore::blockdata::transaction::special_transaction::asset_unlock::unqualified_asset_unlock::AssetUnlockBasePayload;
Expand Down Expand Up @@ -69,28 +67,12 @@ fn test_asset_unlock_classification() {

#[tokio::test]
async fn test_asset_unlock_transaction_routing() {
let mut wallet = Wallet::new_random(Network::Testnet, WalletAccountCreationOptions::Default)
.expect("Failed to create wallet with default options");

let mut managed_wallet_info =
ManagedWalletInfo::from_wallet_with_name(&wallet, "Test".to_string());

// Get the BIP44 account
let account = wallet
.accounts
.standard_bip44_accounts
.get(&0)
.expect("Expected BIP44 account at index 0 to exist");
let xpub = account.account_xpub;

let managed_account = managed_wallet_info
.first_bip44_managed_account_mut()
.expect("Failed to get first BIP44 managed account");

// Get an address from standard account (where unlocked funds go)
let address = managed_account
.next_receive_address(Some(&xpub), true)
.expect("Failed to generate receive address");
let TestWalletContext {
managed_wallet: mut managed_wallet_info,
mut wallet,
receive_address: address,
..
} = TestWalletContext::new_random();

// Create an asset unlock transaction
let tx = Transaction {
Expand Down Expand Up @@ -156,28 +138,12 @@ async fn test_asset_unlock_transaction_routing() {

#[tokio::test]
async fn test_asset_unlock_routing_to_bip32_account() {
// Test AssetUnlock routing to BIP32 accounts

// Create wallet with default options (includes both BIP44 and BIP32)
let mut wallet = Wallet::new_random(Network::Testnet, WalletAccountCreationOptions::Default)
.expect("Failed to create wallet");

let mut managed_wallet_info =
ManagedWalletInfo::from_wallet_with_name(&wallet, "Test".to_string());

// Get address from BIP44 account (we'll use BIP44 to test the routing)
let managed_account = managed_wallet_info
.first_bip44_managed_account_mut()
.expect("Failed to get first BIP44 managed account");

// Get the account's xpub from wallet
let account =
wallet.accounts.standard_bip44_accounts.get(&0).expect("Expected BIP44 account at index 0");
let xpub = account.account_xpub;

let address = managed_account
.next_receive_address(Some(&xpub), true)
.expect("Failed to generate receive address");
let TestWalletContext {
managed_wallet: mut managed_wallet_info,
mut wallet,
receive_address: address,
..
} = TestWalletContext::new_random();

// Create an asset unlock transaction to our address
let mut tx = create_test_transaction(0, vec![]);
Expand Down
116 changes: 32 additions & 84 deletions key-wallet/src/transaction_checking/transaction_router/tests/coinbase.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
//! Tests for coinbase transaction handling

use crate::test_utils::TestWalletContext;
use crate::transaction_checking::transaction_router::{
AccountTypeToCheck, TransactionRouter, TransactionType,
};
use crate::transaction_checking::{TransactionContext, WalletTransactionChecker};
use crate::wallet::initialization::WalletAccountCreationOptions;
use crate::wallet::{ManagedWalletInfo, Wallet};
use crate::Network;
use dashcore::blockdata::transaction::special_transaction::coinbase::CoinbasePayload;
use dashcore::blockdata::transaction::special_transaction::TransactionPayload;
use dashcore::bls_sig_utils::BLSSignature;
Expand Down Expand Up @@ -62,29 +60,12 @@ fn create_basic_transaction() -> Transaction {

#[tokio::test]
async fn test_coinbase_transaction_routing_to_bip44_receive_address() {
// Create a wallet with a BIP44 account
let mut wallet = Wallet::new_random(Network::Testnet, WalletAccountCreationOptions::Default)
.expect("Failed to create wallet with BIP44 account for coinbase test");

let mut managed_wallet_info =
ManagedWalletInfo::from_wallet_with_name(&wallet, "Test".to_string());

// Get the account's xpub for address derivation from the wallet's first BIP44 account
let account = wallet
.accounts
.standard_bip44_accounts
.get(&0)
.expect("Failed to get BIP44 account at index 0");
let xpub = account.account_xpub;

let managed_account = managed_wallet_info
.first_bip44_managed_account_mut()
.expect("Failed to get first BIP44 managed account");

// Get a receive address from the BIP44 account
let receive_address = managed_account
.next_receive_address(Some(&xpub), true)
.expect("Failed to generate receive address from BIP44 account");
let TestWalletContext {
managed_wallet: mut managed_wallet_info,
mut wallet,
receive_address,
..
} = TestWalletContext::new_random();

// Create a coinbase transaction that pays to our receive address
let mut coinbase_tx = create_coinbase_transaction();
Expand Down Expand Up @@ -136,27 +117,17 @@ async fn test_coinbase_transaction_routing_to_bip44_receive_address() {

#[tokio::test]
async fn test_coinbase_transaction_routing_to_bip44_change_address() {
// Create a wallet with a BIP44 account
let mut wallet = Wallet::new_random(Network::Testnet, WalletAccountCreationOptions::Default)
.expect("Failed to create wallet with BIP44 account for coinbase change test");

let mut managed_wallet_info =
ManagedWalletInfo::from_wallet_with_name(&wallet, "Test".to_string());

// Get the account's xpub for address derivation
let account = wallet
.accounts
.standard_bip44_accounts
.get(&0)
.expect("Failed to get BIP44 account at index 0");
let xpub = account.account_xpub;

let managed_account = managed_wallet_info
.first_bip44_managed_account_mut()
.expect("Failed to get first BIP44 managed account");
let TestWalletContext {
managed_wallet: mut managed_wallet_info,
mut wallet,
xpub,
..
} = TestWalletContext::new_random();

// Get a change address from the BIP44 account
let change_address = managed_account
let change_address = managed_wallet_info
.first_bip44_managed_account_mut()
.expect("Failed to get first BIP44 managed account")
.next_change_address(Some(&xpub), true)
.expect("Failed to generate change address from BIP44 account");

Expand Down Expand Up @@ -210,29 +181,19 @@ async fn test_coinbase_transaction_routing_to_bip44_change_address() {

#[tokio::test]
async fn test_update_state_flag_behavior() {
let mut wallet = Wallet::new_random(Network::Testnet, WalletAccountCreationOptions::Default)
.expect("Failed to create wallet with default options");
let mut managed_wallet_info =
ManagedWalletInfo::from_wallet_with_name(&wallet, "Test".to_string());

let account = wallet
.accounts
.standard_bip44_accounts
.get(&0)
.expect("Expected BIP44 account at index 0 to exist");
let xpub = account.account_xpub;

// Get an address and initial state
let (address, initial_balance, initial_tx_count) = {
let TestWalletContext {
managed_wallet: mut managed_wallet_info,
mut wallet,
receive_address: address,
..
} = TestWalletContext::new_random();

// Capture initial state
let (initial_balance, initial_tx_count) = {
let managed_account = managed_wallet_info
.first_bip44_managed_account_mut()
.expect("Failed to get first BIP44 managed account");
let address = managed_account
.next_receive_address(Some(&xpub), true)
.expect("Failed to generate receive address");
let balance = managed_account.balance.spendable();
let tx_count = managed_account.transactions.len();
(address, balance, tx_count)
(managed_account.balance.spendable(), managed_account.transactions.len())
};

// Create a test transaction
Expand Down Expand Up @@ -345,25 +306,12 @@ fn test_coinbase_routing() {

#[tokio::test]
async fn test_coinbase_transaction_with_payload_routing() {
// Test coinbase with special payload routing to BIP44 account
let mut wallet = Wallet::new_random(Network::Testnet, WalletAccountCreationOptions::Default)
.expect("Failed to create wallet");

let mut managed_wallet_info =
ManagedWalletInfo::from_wallet_with_name(&wallet, "Test".to_string());

// Get address from BIP44 account
let account =
wallet.accounts.standard_bip44_accounts.get(&0).expect("Expected BIP44 account at index 0");
let xpub = account.account_xpub;

let managed_account = managed_wallet_info
.first_bip44_managed_account_mut()
.expect("Failed to get first BIP44 managed account");

let address = managed_account
.next_receive_address(Some(&xpub), true)
.expect("Failed to generate receive address");
let TestWalletContext {
managed_wallet: mut managed_wallet_info,
mut wallet,
receive_address: address,
..
} = TestWalletContext::new_random();

// Create coinbase transaction with special payload
let mut coinbase_tx = create_coinbase_transaction();
Expand Down
30 changes: 7 additions & 23 deletions key-wallet/src/transaction_checking/transaction_router/tests/routing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use crate::account::{AccountType, StandardAccountType};
use crate::managed_account::address_pool::KeySource;
use crate::managed_account::managed_account_type::ManagedAccountType;
use crate::test_utils::TestWalletContext;
use crate::transaction_checking::transaction_router::{
AccountTypeToCheck, TransactionRouter, TransactionType,
};
Expand Down Expand Up @@ -46,29 +47,12 @@ fn test_standard_transaction_routing() {

#[tokio::test]
async fn test_transaction_routing_to_bip44_account() {
// Create a wallet with a BIP44 account
let mut wallet = Wallet::new_random(Network::Testnet, WalletAccountCreationOptions::Default)
.expect("Failed to create wallet with default options");

let mut managed_wallet_info =
ManagedWalletInfo::from_wallet_with_name(&wallet, "Test".to_string());

// Get the account's xpub for address derivation from the wallet's first BIP44 account
let account = wallet
.accounts
.standard_bip44_accounts
.get(&0)
.expect("Expected BIP44 account at index 0 to exist");
let xpub = account.account_xpub;

let managed_account = managed_wallet_info
.first_bip44_managed_account_mut()
.expect("Failed to get first BIP44 managed account");

// Get an address from the BIP44 account
let address = managed_account
.next_receive_address(Some(&xpub), true)
.expect("Failed to generate receive address");
let TestWalletContext {
managed_wallet: mut managed_wallet_info,
mut wallet,
receive_address: address,
..
} = TestWalletContext::new_random();

// Create a transaction that sends to this address
let mut tx = create_basic_transaction();
Expand Down
Loading
Loading