chore: fix some remaining todos regarding transaction fees (#1646)

Author: hal3e

e2e/tests/predicates.rs

@@ -1141,29 +1141,35 @@ async fn predicate_blobs() -> Result<()> {
     // gonna make later on
     // ANCHOR: uploading_the_blob
     loader.upload_blob(extra_wallet).await?;
-
     predicate.set_provider(provider.clone());
 
-    let expected_fee = 1;
-    predicate
+    let amount_to_send = 42;
+    let response = predicate
         .transfer(
             receiver.address(),
-            predicate_balance - expected_fee,
+            amount_to_send,
             asset_id,
             TxPolicies::default(),
         )
         .await?;
     // ANCHOR_END: uploading_the_blob
 
     // The predicate has spent the funds
-    assert_address_balance(predicate.address(), &provider, asset_id, 0).await;
+    let transaction_fee = response.tx_status.total_fee;
+    assert_address_balance(
+        predicate.address(),
+        &provider,
+        asset_id,
+        predicate_balance - amount_to_send - transaction_fee,
+    )
+    .await;
 
     // Funds were transferred
     assert_address_balance(
         receiver.address(),
         &provider,
         asset_id,
-        receiver_balance + predicate_balance - expected_fee,
+        receiver_balance + amount_to_send,
     )
     .await;
 
@@ -1271,9 +1277,6 @@ async fn predicate_transfer_respects_maturity_and_expiration() -> Result<()> {
         .with_expiration(expiration);
     let amount_to_send = 10;
 
-    // TODO: https://github.com/FuelLabs/fuels-rs/issues/1394
-    let expected_fee = 1;
-
     {
         let err = predicate
             .transfer(receiver.address(), amount_to_send, asset_id, tx_policies)
@@ -1282,13 +1285,15 @@ async fn predicate_transfer_respects_maturity_and_expiration() -> Result<()> {
 
         assert!(err.to_string().contains("TransactionMaturity"));
     }
-    {
+    let transaction_fee = {
         provider.produce_blocks(15, None).await?;
         predicate
             .transfer(receiver.address(), amount_to_send, asset_id, tx_policies)
             .await
-            .expect("should succeed. Block height between `maturity` and `expiration`");
-    }
+            .expect("should succeed. Block height between `maturity` and `expiration`")
+            .tx_status
+            .total_fee
+    };
     {
         provider.produce_blocks(15, None).await?;
         let err = predicate
@@ -1304,7 +1309,7 @@ async fn predicate_transfer_respects_maturity_and_expiration() -> Result<()> {
         predicate.address(),
         &provider,
         asset_id,
-        predicate_balance - amount_to_send - expected_fee,
+        predicate_balance - amount_to_send - transaction_fee,
     )
     .await;
 

e2e/tests/wallets.rs

@@ -519,9 +519,6 @@ async fn wallet_transfer_respects_maturity_and_expiration() -> Result<()> {
         .with_expiration(expiration);
     let amount_to_send = 10;
 
-    // TODO: https://github.com/FuelLabs/fuels-rs/issues/1394
-    let expected_fee = 1;
-
     {
         let err = wallet
             .transfer(&receiver, amount_to_send, asset_id, tx_policies)
@@ -530,13 +527,15 @@ async fn wallet_transfer_respects_maturity_and_expiration() -> Result<()> {
 
         assert!(err.to_string().contains("TransactionMaturity"));
     }
-    {
+    let transaction_fee = {
         provider.produce_blocks(15, None).await?;
         wallet
             .transfer(&receiver, amount_to_send, asset_id, tx_policies)
             .await
-            .expect("should succeed. Block height between `maturity` and `expiration`");
-    }
+            .expect("should succeed. Block height between `maturity` and `expiration`")
+            .tx_status
+            .total_fee
+    };
     {
         provider.produce_blocks(15, None).await?;
         let err = wallet
@@ -552,7 +551,7 @@ async fn wallet_transfer_respects_maturity_and_expiration() -> Result<()> {
         wallet.address(),
         provider,
         asset_id,
-        wallet_balance - amount_to_send - expected_fee,
+        wallet_balance - amount_to_send - transaction_fee,
     )
     .await;