diff --git a/FULL_HELP_DOCS.md b/FULL_HELP_DOCS.md index b3724b98b..babeabfc6 100644 --- a/FULL_HELP_DOCS.md +++ b/FULL_HELP_DOCS.md @@ -354,16 +354,6 @@ If no keys are specified the contract itself is extended. * `--key-xdr ` — Storage key (base64-encoded XDR) * `--wasm ` — Path to Wasm file of contract code to extend * `--wasm-hash ` — Path to Wasm file of contract code to extend -* `--durability ` — Storage entry durability - - Default value: `persistent` - - Possible values: - - `persistent`: - Persistent - - `temporary`: - Temporary - * `--rpc-url ` — RPC server endpoint * `--rpc-header ` — RPC Header(s) to include in requests to the RPC provider * `--network-passphrase ` — Network passphrase to sign the transaction sent to the rpc server @@ -782,16 +772,6 @@ Print the current value of a contract-data ledger entry * `--key-xdr ` — Storage key (base64-encoded XDR) * `--wasm ` — Path to Wasm file of contract code to extend * `--wasm-hash ` — Path to Wasm file of contract code to extend -* `--durability ` — Storage entry durability - - Default value: `persistent` - - Possible values: - - `persistent`: - Persistent - - `temporary`: - Temporary - * `--rpc-url ` — RPC server endpoint * `--rpc-header ` — RPC Header(s) to include in requests to the RPC provider * `--network-passphrase ` — Network passphrase to sign the transaction sent to the rpc server @@ -816,16 +796,6 @@ If no keys are specificed the contract itself is restored. * `--key-xdr ` — Storage key (base64-encoded XDR) * `--wasm ` — Path to Wasm file of contract code to extend * `--wasm-hash ` — Path to Wasm file of contract code to extend -* `--durability ` — Storage entry durability - - Default value: `persistent` - - Possible values: - - `persistent`: - Persistent - - `temporary`: - Temporary - * `--ledgers-to-extend ` — Number of ledgers to extend the entry * `--ttl-ledger-only` — Only print the new Time To Live ledger * `--rpc-url ` — RPC server endpoint diff --git a/cmd/crates/soroban-test/tests/it/integration/cookbook.rs b/cmd/crates/soroban-test/tests/it/integration/cookbook.rs index 5e9a30eb2..c170e7cac 100644 --- a/cmd/crates/soroban-test/tests/it/integration/cookbook.rs +++ b/cmd/crates/soroban-test/tests/it/integration/cookbook.rs @@ -83,10 +83,10 @@ fn run_command( modified_args.push(key_xdr.to_string()); skip_next = true; } - "" => { - modified_args.push("persistent".to_string()); - skip_next = false; - } + // "" => { + // modified_args.push("persistent".to_string()); + // skip_next = false; + // } "" => { modified_args.push("COUNTER".to_string()); skip_next = false; diff --git a/cmd/crates/soroban-test/tests/it/integration/hello_world.rs b/cmd/crates/soroban-test/tests/it/integration/hello_world.rs index 272587c53..26ad84681 100644 --- a/cmd/crates/soroban-test/tests/it/integration/hello_world.rs +++ b/cmd/crates/soroban-test/tests/it/integration/hello_world.rs @@ -246,7 +246,7 @@ fn contract_data_read_failure(sandbox: &TestEnv, id: &str) { .arg("--id") .arg(id) .arg("--key=COUNTER") - .arg("--durability=persistent") + // .arg("--durability=persistent") .assert() .failure() .stderr( @@ -273,7 +273,7 @@ async fn contract_data_read() { .arg(id) .arg("--key") .arg(KEY) - .arg("--durability=persistent") + // .arg("--durability=persistent") .assert() .success() .stdout(predicates::str::starts_with("COUNTER,1")); diff --git a/cmd/crates/soroban-test/tests/it/integration/util.rs b/cmd/crates/soroban-test/tests/it/integration/util.rs index 438428e38..d3c3a9939 100644 --- a/cmd/crates/soroban-test/tests/it/integration/util.rs +++ b/cmd/crates/soroban-test/tests/it/integration/util.rs @@ -97,7 +97,7 @@ pub async fn extend_contract(sandbox: &TestEnv, id: &str) { } pub async fn extend(sandbox: &TestEnv, id: &str, value: Option<&str>) { - let mut args = vec!["--id", id, "--ledgers-to-extend", "100001"]; + if let Some(value) = value { args.push("--key"); args.push(value); diff --git a/cmd/soroban-cli/src/commands/contract/install.rs b/cmd/soroban-cli/src/commands/contract/install.rs index cd6e93b24..3047d6918 100644 --- a/cmd/soroban-cli/src/commands/contract/install.rs +++ b/cmd/soroban-cli/src/commands/contract/install.rs @@ -214,7 +214,6 @@ impl NetworkRunnable for Cmd { key_xdr: None, wasm: Some(self.wasm.wasm.clone()), wasm_hash: None, - durability: super::Durability::Persistent, }, config: config.clone(), fee: self.fee.clone(), diff --git a/cmd/soroban-cli/src/key.rs b/cmd/soroban-cli/src/key.rs index 3f4dcaf7c..61cde0320 100644 --- a/cmd/soroban-cli/src/key.rs +++ b/cmd/soroban-cli/src/key.rs @@ -3,7 +3,6 @@ use crate::xdr::{ ScVal, }; use crate::{ - commands::contract::Durability, config::{locator, network::Network}, wasm, }; @@ -59,9 +58,6 @@ pub struct Args { conflicts_with = "wasm" )] pub wasm_hash: Option, - /// Storage entry durability - #[arg(long, value_enum, default_value = "persistent")] - pub durability: Durability, } impl Args { @@ -105,7 +101,7 @@ impl Args { .map(|key| { LedgerKey::ContractData(LedgerKeyContractData { contract: ScAddress::Contract(xdr::Hash(contract.0)), - durability: (&self.durability).into(), + durability: xdr::ContractDataDurability::Persistent, key, }) })