chore: update sway's counter example (#1601)

Updated the way we access storage slots in the example.
FuelLabs · Feb 18, 2025 · 11d08e1 · 11d08e1
1 parent 71c5f92
commit 11d08e1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 27 deletions.
diff --git a/e2e/sway/contracts/contract_test/src/main.sw b/e2e/sway/contracts/contract_test/src/main.sw
@@ -24,9 +24,9 @@ abi TestContract {
     #[storage(write)]
     fn initialize_counter(value: u64) -> u64;
     #[storage(read, write)]
-    fn increment_counter(value: u64) -> u64;
+    fn increment_counter(amount: u64) -> u64;
     #[storage(read)]
-    fn get_counter() -> u64;
+    fn read_counter() -> u64;
     // ANCHOR: low_level_call
     #[storage(write)]
     fn set_value_multiple_complex(a: MyStruct, b: str[4]);
@@ -35,8 +35,6 @@ abi TestContract {
     fn get_str_value() -> str[4];
     #[storage(read)]
     fn get_bool_value() -> bool;
-    #[storage(read)]
-    fn get_value() -> u64;
     fn get(x: u64, y: u64) -> u64;
     fn get_alt(x: MyType) -> MyType;
     fn get_single(x: u64) -> u64;
@@ -48,10 +46,8 @@ abi TestContract {
     fn new() -> u64;
 }
 
-const COUNTER_KEY = 0x0000000000000000000000000000000000000000000000000000000000000000;
-
 storage {
-    value: u64 = 0,
+    counter: u64 = 0,
     value_str: str[4] = __to_str_array("none"),
     value_bool: bool = false,
 }
@@ -70,27 +66,29 @@ impl TestContract for Contract {
     // ANCHOR_END: msg_amount
     #[storage(write)]
     fn initialize_counter(value: u64) -> u64 {
-        write(COUNTER_KEY, 0, value);
+        storage.counter.write(value);
+
         value
     }
 
     /// This method will read the counter from storage, increment it
     /// and write the incremented value to storage
     #[storage(read, write)]
-    fn increment_counter(value: u64) -> u64 {
-        let new_value = read::<u64>(COUNTER_KEY, 0).unwrap_or(0) + value;
-        write(COUNTER_KEY, 0, new_value);
-        new_value
+    fn increment_counter(amount: u64) -> u64 {
+        let incremented = storage.counter.read() + amount;
+        storage.counter.write(incremented);
+
+        incremented
     }
 
     #[storage(read)]
-    fn get_counter() -> u64 {
-        read::<u64>(COUNTER_KEY, 0).unwrap_or(0)
+    fn read_counter() -> u64 {
+        storage.counter.read()
     }
 
     #[storage(write)]
     fn set_value_multiple_complex(a: MyStruct, b: str[4]) {
-        storage.value.write(a.b[1]);
+        storage.counter.write(a.b[1]);
         storage.value_str.write(b);
         storage.value_bool.write(a.a);
     }
@@ -105,11 +103,6 @@ impl TestContract for Contract {
         storage.value_bool.read()
     }
 
-    #[storage(read)]
-    fn get_value() -> u64 {
-        storage.value.read()
-    }
-
     fn get(x: u64, y: u64) -> u64 {
         x + y
     }

diff --git a/e2e/tests/contracts.rs b/e2e/tests/contracts.rs
@@ -1279,7 +1279,7 @@ async fn low_level_call() -> Result<()> {
 
     let response = target_contract_instance
         .methods()
-        .get_counter()
+        .read_counter()
         .call()
         .await?;
     assert_eq!(response.value, 42);
@@ -1307,7 +1307,7 @@ async fn low_level_call() -> Result<()> {
 
     let result_uint = target_contract_instance
         .methods()
-        .get_counter()
+        .read_counter()
         .call()
         .await
         .unwrap()
@@ -1329,7 +1329,7 @@ async fn low_level_call() -> Result<()> {
         .unwrap()
         .value;
 
-    assert_eq!(result_uint, 42);
+    assert_eq!(result_uint, 2);
     assert!(result_bool);
     assert_eq!(result_str, "fuel");
 
@@ -2284,7 +2284,7 @@ async fn regular_contract_can_be_deployed() -> Result<()> {
 
     let response = contract_instance
         .methods()
-        .get_counter()
+        .read_counter()
         .call()
         .await?
         .value;

diff --git a/examples/contracts/src/lib.rs b/examples/contracts/src/lib.rs
@@ -118,7 +118,7 @@ mod tests {
             .await?;
         // ANCHOR_END: contract_call_cost_estimation
 
-        let expected_gas = 2816;
+        let expected_gas = 2596;
 
         assert_eq!(transaction_cost.gas_used, expected_gas);
 
@@ -636,7 +636,7 @@ mod tests {
             .await?;
         // ANCHOR_END: multi_call_cost_estimation
 
-        let expected_gas = 4402;
+        let expected_gas = 4200;
 
         assert_eq!(transaction_cost.gas_used, expected_gas);
 
@@ -769,7 +769,7 @@ mod tests {
 
         let result_uint = target_contract_instance
             .methods()
-            .get_value()
+            .read_counter()
             .call()
             .await
             .unwrap()