diff --git a/examples/query_tx.rs b/examples/query_tx.rs index 4a64b11..8a40600 100644 --- a/examples/query_tx.rs +++ b/examples/query_tx.rs @@ -106,7 +106,7 @@ async fn main() -> Result<(), Box> { }) .await { - Ok(block_details) => println!("{:#?}", block_details), + Ok(tx_details) => println!("{:#?}", tx_details), Err(err) => match err.handler_error() { Some(err) => { println!("(i) An error occurred `{:#?}`", err); diff --git a/src/lib.rs b/src/lib.rs index cf55cc7..8d4ed24 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -38,6 +38,7 @@ //! ```no_run //! use near_jsonrpc_client::{methods, JsonRpcClient}; //! use near_jsonrpc_primitives::types::transactions::TransactionInfo; +//! use near_primitives::views::TxExecutionStatus; //! //! # #[tokio::main] //! # async fn main() -> Result<(), Box> { @@ -48,6 +49,7 @@ //! tx_hash: "9FtHUFBQsZ2MG77K3x3MJ9wjX3UT8zE1TczCrhZEcG8U".parse()?, //! sender_account_id: "miraclx.near".parse()?, //! }, +//! wait_until: TxExecutionStatus::Executed, //! }; //! //! let tx_status = client.call(tx_status_request).await?; @@ -439,9 +441,9 @@ mod tests { assert!( matches!( tx_status, - Ok(methods::tx::RpcTransactionStatusResponse { ref transaction, .. }) - if transaction.signer_id == "miraclx.near" - && transaction.hash == "9FtHUFBQsZ2MG77K3x3MJ9wjX3UT8zE1TczCrhZEcG8U".parse()? + Ok(methods::tx::RpcTransactionResponse { ref final_execution_outcome, .. }) + if final_execution_outcome.unwrap().into_outcome().transaction.signer_id == "miraclx.near" + && final_execution_outcome.unwrap().into_outcome().transaction.hash == "9FtHUFBQsZ2MG77K3x3MJ9wjX3UT8zE1TczCrhZEcG8U".parse()? ), "expected an Ok(RpcTransactionStatusResponse) with matching signer_id + hash, found [{:?}]", tx_status diff --git a/src/methods/experimental/tx_status.rs b/src/methods/experimental/tx_status.rs index 54c344a..83fbb04 100644 --- a/src/methods/experimental/tx_status.rs +++ b/src/methods/experimental/tx_status.rs @@ -7,11 +7,10 @@ //! //! ``` //! use near_jsonrpc_client::{methods, JsonRpcClient}; -//! use near_primitives::views; +//! use near_primitives::views::TxExecutionStatus; //! //! # #[tokio::main] //! # async fn main() -> Result<(), Box> { -//! use near_primitives::views::TxExecutionStatus; //! let client = JsonRpcClient::connect("https://archival-rpc.mainnet.near.org"); //! let tx_hash = "B9aypWiMuiWR5kqzewL9eC96uZWA3qCMhLe67eBMWacq".parse()?; //! @@ -19,7 +18,7 @@ //! transaction_info: methods::EXPERIMENTAL_tx_status::TransactionInfo::TransactionId { //! tx_hash, //! sender_account_id: "itranscend.near".parse()?, -//! }, +//! }, //! wait_until: TxExecutionStatus::Executed, //! }; //! @@ -27,7 +26,7 @@ //! //! assert!(matches!( //! response, -//! views::FinalExecutionOutcomeWithReceiptView { .. } +//! near_jsonrpc_primitives::types::transactions::RpcTransactionResponse { .. } //! )); //! # Ok(()) //! # }