fix: fix all tests

.github/workflows/tests.yml

@@ -43,9 +43,10 @@ jobs:
     - run: rustup update
     - run: rustup target add wasm32-unknown-unknown
     - uses: taiki-e/install-action@just
+    - uses: taiki-e/install-action@nextest
     - uses: cargo-bins/cargo-binstall@main
     - run: just setup
     - run: just create
-    - run: just test
+    - run: just test-ci
     - run: just redeploy
 

.gitignore

@@ -1,3 +1,4 @@
 target/
 .soroban/
-.env
+.env
+test_snapshots/

crates/loam-soroban-sdk/src/loam_storage.rs

@@ -103,41 +103,46 @@ where
     V: IntoVal<Env, Val> + TryFromVal<Env, Val>,
     K: LoamKey + Default,
 {
+
+    pub fn key(&self) -> Val {
+        K::default().to_key()
+    }
+
     pub fn get(&self) -> Option<V> {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().persistent().get(&key)
     }
 
     pub fn set(&mut self, value: &V) {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().persistent().set(&key, value);
     }
 
     pub fn has(&self) -> bool {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().persistent().has(&key)
     }
 
     pub fn update(&self, f: impl FnOnce(Option<V>) -> V) -> V {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().persistent().update(&key, f)
     }
 
     pub fn try_update<E>(&self, f: impl FnOnce(Option<V>) -> Result<V, E>) -> Result<V, E> {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().persistent().try_update(&key, f)
     }
 
     pub fn extend_ttl(&self, threshold: u32, extend_to: u32) {
-        let key = K::default().to_key();
+        let key = self.key();
         env()
             .storage()
             .persistent()
             .extend_ttl(&key, threshold, extend_to);
     }
 
     pub fn remove(&self) {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().persistent().remove(&key);
     }
 }
@@ -323,28 +328,31 @@ where
     V: IntoVal<Env, Val> + TryFromVal<Env, Val>,
     K: LoamKey + Default,
 {
+    pub fn key(&self) -> Val {
+        K::default().to_key()
+    }
     pub fn get(&self) -> Option<V> {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().instance().get(&key)
     }
 
     pub fn set(&mut self, value: &V) {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().instance().set(&key, value);
     }
 
     pub fn has(&self) -> bool {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().instance().has(&key)
     }
 
     pub fn update(&self, f: impl FnOnce(Option<V>) -> V) -> V {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().instance().update(&key, f)
     }
 
     pub fn try_update<E>(&self, f: impl FnOnce(Option<V>) -> Result<V, E>) -> Result<V, E> {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().instance().try_update(&key, f)
     }
 
@@ -353,7 +361,7 @@ where
     }
 
     pub fn remove(&self) {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().instance().remove(&key);
     }
 }
@@ -373,41 +381,45 @@ where
     V: IntoVal<Env, Val> + TryFromVal<Env, Val>,
     K: LoamKey + Default,
 {
+    pub fn key(&self) -> Val {
+        K::default().to_key()
+    }
+
     pub fn get(&self) -> Option<V> {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().temporary().get(&key)
     }
 
     pub fn set(&mut self, value: &V) {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().temporary().set(&key, value);
     }
 
     pub fn has(&self) -> bool {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().temporary().has(&key)
     }
 
     pub fn update(&self, f: impl FnOnce(Option<V>) -> V) -> V {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().temporary().update(&key, f)
     }
 
     pub fn try_update<E>(&self, f: impl FnOnce(Option<V>) -> Result<V, E>) -> Result<V, E> {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().temporary().try_update(&key, f)
     }
 
     pub fn extend_ttl(&self, threshold: u32, extend_to: u32) {
-        let key = K::default().to_key();
+        let key = self.key();
         env()
             .storage()
             .temporary()
             .extend_ttl(&key, threshold, extend_to);
     }
 
     pub fn remove(&self) {
-        let key = K::default().to_key();
+        let key = self.key();
         env().storage().temporary().remove(&key);
     }
 }

examples/soroban/auth/src/subcontract.rs

@@ -1,6 +1,6 @@
 use loam_sdk::{
     loamstorage,
-    soroban_sdk::{self, env, Address, Lazy, PersistentMap},
+    soroban_sdk::{self, Address, Lazy, PersistentMap},
     subcontract,
 };
 

