update transaction

api calls throughout
This commit is contained in:
Yeastplume
2022-11-22 13:25:44 +00:00
parent 746c1831c5
commit cd3203be23
20 changed files with 188 additions and 85 deletions
+7 -1
View File
@@ -16,6 +16,7 @@
use chrono::prelude::*;
use ed25519_dalek::SecretKey as DalekSecretKey;
use grin_wallet_libwallet::RetrieveTxQueryArgs;
use uuid::Uuid;
use crate::config::{TorConfig, WalletConfig};
@@ -447,6 +448,9 @@ where
/// the transaction log entry of id `i`.
/// * `tx_slate_id` - If `Some(uuid)`, only return transactions associated with
/// the given [`Slate`](../grin_wallet_libwallet/slate/struct.Slate.html) uuid.
/// * `tx_query_args` - If provided, use advanced query arguments as documented in
/// (../grin_wallet_libwallet/types.struct.RetrieveTxQueryArgs.html). If either
/// `tx_id` or `tx_slate_id` is provided in the same call, this argument is ignored
///
/// # Returns
/// * `(bool, Vec<TxLogEntry)` - A tuple:
@@ -467,7 +471,7 @@ where
/// let tx_slate_id = None;
///
/// // Return all TxLogEntries
/// let result = api_owner.retrieve_txs(None, update_from_node, tx_id, tx_slate_id);
/// let result = api_owner.retrieve_txs(None, update_from_node, tx_id, tx_slate_id, None);
///
/// if let Ok((was_updated, tx_log_entries)) = result {
/// //...
@@ -480,6 +484,7 @@ where
refresh_from_node: bool,
tx_id: Option<u32>,
tx_slate_id: Option<Uuid>,
tx_query_args: Option<RetrieveTxQueryArgs>,
) -> Result<(bool, Vec<TxLogEntry>), Error> {
let tx = {
let t = self.status_tx.lock();
@@ -496,6 +501,7 @@ where
refresh_from_node,
tx_id,
tx_slate_id,
tx_query_args,
)?;
if self.doctest_mode {
res.1 = res
+4
View File
@@ -13,6 +13,7 @@
// limitations under the License.
//! JSON-RPC Stub generation for the Owner API
use grin_wallet_libwallet::RetrieveTxQueryArgs;
use uuid::Uuid;
use crate::config::{TorConfig, WalletConfig};
@@ -307,6 +308,7 @@ pub trait OwnerRpc {
refresh_from_node: bool,
tx_id: Option<u32>,
tx_slate_id: Option<Uuid>,
tx_query_args: Option<RetrieveTxQueryArgs>,
) -> Result<(bool, Vec<TxLogEntry>), Error>;
/**
@@ -1912,6 +1914,7 @@ where
refresh_from_node: bool,
tx_id: Option<u32>,
tx_slate_id: Option<Uuid>,
query_args: Option<RetrieveTxQueryArgs>,
) -> Result<(bool, Vec<TxLogEntry>), Error> {
Owner::retrieve_txs(
self,
@@ -1919,6 +1922,7 @@ where
refresh_from_node,
tx_id,
tx_slate_id,
query_args,
)
}