done with hey-partners

movementlabsxyz · Jul 1, 2024 · 328c0ac · 328c0ac
2 parents 4faacd9 + 7911898
commit 328c0ac
Show file tree

Hide file tree

Showing 37 changed files with 9,837 additions and 79 deletions.
diff --git a/flake.nix b/flake.nix
@@ -134,25 +134,6 @@
  };
  inherit craneLib;
  };
-
- movementswap-core = pkgs.stdenv.mkDerivation {
- pname = "movementswap-core";
- version = "branch-main";
- src = pkgs.fetchFromGitHub {
- owner = "movementlabsxyz";
- repo = "movementswap-core";
- rev = "b05e21ad220de11af266696bb3b00ab8b0893e24";
- sha256 = "sha256-hSmzcr3ZJIVCuOt5x+Run3o3xyUtS6qqQiE8Tsefb9g=";
- };
- installPhase = ''
- cp -r . $out
- '';
- meta = with pkgs.lib; {
- description = "Movementswap core repository";
- homepage = "https://github.com/movementlabsxyz/movementswap-core";
- license = licenses.asl20;
- };
- };
 
  in
  with pkgs; {
@@ -187,7 +168,6 @@
  OPENSSL_DEV = pkgs.openssl.dev;
  PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig";
  MONZA_APTOS_PATH = monza-aptos;
- MOVEMENT_SWAP_PATH = movementswap-core;
 
  buildInputs = [] ++buildDependencies ++sysDependencies ++testDependencies;
  nativeBuildInputs = [] ++buildDependencies ++sysDependencies;
@@ -198,18 +178,8 @@
  // # Movement Swap Core
  DOT_MOVEMENT_PATH=$(pwd)/.movement
  mkdir -p $DOT_MOVEMENT_PATH
- export $MOVEMENT_SWAP_PATH
- echo "Building movement-swap-core..."
- cp -R "$MOVEMENT_SWAP_PATH" $DOT_MOVEMENT_PATH/movementswap-core
- chmod -R 755 $DOT_MOVEMENT_PATH/movementswap-core
- WORKING_DIRECTORY=$(pwd)
- cd $DOT_MOVEMENT_PATH/movementswap-core/tests/typescript-sdk
- npm install pnpm
- pnpm install
- cd $WORKING_DIRECTORY
 
  echo "Monza Aptos path: $MONZA_APTOS_PATH"
- echo "Movementswap path: $MOVEMENT_SWAP_PATH"
  cat <<'EOF'
  _ _ __ _ _ ____ _ _ ____ __ _ ____
  ( \/ ) / \ / )( \( __)( \/ )( __)( ( \(_ _)

diff --git a/networks/suzuka/suzuka-client/.aptos/config.yaml b/networks/suzuka/suzuka-client/.aptos/config.yaml
@@ -4,5 +4,5 @@ profiles:
  private_key: "0xfbc0596f14bd008b20269a52e22311842453ccd3dd64575bc656dc8e755244b7"
  public_key: "0xbe11803a40d33723d0a294cb657dd2477af4c31cae019f1e4bd783084033d1f6"
  account: 00da3c48fe5d426966ae33945eff05cdbc5fb9a986c92d26a9d7665d99efdeff
- rest_url: "http://0.0.0.0:30731/"
- faucet_url: "http://0.0.0.0:30732/"
+ rest_url: "http://localhost:30731/"
+ faucet_url: "http://localhost:30732/"
diff --git a/networks/suzuka/suzuka-client/log_file.txt b/networks/suzuka/suzuka-client/log_file.txt
@@ -1,10 +0,0 @@
-[2m2024-06-18T17:41:50.972997Z[0m [33m WARN[0m [2msuzuka_client::load_soak_testing[0m[2m:[0m Error during scenario spawning: task 4 panicked
-[2m2024-06-18T17:41:50.973007Z[0m [33m WARN[0m [2msuzuka_client::load_soak_testing[0m[2m:[0m Error during scenario spawning: task 9 panicked
-[2m2024-06-18T17:41:50.973034Z[0m [33m WARN[0m [2msuzuka_client::load_soak_testing[0m[2m:[0m Error during scenario spawning: task 1 panicked
-[2m2024-06-18T17:41:50.973131Z[0m [33m WARN[0m [2msuzuka_client::load_soak_testing[0m[2m:[0m Error during scenario spawning: task 2 panicked
-[2m2024-06-18T17:41:50.973141Z[0m [33m WARN[0m [2msuzuka_client::load_soak_testing[0m[2m:[0m Error during scenario spawning: task 6 panicked
-[2m2024-06-18T17:41:50.973135Z[0m [33m WARN[0m [2msuzuka_client::load_soak_testing[0m[2m:[0m Error during scenario spawning: task 10 panicked
-[2m2024-06-18T17:41:50.973155Z[0m [33m WARN[0m [2msuzuka_client::load_soak_testing[0m[2m:[0m Error during scenario spawning: task 8 panicked
-[2m2024-06-18T17:41:50.973184Z[0m [33m WARN[0m [2msuzuka_client::load_soak_testing[0m[2m:[0m Error during scenario spawning: task 3 panicked
-[2m2024-06-18T17:41:50.973201Z[0m [33m WARN[0m [2msuzuka_client::load_soak_testing[0m[2m:[0m Error during scenario spawning: task 5 panicked
-[2m2024-06-18T17:41:50.973216Z[0m [33m WARN[0m [2msuzuka_client::load_soak_testing[0m[2m:[0m Error during scenario spawning: task 7 panicked

diff --git a/networks/suzuka/suzuka-client/src/load_soak_testing/mod.rs b/networks/suzuka/suzuka-client/src/load_soak_testing/mod.rs
@@ -167,16 +167,20 @@ pub fn execute_test(config: ExecutionConfig, create_scenario: Arc<scenario::Crea
  .into_iter()
  .filter_map(|res| (res.average_execution_time_milli > 0).then_some(res))
  .collect();
-
- let average_exec_time = no_zero_exec_time
- .iter()
- .map(|res| res.average_execution_time_milli)
- .sum::<u128>()
- / no_zero_exec_time.len() as u128;
- let metrics_average_exec_time = serde_json::to_string(&average_exec_time)
- .unwrap_or("Metric execution result serialization error.".to_string());
- tracing::info!(target:EXEC_LOG_FILTER, metrics_average_exec_time);
- tracing::info!("Scenarios execution average_exec_time:{metrics_average_exec_time}");
+ if no_zero_exec_time.len() > 0 {
+ let average_exec_time = no_zero_exec_time
+ .iter()
+ .map(|res| res.average_execution_time_milli)
+ .sum::<u128>()
+ / no_zero_exec_time.len() as u128;
+ let metrics_average_exec_time = serde_json::to_string(&average_exec_time)
+ .unwrap_or("Metric execution result serialization error.".to_string());
+ tracing::info!(target:EXEC_LOG_FILTER, metrics_average_exec_time);
+ tracing::info!("Scenarios execution average_exec_time:{metrics_average_exec_time}");
+ } else {
+ tracing::info!(target:EXEC_LOG_FILTER, "No scenario has been executed");
+ tracing::info!("Scenarios execution: No scenario has been executed");
+ };
 
  tracing::info!("End test scenario execution.");
 }
@@ -220,8 +224,8 @@ impl TestClient {
  // max_scenarios - min_scenarios scenarios run part-time depending on the number of cycle.
  // Part-time scenario duration max: Duration / (number_cycle * 2)
  // scenario start delta: (Part-time scenario duration max * scenario index / nb scenario) + (Duration * current cycle / nb cycle)
- let _number_part_time_scenario: u32 = (max_scenarios - min_scenarios) as u32;
- let _parttime_scenario_duration = duration / (number_cycle * 2);
+ let number_part_time_scenario: u32 = (max_scenarios - min_scenarios) as u32;
+ let parttime_scenario_duration = duration / (number_cycle * 2);
  vec![]
  }
  }
@@ -384,10 +388,11 @@ impl ClientExecResult {
  .into_iter()
  .filter_map(|s| if s.is_ok() { Some(s.elapse_millli) } else { None })
  .collect();
- ok_scenario.iter().sum::<u128>() / ok_scenario.len() as u128
+ ok_scenario.iter().sum::<u128>()
+ // / ok_scenario.len() as u128
  } else {
  tracing::warn!("No result available average exec time is 0");
  0
  }
  }
-}
+}
diff --git a/networks/suzuka/suzuka-client/src/tests/hey-partners/.env b/networks/suzuka/suzuka-client/src/tests/hey-partners/.env
@@ -0,0 +1,5 @@
+SWAP_DEPLOYER=0xef115fb777122a4983d54e5c420e77c80a83c1dc43d4a42d484c9aa9b3678e5c
+RESOURCE_ACCOUNT_DEPLOYER=0x3fd7802c63826ea94b8102e71f95c562f2d4ac5cbd76537a6bb4224b8c74791d
+PRIVATE_KEY=0x47d6b309dfcc38a09ab9477f624e8b6ede5ea1ee9d63911c63fc715c1c8f7a26
+FULLNODE=http://localhost:30731
+FAUCET=http://localhost:30733
diff --git a/networks/suzuka/suzuka-client/src/tests/hey-partners/.gitignore b/networks/suzuka/suzuka-client/src/tests/hey-partners/.gitignore
@@ -0,0 +1,4 @@
+*/build/
+.movement aptos
+
+.aptos/
diff --git a/networks/suzuka/suzuka-client/src/tests/hey-partners/Faucet/Move.toml b/networks/suzuka/suzuka-client/src/tests/hey-partners/Faucet/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Faucet"
+version = "0.3.0"
+
+[dependencies]
+AptosFramework = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/aptos-framework/", rev = "bbce0f188d7bef08218f1fc1f46bbd3676b5c74b" }
+
+[addresses]
+SwapDeployer = "_"