migrate test contracts to use skribe-rs

Author: bbyalcinkaya

src/tests/integration/data/contracts/test-foundry-from-stylus/Cargo.lock

@@ -13,6 +13,7 @@ mini-alloc = "0.8.4"
 stylus-sdk = "0.8.4"
 hex = "0.4.3"
 dotenv = "0.15.0"
+skribe = { version = "0.1.0", path = "../../../../../../lib/skribe-rs" }
 
 [dev-dependencies]
 tokio = { version = "1.12.0", features = ["full"] }

src/tests/integration/data/contracts/test-foundry-from-stylus/Cargo.toml

@@ -3,9 +3,7 @@ extern crate alloc;
 
 use stylus_sdk::{alloy_primitives::U256, prelude::*};
 
-use crate::skribe::{build_init_code, new_cheatcodes};
-
-mod skribe;
+use skribe::{build_init_code, cheat};
 
 sol_interface! {
   interface ICounter {
@@ -23,16 +21,13 @@ sol_storage! {
     }
 }
 
-const COUNTER_BYTECODE_PATH: &str =
-    "bin/Counter.bin";
+const COUNTER_BYTECODE_PATH: &str = "bin/Counter.bin";
 
 #[public]
 impl TestCounter {
-    pub fn setUp(&mut self) {
-
-        let cheatcodes = new_cheatcodes();
+    pub fn set_up(&mut self) {
 
-        let hex_bytecode = cheatcodes
+        let hex_bytecode = cheat()
             .read_file(&mut *self, COUNTER_BYTECODE_PATH.to_string())
             .unwrap();
         let bytecode = hex::decode(hex_bytecode).unwrap();

src/tests/integration/data/contracts/test-foundry-from-stylus/src/lib.rs

@@ -0,0 +1,17 @@
+{
+  "../stylus-hello-world": {
+    "rev": "38692451478deb14e41473bc569aae84091fe5d1"
+  },
+  "../test-foundry-simple/lib/forge-std": {
+    "rev": "8bbcf6e3f8f62f419e5429a0bd89331c85c37824"
+  },
+  "../test-foundry-simple/lib/kontrol-cheatcodes": {
+    "rev": "187b89ad863226afe494caa9f58320997a543bff"
+  },
+  "../test-stylus-from-foundry/lib/forge-std": {
+    "rev": "0768d9c08c085c79bb31d88683a78770764fec49"
+  },
+  "lib/forge-std": {
+    "rev": "77041d2ce690e692d6e03cc812b57d1ddaa4d505"
+  }
+}

src/tests/integration/data/contracts/test-foundry-from-stylus/src/skribe.rs

@@ -5,10 +5,16 @@
   "../test-foundry-hello/lib/forge-std": {
     "rev": "77041d2ce690e692d6e03cc812b57d1ddaa4d505"
   },
+  "../test-stylus-from-foundry/lib/forge-std": {
+    "rev": "0768d9c08c085c79bb31d88683a78770764fec49"
+  },
   "lib/forge-std": {
     "tag": {
       "name": "v1.10.0",
       "rev": "8bbcf6e3f8f62f419e5429a0bd89331c85c37824"
     }
+  },
+  "lib/kontrol-cheatcodes": {
+    "rev": "187b89ad863226afe494caa9f58320997a543bff"
   }
 }

src/tests/integration/data/contracts/test-foundry-hello/foundry.lock

@@ -15,6 +15,7 @@ mini-alloc = "0.8.4"
 stylus-sdk = "0.8.4"
 hex = "0.4.3"
 dotenv = "0.15.0"
+skribe = { version = "0.1.0", path = "../../../../../../lib/skribe-rs" }
 
 [dev-dependencies]
 tokio = { version = "1.12.0", features = ["full"] }

src/tests/integration/data/contracts/test-foundry-simple/foundry.lock

@@ -3,9 +3,7 @@ extern crate alloc;
 
 use stylus_sdk::{alloy_primitives::U256, prelude::*};
 
-use crate::skribe::{build_init_code, new_cheatcodes};
-
-mod skribe;
+use skribe::{build_init_code, cheat};
 
 sol_interface! {
   interface ICounter {
@@ -29,12 +27,10 @@ const COUNTER_BYTECODE_PATH: &str =
 
 #[public]
 impl TestCounter {
-    pub fn setUp(&mut self) {
+    pub fn set_up(&mut self) {
         self.number.set(U256::from(123));
 
-        let cheatcodes = new_cheatcodes();
-
-        let bytecode = cheatcodes
+        let bytecode = cheat()
             .read_file_binary(&mut *self, COUNTER_BYTECODE_PATH.to_string())
             .unwrap();
         let counter_address = unsafe {
@@ -58,9 +54,7 @@ impl TestCounter {
     }
 
     pub fn test_call_increment(&mut self, x: U256) {
-        if x >= U256::MAX {
-            return;
-        }
+        cheat().assume(&mut *self, x < U256::MAX).unwrap();
 
         let counter = ICounter::new(self.counter.get());
         counter.set_number(&mut *self, x).unwrap();