Implemented submit_and_await_commit_with_receipts method

CHANGELOG.md

@@ -12,6 +12,7 @@ Description of the upcoming release here.
 
 - [#1263](https://github.com/FuelLabs/fuel-core/pull/1263): Add gas benchmarks for `ED19` and `ECR1` instructions.
 - [#1286](https://github.com/FuelLabs/fuel-core/pull/1286): Include readable names for test cases where missing.
+- [#1304](https://github.com/FuelLabs/fuel-core/pull/1304): Implemented `submit_and_await_commit_with_receipts` method for `FuelClient`.
 
 ### Changed
 

crates/client/src/client.rs

@@ -411,6 +411,19 @@ impl FuelClient {
         Ok(status)
     }
 
+    #[cfg(feature = "subscriptions")]
+    /// Submits transaction, await confirmation and return receipts.
+    pub async fn submit_and_await_commit_with_receipts(
+        &self,
+        tx: &Transaction,
+    ) -> io::Result<(TransactionStatus, Option<Vec<Receipt>>)> {
+        let tx_id = self.submit(tx).await?;
+        let status = self.await_transaction_commit(&tx_id).await?;
+        let receipts = self.receipts(&tx_id).await?;
+
+        Ok((status, receipts))
+    }
+
     pub async fn start_session(&self) -> io::Result<String> {
         let query = schema::StartSession::build(());
 

crates/fuel-core/src/database/block.rs

@@ -42,7 +42,6 @@ use fuel_core_types::{
 use itertools::Itertools;
 use std::{
     borrow::{
-        Borrow,
         BorrowMut,
         Cow,
     },
@@ -271,7 +270,7 @@ impl Database {
             .get(commit_block_height)?
             .ok_or(not_found!(FuelBlockMerkleMetadata))?;
 
-        let storage = self.borrow();
+        let storage = self;
         let tree: MerkleTree<FuelBlockMerkleData, _> =
             MerkleTree::load(storage, commit_merkle_metadata.version)
                 .map_err(|err| StorageError::Other(err.into()))?;

tests/tests/contract.rs

@@ -258,8 +258,6 @@ async fn can_get_message_proof() {
         vec![],
     );
 
-    let transaction_id = script.id(&ChainId::default());
-
     // setup server & client
     let srv = FuelService::new_node(config).await.unwrap();
     let client = FuelClient::from(srv.bound_address);
@@ -281,13 +279,14 @@ async fn can_get_message_proof() {
         .await
         .expect("Should be able to estimate deploy tx");
     // Call the contract.
-    matches!(
-        client.submit_and_await_commit(&script).await,
-        Ok(TransactionStatus::Success { .. })
-    );
+    let (status, receipts) = client
+        .submit_and_await_commit_with_receipts(&script)
+        .await
+        .unwrap();
+    matches!(status, TransactionStatus::Success { .. });
 
     // Get the receipts from the contract call.
-    let receipts = client.receipts(&transaction_id).await.unwrap().unwrap();
+    let receipts = receipts.unwrap();
     let logd = receipts
         .iter()
         .find(|f| matches!(f, Receipt::LogData { .. }))