Merge pull request #338 from logos-blockchain/marvin/refactor-amm-state-tests

Refactor AMM state tests

Cargo.lock

@@ -335,6 +335,7 @@ name = "amm_program"
 version = "0.1.0"
 dependencies = [
  "amm_core",
+ "nssa",
  "nssa_core",
  "token_core",
 ]

nssa/Cargo.toml

@@ -28,7 +28,6 @@ risc0-binfmt = "3.0.2"
 
 [dev-dependencies]
 token_core.workspace = true
-amm_core.workspace = true
 test_program_methods.workspace = true
 
 env_logger.workspace = true
@@ -38,3 +37,4 @@ test-case = "3.3.1"
 [features]
 default = []
 prove = ["risc0-zkvm/prove"]
+test-utils = []

nssa/core/src/account.rs

@@ -14,6 +14,7 @@ use crate::program::ProgramId;
 pub mod data;
 
 pub type Nonce = u128;
+pub type Balance = u128;
 
 /// Account to be used both in public and private contexts.
 #[derive(
@@ -21,7 +22,7 @@ pub type Nonce = u128;
 )]
 pub struct Account {
     pub program_owner: ProgramId,
-    pub balance: u128,
+    pub balance: Balance,
     pub data: Data,
     pub nonce: Nonce,
 }

programs/amm/Cargo.toml

@@ -8,6 +8,10 @@ license = { workspace = true }
 workspace = true
 
 [dependencies]
+nssa = { workspace = true, optional = true, features = ["test-utils"], default-features = true }
 nssa_core.workspace = true
 token_core.workspace = true
 amm_core.workspace = true
+
+[features]
+nssa = ["dep:nssa"]

programs/amm/src/lib.rs

@@ -14,4 +14,5 @@ pub mod new_definition;
 pub mod remove;
 pub mod swap;
 
+#[cfg(test)]
 mod tests;