From c8d43a3cb119e308c9770eda647eecaf7eda6c69 Mon Sep 17 00:00:00 2001 From: Willem Wyndham Date: Tue, 28 May 2024 15:15:52 -0600 Subject: [PATCH 1/4] fix: dotenv test is flaky fixes: #1335 This is currently blocking CI and failing on main. Given that clap handles ensuring that CLI args have higher priority than ENV vars, this test is more of a sanity check so it could also just be removed. --- cmd/crates/soroban-test/tests/it/integration/dotenv.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/crates/soroban-test/tests/it/integration/dotenv.rs b/cmd/crates/soroban-test/tests/it/integration/dotenv.rs index dff36dfe7..b8e76d1fc 100644 --- a/cmd/crates/soroban-test/tests/it/integration/dotenv.rs +++ b/cmd/crates/soroban-test/tests/it/integration/dotenv.rs @@ -49,7 +49,7 @@ async fn current_env_not_overwritten() { #[tokio::test] async fn cli_args_have_priority() { let e = &TestEnv::new(); - std::thread::sleep(core::time::Duration::from_millis(2000)); + std::thread::sleep(core::time::Duration::from_millis(6000)); let id = deploy_hello(e).await; write_env_file(e, &id); e.new_assert_cmd("contract") From 5a4f6d192b3767d26e34a9c49f313c2eeeec87be Mon Sep 17 00:00:00 2001 From: Willem Wyndham Date: Tue, 28 May 2024 15:22:49 -0600 Subject: [PATCH 2/4] fix: add ttl to example contracts --- cmd/soroban-cli/example_contracts.list | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/soroban-cli/example_contracts.list b/cmd/soroban-cli/example_contracts.list index ea0fbc14f..b11b8f069 100644 --- a/cmd/soroban-cli/example_contracts.list +++ b/cmd/soroban-cli/example_contracts.list @@ -19,5 +19,6 @@ simple_account single_offer timelock token +ttl upgradeable_contract workspace From 7cca521d8014f86fa1aa1fa6bd22ccaade752289 Mon Sep 17 00:00:00 2001 From: Willem Wyndham Date: Tue, 28 May 2024 15:38:12 -0600 Subject: [PATCH 3/4] fix: add back md-gen and update docs --- .cargo/config.toml | 1 + FULL_HELP_DOCS.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index e8a8edce5..9316b7a0f 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -2,6 +2,7 @@ [alias] # command aliases f = "fmt" +md-gen = "run --bin doc-gen --features clap-markdown" # b = "build" # c = "check" # t = "test" diff --git a/FULL_HELP_DOCS.md b/FULL_HELP_DOCS.md index 61fe2e07d..c23eaf76c 100644 --- a/FULL_HELP_DOCS.md +++ b/FULL_HELP_DOCS.md @@ -547,7 +547,7 @@ Initialize a Soroban project with an example contract * `-w`, `--with-example ` - Possible values: `account`, `alloc`, `atomic_multiswap`, `atomic_swap`, `auth`, `cross_contract`, `custom_types`, `deep_contract_auth`, `deployer`, `errors`, `eth_abi`, `events`, `fuzzing`, `increment`, `liquidity_pool`, `logging`, `mint-lock`, `simple_account`, `single_offer`, `timelock`, `token`, `upgradeable_contract`, `workspace` + Possible values: `account`, `alloc`, `atomic_multiswap`, `atomic_swap`, `auth`, `cross_contract`, `custom_types`, `deep_contract_auth`, `deployer`, `errors`, `eth_abi`, `events`, `fuzzing`, `increment`, `liquidity_pool`, `logging`, `mint-lock`, `simple_account`, `single_offer`, `timelock`, `token`, `ttl`, `upgradeable_contract`, `workspace` * `-f`, `--frontend-template ` From d6010f0cbb01932f5f14bc875160ecb0f9dbef13 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Tue, 28 May 2024 16:44:19 -0700 Subject: [PATCH 4/4] remove unrelated changes --- .cargo/config.toml | 1 - FULL_HELP_DOCS.md | 2 +- cmd/soroban-cli/example_contracts.list | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 9316b7a0f..e8a8edce5 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -2,7 +2,6 @@ [alias] # command aliases f = "fmt" -md-gen = "run --bin doc-gen --features clap-markdown" # b = "build" # c = "check" # t = "test" diff --git a/FULL_HELP_DOCS.md b/FULL_HELP_DOCS.md index c23eaf76c..61fe2e07d 100644 --- a/FULL_HELP_DOCS.md +++ b/FULL_HELP_DOCS.md @@ -547,7 +547,7 @@ Initialize a Soroban project with an example contract * `-w`, `--with-example ` - Possible values: `account`, `alloc`, `atomic_multiswap`, `atomic_swap`, `auth`, `cross_contract`, `custom_types`, `deep_contract_auth`, `deployer`, `errors`, `eth_abi`, `events`, `fuzzing`, `increment`, `liquidity_pool`, `logging`, `mint-lock`, `simple_account`, `single_offer`, `timelock`, `token`, `ttl`, `upgradeable_contract`, `workspace` + Possible values: `account`, `alloc`, `atomic_multiswap`, `atomic_swap`, `auth`, `cross_contract`, `custom_types`, `deep_contract_auth`, `deployer`, `errors`, `eth_abi`, `events`, `fuzzing`, `increment`, `liquidity_pool`, `logging`, `mint-lock`, `simple_account`, `single_offer`, `timelock`, `token`, `upgradeable_contract`, `workspace` * `-f`, `--frontend-template ` diff --git a/cmd/soroban-cli/example_contracts.list b/cmd/soroban-cli/example_contracts.list index b11b8f069..ea0fbc14f 100644 --- a/cmd/soroban-cli/example_contracts.list +++ b/cmd/soroban-cli/example_contracts.list @@ -19,6 +19,5 @@ simple_account single_offer timelock token -ttl upgradeable_contract workspace