Skip to content

fix: re-enable atomic swap tests (benchmarks, mutation, snapshot, chaos) #943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fejilaup-cloud merged 2 commits into from
Aug 29, 2026
Merged

fix: re-enable atomic swap tests (benchmarks, mutation, snapshot, chaos) #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d21f16a
fix: re-enable atomic swap tests (benchmarks, mutation, snapshot, chaos)
villadel Aug 27, 2026
09992be
Merge branch 'main' into fix/re-enable-atomic-swap-tests
fejilaup-cloud Aug 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions contracts/atomic_swap/src/benchmarks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ mod benchmarks {

use crate::{AtomicSwap, AtomicSwapClient};

// CPU instruction limits (conservative upper bounds).
const INITIATE_SWAP_CPU_LIMIT: u64 = 800_000;
const ACCEPT_SWAP_CPU_LIMIT: u64 = 600_000;
const REVEAL_KEY_CPU_LIMIT: u64 = 600_000;
Expand All @@ -30,9 +29,9 @@ mod benchmarks {

struct BenchCtx {
env: Env,
swap: AtomicSwapClient<'static>,
token: Address,
registry_id: Address,
swap_id: Address,
}

fn setup() -> BenchCtx {
Expand All @@ -46,9 +45,9 @@ mod benchmarks {
swap.initialize(&registry_id);
BenchCtx {
env,
swap,
token,
registry_id,
swap_id,
}
}

Expand All @@ -69,8 +68,9 @@ mod benchmarks {
let (ip_id, _secret, _blinding) = commit_ip(&ctx, &seller, 0x01);
StellarAssetClient::new(&ctx.env, &ctx.token).mint(&buyer, &1000);

let swap = AtomicSwapClient::new(&ctx.env, &ctx.swap_id);
ctx.env.budget().reset_default();
ctx.swap.initiate_swap(
swap.initiate_swap(
&ctx.token, &ip_id, &seller, &1000, &buyer, &0_u32, &None, &0i128, &false,
);
let cpu = ctx.env.budget().cpu_instruction_count();
Expand All @@ -90,12 +90,13 @@ mod benchmarks {
let buyer = Address::generate(&ctx.env);
let (ip_id, _secret, _blinding) = commit_ip(&ctx, &seller, 0x02);
StellarAssetClient::new(&ctx.env, &ctx.token).mint(&buyer, &1000);
let swap_id = ctx.swap.initiate_swap(
let swap = AtomicSwapClient::new(&ctx.env, &ctx.swap_id);
let swap_id = swap.initiate_swap(
&ctx.token, &ip_id, &seller, &1000, &buyer, &0_u32, &None, &0i128, &false,
);

ctx.env.budget().reset_default();
ctx.swap.accept_swap(&swap_id);
swap.accept_swap(&swap_id);
let cpu = ctx.env.budget().cpu_instruction_count();

assert!(
Expand All @@ -113,13 +114,14 @@ mod benchmarks {
let buyer = Address::generate(&ctx.env);
let (ip_id, secret, blinding) = commit_ip(&ctx, &seller, 0x03);
StellarAssetClient::new(&ctx.env, &ctx.token).mint(&buyer, &1000);
let swap_id = ctx.swap.initiate_swap(
let swap = AtomicSwapClient::new(&ctx.env, &ctx.swap_id);
let swap_id = swap.initiate_swap(
&ctx.token, &ip_id, &seller, &1000, &buyer, &0_u32, &None, &0i128, &false,
);
ctx.swap.accept_swap(&swap_id);
swap.accept_swap(&swap_id);

ctx.env.budget().reset_default();
ctx.swap.reveal_key(&swap_id, &seller, &secret, &blinding);
swap.reveal_key(&swap_id, &seller, &secret, &blinding);
let cpu = ctx.env.budget().cpu_instruction_count();

assert!(
Expand All @@ -137,12 +139,13 @@ mod benchmarks {
let buyer = Address::generate(&ctx.env);
let (ip_id, _secret, _blinding) = commit_ip(&ctx, &seller, 0x04);
StellarAssetClient::new(&ctx.env, &ctx.token).mint(&buyer, &1000);
let swap_id = ctx.swap.initiate_swap(
let swap = AtomicSwapClient::new(&ctx.env, &ctx.swap_id);
let swap_id = swap.initiate_swap(
&ctx.token, &ip_id, &seller, &1000, &buyer, &0_u32, &None, &0i128, &false,
);

ctx.env.budget().reset_default();
ctx.swap.cancel_swap(&swap_id, &seller);
swap.cancel_swap(&swap_id, &seller);
let cpu = ctx.env.budget().cpu_instruction_count();

assert!(
Expand All @@ -160,12 +163,13 @@ mod benchmarks {
let buyer = Address::generate(&ctx.env);
let (ip_id, _secret, _blinding) = commit_ip(&ctx, &seller, 0x05);
StellarAssetClient::new(&ctx.env, &ctx.token).mint(&buyer, &1000);
let swap_id = ctx.swap.initiate_swap(
let swap = AtomicSwapClient::new(&ctx.env, &ctx.swap_id);
let swap_id = swap.initiate_swap(
&ctx.token, &ip_id, &seller, &1000, &buyer, &0_u32, &None, &0i128, &false,
);

ctx.env.budget().reset_default();
ctx.swap.get_swap(&swap_id);
swap.get_swap(&swap_id);
let cpu = ctx.env.budget().cpu_instruction_count();

assert!(
Expand Down
20 changes: 10 additions & 10 deletions contracts/atomic_swap/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#![allow(deprecated)]
mod registry;
mod swap;
// mod upgrade;
mod upgrade;
mod multi_currency;
mod price_oracle;
mod types;
Expand All @@ -18,7 +18,7 @@ use soroban_sdk::{
BytesN, Env, Error, IntoVal, String, Val, Vec,
};

// pub use upgrade::{build_v1_schema, ContractSchema, ErrorEntry, FunctionEntry};
pub use upgrade::{build_v1_schema, ContractSchema, ErrorEntry, FunctionEntry};
pub use types::*;

mod validation;
Expand Down Expand Up @@ -5402,17 +5402,17 @@ impl AtomicSwap {
// #[cfg(test)]
// mod regression_tests;

// #[cfg(test)]
// mod benchmarks;
#[cfg(test)]
mod benchmarks;

// #[cfg(test)]
// mod mutation_tests;
#[cfg(test)]
mod mutation_tests;

// #[cfg(test)]
// mod snapshot_tests;
#[cfg(test)]
mod snapshot_tests;

// #[cfg(test)]
// mod upgrade_chaos_tests;
#[cfg(test)]
mod upgrade_chaos_tests;

// FIXME: pre-existing compile errors from merge conflict - re-enable after fix
// #[cfg(test)]
Expand Down
Loading