frost/bdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix use statements in populate_test_db macro

Browse Source 
- Use re-exported `bitcoin` so that users of the macro don't need to
depend on `bitcoin` directly.
- Add missing `use std::str::FromStr`.
This commit is contained in:
Lucas Soriano del Pino 2021-08-30 14:08:17 +10:00
parent fb813427eb
commit acf157a99a
No known key found for this signature in database
GPG Key ID: EE611E973A1530E7
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/database/memory.rs
View File

@ -456,20 +456,21 @@ impl ConfigurableDatabase for MemoryDatabase {
/// don't have `test` set. /// don't have `test` set.
macro_rules! populate_test_db { macro_rules! populate_test_db {
($db:expr, $tx_meta:expr, $current_height:expr$(,)?) => {{ ($db:expr, $tx_meta:expr, $current_height:expr$(,)?) => {{
use std::str::FromStr;
use $crate::database::BatchOperations; use $crate::database::BatchOperations;
let mut db = $db; let mut db = $db;
let tx_meta = $tx_meta; let tx_meta = $tx_meta;
let current_height: Option<u32> = $current_height; let current_height: Option<u32> = $current_height;
let tx = Transaction { let tx = $crate::bitcoin::Transaction {
version: 1, version: 1,
lock_time: 0, lock_time: 0,
input: vec![], input: vec![],
output: tx_meta output: tx_meta
.output .output
.iter() .iter()
.map(|out_meta| bitcoin::TxOut { .map(|out_meta| $crate::bitcoin::TxOut {
value: out_meta.value, value: out_meta.value,
script_pubkey: bitcoin::Address::from_str(&out_meta.to_address) script_pubkey: $crate::bitcoin::Address::from_str(&out_meta.to_address)
.unwrap() .unwrap()
.script_pubkey(), .script_pubkey(),
}) })
@ -477,12 +478,14 @@ macro_rules! populate_test_db {
}; };
let txid = tx.txid(); let txid = tx.txid();
let confirmation_time = tx_meta.min_confirmations.map(|conf| ConfirmationTime { let confirmation_time = tx_meta
height: current_height.unwrap().checked_sub(conf as u32).unwrap(), .min_confirmations
timestamp: 0, .map(|conf| $crate::ConfirmationTime {
}); height: current_height.unwrap().checked_sub(conf as u32).unwrap(),
timestamp: 0,
});
let tx_details = TransactionDetails { let tx_details = $crate::TransactionDetails {
transaction: Some(tx.clone()), transaction: Some(tx.clone()),
txid, txid,
fee: Some(0), fee: Some(0),
@ -494,13 +497,13 @@ macro_rules! populate_test_db {
db.set_tx(&tx_details).unwrap(); db.set_tx(&tx_details).unwrap();
for (vout, out) in tx.output.iter().enumerate() { for (vout, out) in tx.output.iter().enumerate() {
db.set_utxo(&LocalUtxo { db.set_utxo(&$crate::LocalUtxo {
txout: out.clone(), txout: out.clone(),
outpoint: OutPoint { outpoint: $crate::bitcoin::OutPoint {
txid, txid,
vout: vout as u32, vout: vout as u32,
}, },
keychain: KeychainKind::External, keychain: $crate::KeychainKind::External,
}) })
.unwrap(); .unwrap();
} }