Update non owner test to use update proxy method

forc-plugins/forc-client/src/lib.rs

@@ -1,7 +1,7 @@
 pub mod cmd;
 pub mod constants;
 pub mod op;
-mod util;
+pub mod util;
 
 use clap::Parser;
 use serde::{Deserialize, Serialize};

forc-plugins/forc-client/src/util/mod.rs

@@ -3,4 +3,4 @@ pub(crate) mod gas;
 pub(crate) mod node_url;
 pub(crate) mod pkg;
 pub(crate) mod target;
-pub(crate) mod tx;
+pub mod tx;

forc-plugins/forc-client/src/util/tx.rs

@@ -15,7 +15,7 @@ use fuel_crypto::{Message, PublicKey, SecretKey, Signature};
 use fuel_tx::{
     field, Address, AssetId, Buildable, ContractId, Input, Output, TransactionBuilder, Witness,
 };
-use fuels::macros::abigen;
+use fuels::{macros::abigen, programs::responses::CallResponse};
 use fuels_accounts::{
     provider::Provider,
     wallet::{Wallet, WalletUnlocked},
@@ -256,12 +256,12 @@ pub(crate) async fn select_secret_key(
     Ok(signing_key)
 }
 
-pub(crate) async fn update_proxy_contract_target(
+pub async fn update_proxy_contract_target(
     provider: &Provider,
     secret_key: SecretKey,
     proxy_contract_id: ContractId,
     new_target: ContractId,
-) -> Result<()> {
+) -> Result<CallResponse<()>> {
     abigen!(Contract(
         name = "ProxyContract",
         abi = "forc-plugins/forc-client/abi/proxy_contract-abi.json"
@@ -272,7 +272,7 @@ pub(crate) async fn update_proxy_contract_target(
     let proxy_contract = ProxyContract::new(proxy_contract_id, wallet);
 
     // TODO: what happens if the call fails? Does 'FuelCallResponse' is returned as Err() in that case?
-    proxy_contract
+    let result = proxy_contract
         .methods()
         .set_proxy_target(new_target)
         .call()
@@ -281,7 +281,7 @@ pub(crate) async fn update_proxy_contract_target(
         "Updated",
         &format!("proxy contract target to 0x{new_target}"),
     );
-    Ok(())
+    Ok(result)
 }
 
 #[async_trait]

forc-plugins/forc-client/tests/deploy.rs

@@ -2,6 +2,7 @@ use forc::cli::shared::Pkg;
 use forc_client::{
     cmd,
     op::{deploy, DeployedContract},
+    util::tx::update_proxy_contract_target,
     NodeTarget,
 };
 use forc_pkg::manifest::Proxy;
@@ -326,16 +327,19 @@ async fn test_non_owner_fails_to_set_target() {
     // Proxy contract's id.
     let proxy_id = contract_id.first().and_then(|f| f.proxy).unwrap();
 
-    // create an another account and fund it.
+    // Create and fund an owner account and an attacker account.
     let provider = Provider::connect(&node_url).await.unwrap();
-    let secret_key = SecretKey::random(&mut thread_rng());
-    let attacker_wallet = WalletUnlocked::new_from_private_key(secret_key, Some(provider.clone()));
-
-    let secret_key = SecretKey::from_str(forc_client::constants::DEFAULT_PRIVATE_KEY).unwrap();
-    let owner_wallet = WalletUnlocked::new_from_private_key(secret_key, Some(provider.clone()));
+    let attacker_secret_key = SecretKey::random(&mut thread_rng());
+    let attacker_wallet =
+        WalletUnlocked::new_from_private_key(attacker_secret_key, Some(provider.clone()));
+
+    let owner_secret_key =
+        SecretKey::from_str(forc_client::constants::DEFAULT_PRIVATE_KEY).unwrap();
+    let owner_wallet =
+        WalletUnlocked::new_from_private_key(owner_secret_key, Some(provider.clone()));
     let base_asset_id = provider.base_asset_id();
 
-    // fund attacker wallet so that it can try to make a set proxy target call.
+    // Fund attacker wallet so that it can try to make a set proxy target call.
     owner_wallet
         .transfer(
             attacker_wallet.address(),
@@ -352,31 +356,21 @@ async fn test_non_owner_fails_to_set_target() {
         abi = "forc-plugins/forc-client/abi/proxy_contract-abi.json"
     ));
 
-    let proxy_contract = ProxyContract::new(proxy_id, attacker_wallet);
-    // try to change target of the proxy with a random wallet which is not the
-    // owner of the proxy.
-    let res = proxy_contract
-        .methods()
-        .set_proxy_target(dummy_contract_id_target)
-        .call()
-        .await
-        .err()
-        .unwrap();
+    // Try to change target of the proxy with a random wallet which is not the owner of the proxy.
+    let res = update_proxy_contract_target(
+        &provider,
+        attacker_secret_key,
+        proxy_id,
+        dummy_contract_id_target,
+    )
+    .await
+    .err()
+    .unwrap();
 
     node.kill().unwrap();
-    match res {
-        fuels::types::errors::Error::Transaction(
-            fuels::types::errors::transaction::Reason::Reverted { reason, .. },
-        ) => {
-            assert_eq!(
-                reason,
-                "NotOwner".to_string(),
-                "Expected 'NotOwner' error, but got: {}",
-                reason
-            );
-        }
-        _ => panic!("Expected a Reverted transaction error, but got: {:?}", res),
-    }
+    assert!(res
+        .to_string()
+        .starts_with("transaction reverted: NotOwner"));
 }
 
 // TODO: https://github.com/FuelLabs/sway/issues/6283