From 3332926c417d6c4ef47b96dd6ab38f876cc46a39 Mon Sep 17 00:00:00 2001 From: peg Date: Wed, 29 May 2024 13:08:11 +0200 Subject: [PATCH 1/3] Store program command no longer defaults to the barebones program --- crates/test-cli/Cargo.toml | 23 +++++++++++------------ crates/test-cli/src/main.rs | 8 ++------ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/crates/test-cli/Cargo.toml b/crates/test-cli/Cargo.toml index aad448821..a2e340384 100644 --- a/crates/test-cli/Cargo.toml +++ b/crates/test-cli/Cargo.toml @@ -9,15 +9,14 @@ repository ='https://github.com/entropyxyz/entropy-core' edition ='2021' [dependencies] -entropy-testing-utils={ version="0.1.0", path="../testing-utils" } -entropy-client ={ version="0.1.0", path="../client" } -clap ={ version="4.4.6", features=["derive"] } -colored ="2.0.4" -subxt ="0.35.3" -sp-core ="31.0.0" -anyhow ="1.0.86" -tokio ={ version="1.16", features=["macros", "rt-multi-thread", "io-util", "process"] } -hex ="0.4.3" -bincode ="1.3.3" -x25519-dalek ="2.0.1" -sp-runtime ={ version="32.0.0", default-features=false } +entropy-client={ version="0.1.0", path="../client" } +clap ={ version="4.4.6", features=["derive"] } +colored ="2.0.4" +subxt ="0.35.3" +sp-core ="31.0.0" +anyhow ="1.0.86" +tokio ={ version="1.16", features=["macros", "rt-multi-thread", "io-util", "process"] } +hex ="0.4.3" +bincode ="1.3.3" +x25519-dalek ="2.0.1" +sp-runtime ={ version="32.0.0", default-features=false } diff --git a/crates/test-cli/src/main.rs b/crates/test-cli/src/main.rs index a21d4af1c..78f346481 100644 --- a/crates/test-cli/src/main.rs +++ b/crates/test-cli/src/main.rs @@ -36,7 +36,6 @@ use entropy_client::{ update_programs, KeyParams, KeyShare, KeyVisibility, VERIFYING_KEY_LENGTH, }, }; -use entropy_testing_utils::constants::TEST_PROGRAM_WASM_BYTECODE; use sp_core::{sr25519, DeriveJunction, Hasher, Pair}; use sp_runtime::traits::BlakeTwo256; use subxt::{ @@ -133,7 +132,7 @@ enum CliCommand { /// Optionally may be preceeded with "//", eg: "//Alice" mnemonic: String, /// The path to a .wasm file containing the program (defaults to a test program) - program_file: Option, + program_file: PathBuf, /// The path to a file containing the program config interface (defaults to empty) config_interface_file: Option, /// The path to a file containing the program aux interface (defaults to empty) @@ -280,10 +279,7 @@ async fn run_command() -> anyhow::Result { let keypair = ::from_string(&mnemonic, None)?; println!("Storing program using account: {}", keypair.public()); - let program = match program_file { - Some(file_name) => fs::read(file_name)?, - None => TEST_PROGRAM_WASM_BYTECODE.to_owned(), - }; + let program = fs::read(program_file)?; let config_interface = match config_interface_file { Some(file_name) => fs::read(file_name)?, From 8b49681b295ccf0a4ccd53619488136f6fe76ded Mon Sep 17 00:00:00 2001 From: peg Date: Wed, 29 May 2024 13:08:22 +0200 Subject: [PATCH 2/3] Lockfile --- Cargo.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 4187ae921..70343e093 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2654,7 +2654,6 @@ dependencies = [ "clap", "colored", "entropy-client", - "entropy-testing-utils", "hex", "sp-core 31.0.0", "sp-runtime 32.0.0", From 0403178522b9d4e403f0be280fbbecc21f855d5f Mon Sep 17 00:00:00 2001 From: peg Date: Wed, 29 May 2024 13:14:30 +0200 Subject: [PATCH 3/3] Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35623503d..8e65490d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ At the moment this project **does not** adhere to ### Added - Add a way to change program modification account ([#843](https://github.com/entropyxyz/entropy-core/pull/843)) +### Changed + +- Test-cli store program command no longer defaults to the barebones program ([#860](https://github.com/entropyxyz/entropy-core/pull/860)) + ## [0.1.0](https://github.com/entropyxyz/entropy-core/compare/release/v0.0.12...release/v0.1.0) - 2024-05-20 This is the first publicly available version of Entropy 🥳