examples/soroban/custom_types/src/subcontract.rs

@@ -1,6 +1,6 @@
 use loam_sdk::{
     loamstorage,
-    soroban_sdk::{self, contracttype, env, Lazy, PersistentItem},
+    soroban_sdk::{self, contracttype, Lazy, PersistentItem},
     subcontract,
 };
 

examples/soroban/deep_contract_auth/Cargo.toml

@@ -15,16 +15,4 @@ loam-subcontract-core = { workspace = true }
 [dev-dependencies]
 loam-sdk = { workspace = true, features = ["soroban-sdk-testutils"] }
 
-[profile.release]
-opt-level = "z"
-overflow-checks = true
-debug = 0
-strip = "symbols"
-debug-assertions = false
-panic = "abort"
-codegen-units = 1
-lto = true
 
-[profile.release-with-logs]
-inherits = "release"
-debug-assertions = true

examples/soroban/deployer/contract/Cargo.toml

@@ -17,16 +17,4 @@ loam-subcontract-core = { workspace = true }
 [dev-dependencies]
 loam-sdk = { workspace = true, features = ["soroban-sdk-testutils"] }
 
-[profile.release]
-opt-level = "z"
-overflow-checks = true
-debug = 0
-strip = "symbols"
-debug-assertions = false
-panic = "abort"
-codegen-units = 1
-lto = true
 
-[profile.release-with-logs]
-inherits = "release"
-debug-assertions = true

examples/soroban/deployer/deployer/Cargo.toml

@@ -17,16 +17,4 @@ loam-subcontract-core = { workspace = true }
 [dev-dependencies]
 loam-sdk = { workspace = true, features = ["soroban-sdk-testutils"] }
 
-[profile.release]
-opt-level = "z"
-overflow-checks = true
-debug = 0
-strip = "symbols"
-debug-assertions = false
-panic = "abort"
-codegen-units = 1
-lto = true
 
-[profile.release-with-logs]
-inherits = "release"
-debug-assertions = true

examples/soroban/increment-init/src/counter.rs

