mirror of
https://github.com/jwinterm/grin-wallet.git
synced 2026-10-17 15:21:39 +02:00
fix tx filter (#795)
This commit is contained in:
@@ -61,6 +61,25 @@ fn test_wallet_tx_filtering(
|
||||
mask,
|
||||
PathBuf::from(test_dir),
|
||||
|api, _m| {
|
||||
let query = |args| {
|
||||
api.retrieve_txs(mask, true, None, None, Some(args))
|
||||
.map(|(_, txs)| txs)
|
||||
};
|
||||
let txs = query(RetrieveTxQueryArgs::default())?;
|
||||
assert!(!txs.is_empty());
|
||||
let before_first_tx =
|
||||
txs.iter().map(|tx| tx.creation_ts).min().unwrap() - Duration::from_secs(1);
|
||||
let mut tx_query_args = RetrieveTxQueryArgs::default();
|
||||
|
||||
// Max creation time before all test transactions
|
||||
tx_query_args.max_creation_timestamp = Some(before_first_tx);
|
||||
assert!(query(tx_query_args.clone())?.is_empty());
|
||||
|
||||
// Min confirmation time should not affect creation time
|
||||
tx_query_args.max_creation_timestamp = None;
|
||||
tx_query_args.min_confirmed_timestamp = Some(before_first_tx);
|
||||
assert_eq!(query(tx_query_args)?.len(), txs.len());
|
||||
|
||||
let mut tx_query_args = RetrieveTxQueryArgs::default();
|
||||
tx_query_args.min_id = Some(5);
|
||||
|
||||
|
||||
@@ -247,7 +247,7 @@ where
|
||||
}
|
||||
})
|
||||
.filter(|tx_entry| {
|
||||
if let Some(v) = query_args.min_confirmed_timestamp {
|
||||
if let Some(v) = query_args.max_creation_timestamp {
|
||||
tx_entry.creation_ts <= v
|
||||
} else {
|
||||
true
|
||||
|
||||
Reference in New Issue
Block a user