From 0c527cb37b9aefda24e34eb2ae59e2e17a752058 Mon Sep 17 00:00:00 2001 From: librelois <c@elo.tf> Date: Tue, 10 Nov 2020 18:22:42 +0100 Subject: [PATCH] [feat] gva: add pending txs on txs history --- rust-libs/duniter-gva/src/entities.rs | 4 ++++ rust-libs/duniter-gva/src/queries/txs_history.rs | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/rust-libs/duniter-gva/src/entities.rs b/rust-libs/duniter-gva/src/entities.rs index d5618b9e7..d4ceff8b2 100644 --- a/rust-libs/duniter-gva/src/entities.rs +++ b/rust-libs/duniter-gva/src/entities.rs @@ -36,6 +36,10 @@ pub(crate) struct UtxoGva { pub(crate) struct TxsHistoryGva { /// Transactions sent pub(crate) sent: Vec<TxGva>, + /// Transactions sending + pub(crate) sending: Vec<TxGva>, /// Transactions received pub(crate) received: Vec<TxGva>, + /// Transactions receiving + pub(crate) receiving: Vec<TxGva>, } diff --git a/rust-libs/duniter-gva/src/queries/txs_history.rs b/rust-libs/duniter-gva/src/queries/txs_history.rs index cfd9305ee..3da6cb661 100644 --- a/rust-libs/duniter-gva/src/queries/txs_history.rs +++ b/rust-libs/duniter-gva/src/queries/txs_history.rs @@ -46,11 +46,21 @@ impl TxsHistoryQuery { .into_iter() .map(|db_tx| db_tx.into()) .collect(), + sending: txs_history + .sending + .into_iter() + .map(|db_tx| TxGva::from(&db_tx)) + .collect(), received: txs_history .received .into_iter() .map(|db_tx| db_tx.into()) .collect(), + receiving: txs_history + .pending + .into_iter() + .map(|db_tx| TxGva::from(&db_tx)) + .collect(), }) } } -- GitLab