@@ -14,7 +14,7 @@ pub trait IsCountable {
     /// Increment increments an internal counter, and returns the value.
     fn increment(&mut self) -> u32;
 
-    fn init(&mut self, num: u32);
+    fn __constructor(&mut self, num: u32);
 }
 
 impl IsCountable for Counter {
@@ -26,7 +26,7 @@ impl IsCountable for Counter {
         count
     }
 
-    fn init(&mut self, num: u32) {
+    fn __constructor(&mut self, num: u32) {
         self.count.set(&num);
     }
 }

examples/soroban/increment-init/src/test.rs

@@ -6,7 +6,7 @@ extern crate std;
 #[test]
 fn test() {
     let env = Env::default();
-    let contract_id = env.register(SorobanContract__, ());
+    let contract_id = env.register(SorobanContract__, (0u32,));
     let client = SorobanContract__Client::new(&env, &contract_id);
 
     assert_eq!(client.increment(), 1);

examples/soroban/logging/src/test.rs

@@ -14,9 +14,9 @@ fn test() {
 
     let id_bytes = BytesN::from_array(&env, &[8; 32]);
 
-    let _addr: Address =
+    let addr: Address =
         Address::try_from_val(&env, &ScAddress::Contract(Hash(id_bytes.to_array()))).unwrap();
-    let contract_id = env.register( SorobanContract__, ());
+    let contract_id = env.register_at(&addr,  SorobanContract__, ());
     let client = SorobanContract__Client::new(&env, &contract_id);
 
     client.hello(&symbol_short!("Dev"));

examples/soroban/simple_account/src/subcontract.rs

@@ -1,5 +1,5 @@
 use loam_sdk::{
-    loamstorage, soroban_sdk::{self, auth::Context,  BytesN, InstanceItem, Lazy, Vec}, subcontract,
+    loamstorage, soroban_sdk::{self, auth::Context, env, BytesN, InstanceItem, Lazy, Vec}, subcontract,
 };
 
 use crate::error::Error;
@@ -15,7 +15,7 @@ pub trait IsSimpleAccount {
     fn __check_auth(
         &self,
         signature_payload: BytesN<32>,
-        signatures: Vec<BytesN<64>>,
+        signature: BytesN<64>,
         auth_context: Vec<Context>,
     ) -> Result<(), Error>;
 }
@@ -32,19 +32,15 @@ impl IsSimpleAccount for SimpleAccountManager {
     #[allow(non_snake_case)]
     fn __check_auth(
         &self,
-        _signature_payload: BytesN<32>,
-        _signatures: Vec<BytesN<64>>,
+        signature_payload: BytesN<32>,
+        signature: BytesN<64>,
         _auth_context: Vec<Context>,
-    ) -> Result<(), Error> {
-        // if signatures.len() != 1 {
-        //     return Err(Error::IncorrectSignatureCount);
-        // }
-
-        // env().crypto().ed25519_verify(
-        //     &self.owner.get().unwrap(),
-        //     &signature_payload.into(),
-        //     &signatures.get(0).unwrap(),
-        // );
+    )-> Result<(), Error> {
+        env().crypto().ed25519_verify(
+            &self.owner.get().unwrap(),
+            &signature_payload.into(),
+            &signature,
+        );
 
         Ok(())
     }

examples/soroban/simple_account/src/test.rs

@@ -3,19 +3,21 @@ extern crate std;
 
 use ed25519_dalek::Keypair;
 use ed25519_dalek::Signer;
-use loam_sdk::soroban_sdk::Error;
-use loam_sdk::soroban_sdk::Val;
-use loam_sdk::soroban_sdk::{testutils::BytesN as _, vec, BytesN, Env, IntoVal};
+use loam_sdk::soroban_sdk;
 use rand::thread_rng;
+use soroban_sdk::Error;
+use soroban_sdk::Val;
+use soroban_sdk::{testutils::BytesN as _, vec, BytesN, Env, IntoVal};
+
+use crate::SorobanContract__ as SimpleAccount;
+use crate::SorobanContract__Client as SimpleAccountClient;
 
-use crate::SorobanContract__;
-use crate::SorobanContract__Client;
 fn generate_keypair() -> Keypair {
     Keypair::generate(&mut thread_rng())
 }
 
-fn create_account_contract(e: &Env) -> SorobanContract__Client {
-    SorobanContract__Client::new(e, &e.register(SorobanContract__, ()))
+fn create_account_contract(e: &Env) -> SimpleAccountClient {
+    SimpleAccountClient::new(e, &e.register(SimpleAccount, ()))
 }
 
 fn sign(e: &Env, signer: &Keypair, payload: &BytesN<32>) -> Val {

examples/soroban/status_message/src/status_message.rs

@@ -2,7 +2,7 @@
 // Currently need to import `self` because `contracttype` expects it in the namespace
 use loam_sdk::{
     loamstorage,
-    soroban_sdk::{self, env, Address, Lazy, PersistentMap, String},
+    soroban_sdk::{self,  Address, Lazy, PersistentMap, String},
     subcontract,
 };
 
@@ -15,7 +15,7 @@ pub struct StatusMessage {
 pub trait IsPostable {
     /// Documentation ends up in the contract's metadata and thus the CLI, etc
     fn messages_get(&self, author: loam_sdk::soroban_sdk::Address)
-        -> loam_sdk::soroban_sdk::String;
+        -> Option<loam_sdk::soroban_sdk::String>;
 
     /// Only the author can set the message
     fn messages_set(

examples/soroban/ttl/Cargo.toml

@@ -13,16 +13,6 @@ doctest = false
 loam-sdk = { workspace = true, features = ["loam-soroban-sdk"] }
 loam-subcontract-core = { workspace = true }
 
-[profile.release]
-opt-level = "z"
-overflow-checks = true
-debug = 0
-strip = "symbols"
-debug-assertions = false
-panic = "abort"
-codegen-units = 1
-lto = true
 
-[profile.release-with-logs]
-inherits = "release"
-debug-assertions = true
+[dev-dependencies]
+loam-sdk = { workspace = true, features = ["soroban-sdk-testutils"] }