From e4655894139aa74065399c16c996d0a33d07240c Mon Sep 17 00:00:00 2001 From: Wojciech Szymczyk Date: Wed, 6 Dec 2023 13:41:27 +0100 Subject: [PATCH] Add missing flags to show-config (#1309) ## Introduced changes - add missing properties to show-config command ## Checklist - [X] Linked relevant issue - [X] Updated relevant documentation - [X] Added relevant tests - [X] Performed self-review of the code - [X] Added changes to `CHANGELOG.md` --- crates/cast/src/helpers/response_structs.rs | 2 ++ .../cast/src/starknet_commands/show_config.rs | 4 ++++ .../tests/data/show_config/wait_Scarb.toml | 24 +++++++++++++++++++ crates/cast/tests/e2e/show_config.rs | 18 ++++++++++++-- docs/src/appendix/cast-library/invoke.md | 2 +- 5 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 crates/cast/tests/data/show_config/wait_Scarb.toml diff --git a/crates/cast/src/helpers/response_structs.rs b/crates/cast/src/helpers/response_structs.rs index e71002e4d3..86be15f327 100644 --- a/crates/cast/src/helpers/response_structs.rs +++ b/crates/cast/src/helpers/response_structs.rs @@ -58,6 +58,8 @@ pub struct ShowConfigResponse { pub scarb_path: Option, pub accounts_file_path: Option, pub keystore: Option, + pub wait_timeout: Option, + pub wait_retry_interval: Option, } #[derive(Serialize)] diff --git a/crates/cast/src/starknet_commands/show_config.rs b/crates/cast/src/starknet_commands/show_config.rs index fcfb3bbcfd..118c559e01 100644 --- a/crates/cast/src/starknet_commands/show_config.rs +++ b/crates/cast/src/starknet_commands/show_config.rs @@ -29,6 +29,8 @@ pub async fn show_config( if keystore.is_some() { accounts_file_path = None; } + let wait_timeout = Some(cast_config.wait_timeout); + let wait_retry_interval = Some(cast_config.wait_retry_interval); Ok(ShowConfigResponse { profile, @@ -38,5 +40,7 @@ pub async fn show_config( scarb_path, accounts_file_path, keystore, + wait_timeout, + wait_retry_interval, }) } diff --git a/crates/cast/tests/data/show_config/wait_Scarb.toml b/crates/cast/tests/data/show_config/wait_Scarb.toml new file mode 100644 index 0000000000..0757bec277 --- /dev/null +++ b/crates/cast/tests/data/show_config/wait_Scarb.toml @@ -0,0 +1,24 @@ +[package] +name = "correct" +version = "0.1.0" + +[dependencies] +starknet = ">=1.1.1" + +[[target.starknet-contract]] +casm = true + +[lib] +sierra = false + +[tool.sncast] +url = "http://127.0.0.1:5055/rpc" +account = "/path/to/account.json" +keystore = "../keystore" + +[tool.sncast.profile1] +url = "http://127.0.0.1:5055/rpc" +account = "user1" +accounts-file = "../account-file" +wait-timeout = 123 +wait-retry-interval = 12 diff --git a/crates/cast/tests/e2e/show_config.rs b/crates/cast/tests/e2e/show_config.rs index a067785171..7810e25044 100644 --- a/crates/cast/tests/e2e/show_config.rs +++ b/crates/cast/tests/e2e/show_config.rs @@ -5,7 +5,7 @@ use indoc::indoc; async fn test_show_config_from_scarb_toml() { let args = vec![ "--path-to-scarb-toml", - "tests/data/show_config/all_Scarb.toml", + "tests/data/show_config/wait_Scarb.toml", "--profile", "profile1", "show-config", @@ -20,7 +20,9 @@ async fn test_show_config_from_scarb_toml() { chain_id: alpha-goerli profile: profile1 rpc_url: http://127.0.0.1:5055/rpc - scarb_path: tests/data/show_config/all_Scarb.toml + scarb_path: tests/data/show_config/wait_Scarb.toml + wait_retry_interval: 12 + wait_timeout: 123 "}); } @@ -33,6 +35,10 @@ async fn test_show_config_from_cli() { "http://127.0.0.1:5055/rpc", "--keystore", "../keystore", + "--wait-timeout", + "2", + "--wait-retry-interval", + "1", "show-config", ]; @@ -44,6 +50,8 @@ async fn test_show_config_from_cli() { chain_id: alpha-goerli keystore: ../keystore rpc_url: http://127.0.0.1:5055/rpc + wait_retry_interval: 1 + wait_timeout: 2 "}); } @@ -69,6 +77,8 @@ async fn test_show_config_from_cli_and_scarb() { profile: profile1 rpc_url: http://127.0.0.1:5055/rpc scarb_path: tests/data/show_config/all_Scarb.toml + wait_retry_interval: 5 + wait_timeout: 300 "}); } @@ -92,6 +102,8 @@ async fn test_show_config_when_no_keystore() { profile: profile1 rpc_url: http://127.0.0.1:5055/rpc scarb_path: tests/data/show_config/all_Scarb.toml + wait_retry_interval: 5 + wait_timeout: 300 "}); } @@ -112,5 +124,7 @@ async fn test_show_config_when_keystore() { keystore: ../keystore rpc_url: http://127.0.0.1:5055/rpc scarb_path: tests/data/show_config/all_Scarb.toml + wait_retry_interval: 5 + wait_timeout: 300 "}); } diff --git a/docs/src/appendix/cast-library/invoke.md b/docs/src/appendix/cast-library/invoke.md index 5db66f3548..7744b661dd 100644 --- a/docs/src/appendix/cast-library/invoke.md +++ b/docs/src/appendix/cast-library/invoke.md @@ -8,7 +8,7 @@ nonce: Option ) -> InvokeResult` -Deploys a contract and returns `InvokeResult`. +Invokes a contract and returns `InvokeResult`. ```rust #[derive(Drop, Clone)]