Merge branch 'main' into marvin/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;