From 9aac4367b4a0464d5864bcf012d38d92c33267f4 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Thu, 11 Apr 2024 13:57:06 -0300 Subject: [PATCH 01/12] update zcash_script and zcash_primitives --- Cargo.lock | 27 +++++++++++++-------------- zebra-chain/Cargo.toml | 2 +- zebra-grpc/Cargo.toml | 2 +- zebra-scan/Cargo.toml | 2 +- zebra-script/Cargo.toml | 3 ++- zebra-utils/Cargo.toml | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 95c80f5c3..fbb09f904 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1077,9 +1077,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.107" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe98ba1789d56fb3db3bee5e032774d4f421b685de7ba703643584ba24effbe" +checksum = "048948e14bc2c2652ec606c8e3bb913407f0187288fb351a0b2d972beaf12070" dependencies = [ "cc", "cxxbridge-flags", @@ -1101,15 +1101,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.107" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20888d9e1d2298e2ff473cee30efe7d5036e437857ab68bbfea84c74dba91da2" +checksum = "af40b0467c68d3d9fb7550ef984edc8ad47252f703ef0f1f2d1052e0e4af8793" [[package]] name = "cxxbridge-macro" -version = "1.0.107" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa16a70dd58129e4dfffdff535fb1bce66673f7bbeec4a5a1765a504e1ccd84" +checksum = "7743446286141c9f6d4497c493c01234eb848e14d2e20866ae9811eae0630cb9" dependencies = [ "proc-macro2", "quote", @@ -5664,9 +5664,9 @@ dependencies = [ [[package]] name = "zcash_client_backend" -version = "0.10.0-rc.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc33f71747a93d509f7e1c047961e359a271bdf4869cc07f7f65ee1ba7df8c2" +checksum = "d6a382af39be9ee5a3788157145c404b7cd19acc440903f6c34b09fb44f0e991" dependencies = [ "base64 0.21.7", "bech32", @@ -5731,9 +5731,9 @@ dependencies = [ [[package]] name = "zcash_primitives" -version = "0.13.0-rc.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc4391d9325e0a51a7cbff02b5c4b5472d66087bd9c903ddb12dea7ec22f3e0" +checksum = "d17e4c94ca8d69d2fcf2be97522da5732a580eb2125cda3b150761952f8df8e6" dependencies = [ "aes", "bip0039", @@ -5767,9 +5767,9 @@ dependencies = [ [[package]] name = "zcash_proofs" -version = "0.13.0-rc.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f22eff3bdc382327ef28f809024ddc89ec6d903ba71be629b2cbea34afdda2" +checksum = "df0c99f65a840ff256c106b28d67d702d9759d206112473d4982c92003262406" dependencies = [ "bellman", "blake2b_simd", @@ -5789,8 +5789,7 @@ dependencies = [ [[package]] name = "zcash_script" version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8deff8ea47cbe2a008abefedc1a2d9c0e48a87844379759ace270a0b53353c71" +source = "git+https://github.com/ZcashFoundation/zcash_script?branch=bump-0.1.15#a98abdebfe29bc2fb0b6fee9167609d13e10e18f" dependencies = [ "bellman", "bindgen", diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index ce18f9f93..7b4d41524 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -97,7 +97,7 @@ orchard = "0.6.0" zcash_encoding = "0.2.0" zcash_history = "0.3.0" zcash_note_encryption = "0.4.0" -zcash_primitives = { version = "0.13.0-rc.1", features = ["transparent-inputs"] } +zcash_primitives = { version = "0.13.0", features = ["transparent-inputs"] } # Time chrono = { version = "0.4.34", default-features = false, features = ["clock", "std", "serde"] } diff --git a/zebra-grpc/Cargo.toml b/zebra-grpc/Cargo.toml index 6c714ac42..310da0024 100644 --- a/zebra-grpc/Cargo.toml +++ b/zebra-grpc/Cargo.toml @@ -26,7 +26,7 @@ tokio-stream = "0.1.14" tower = { version = "0.4.13", features = ["util", "buffer"] } color-eyre = "0.6.3" -zcash_primitives = { version = "0.13.0-rc.1" } +zcash_primitives = { version = "0.13.0" } zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.35", features = ["shielded-scan"] } zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.35" } diff --git a/zebra-scan/Cargo.toml b/zebra-scan/Cargo.toml index 9e2eaf840..b9883398d 100644 --- a/zebra-scan/Cargo.toml +++ b/zebra-scan/Cargo.toml @@ -52,7 +52,7 @@ tracing = "0.1.39" futures = "0.3.30" zcash_client_backend = "0.10.0-rc.1" -zcash_primitives = "0.13.0-rc.1" +zcash_primitives = "0.13.0" zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.35", features = ["shielded-scan"] } zebra-state = { path = "../zebra-state", version = "1.0.0-beta.35", features = ["shielded-scan"] } diff --git a/zebra-script/Cargo.toml b/zebra-script/Cargo.toml index d005a2e38..443ab7968 100644 --- a/zebra-script/Cargo.toml +++ b/zebra-script/Cargo.toml @@ -15,7 +15,8 @@ keywords = ["zebra", "zcash"] categories = ["api-bindings", "cryptography::cryptocurrencies"] [dependencies] -zcash_script = "0.1.14" +#zcash_script = "0.1.14" +zcash_script = { git = "https://github.com/ZcashFoundation/zcash_script", branch = "bump-0.1.15" } zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.35" } diff --git a/zebra-utils/Cargo.toml b/zebra-utils/Cargo.toml index ff9f0ec1f..e35f77324 100644 --- a/zebra-utils/Cargo.toml +++ b/zebra-utils/Cargo.toml @@ -120,7 +120,7 @@ tokio = { version = "1.36.0", features = ["full"], optional = true } jsonrpc = { version = "0.17.0", optional = true } -zcash_primitives = { version = "0.13.0-rc.1", optional = true } +zcash_primitives = { version = "0.13.0", optional = true } zcash_client_backend = {version = "0.10.0-rc.1", optional = true} # For the openapi generator From a7833c71b7019316c0beb5032e8c3304aa364f2a Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Thu, 11 Apr 2024 13:57:40 -0300 Subject: [PATCH 02/12] restore windows support --- .github/workflows/ci-unit-tests-os.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci-unit-tests-os.yml b/.github/workflows/ci-unit-tests-os.yml index 00a534df9..4a7bd5777 100644 --- a/.github/workflows/ci-unit-tests-os.yml +++ b/.github/workflows/ci-unit-tests-os.yml @@ -78,8 +78,7 @@ jobs: strategy: fail-fast: false matrix: - # TODO: Windows was removed for now, see https://github.com/ZcashFoundation/zebra/issues/3801 - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest, windows-latest] rust: [stable, beta] # TODO: When vars.EXPERIMENTAL_FEATURES has features in it, add it here. # Or work out a way to trim the space from the variable: GitHub doesn't allow empty variables. From 8009b763e2654bf36e397044a44899921668c819 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Thu, 11 Apr 2024 17:51:33 -0300 Subject: [PATCH 03/12] add a windows config file --- .../tests/common/configs/v1.6.0-windows.toml | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 zebrad/tests/common/configs/v1.6.0-windows.toml diff --git a/zebrad/tests/common/configs/v1.6.0-windows.toml b/zebrad/tests/common/configs/v1.6.0-windows.toml new file mode 100644 index 000000000..efd56f751 --- /dev/null +++ b/zebrad/tests/common/configs/v1.6.0-windows.toml @@ -0,0 +1,82 @@ +# Default configuration for zebrad. +# +# This file can be used as a skeleton for custom configs. +# +# Unspecified fields use default values. Optional fields are Some(field) if the +# field is present and None if it is absent. +# +# This file is generated as an example using zebrad's current defaults. +# You should set only the config options you want to keep, and delete the rest. +# Only a subset of fields are present in the skeleton, since optional values +# whose default is None are omitted. +# +# The config format (including a complete list of sections and fields) is +# documented here: +# https://docs.rs/zebrad/latest/zebrad/config/struct.ZebradConfig.html +# +# zebrad attempts to load configs in the following order: +# +# 1. The -c flag on the command line, e.g., `zebrad -c myconfig.toml start`; +# 2. The file `zebrad.toml` in the users's preference directory (platform-dependent); +# 3. The default config. +# +# The user's preference directory and the default path to the `zebrad` config are platform dependent, +# based on `dirs::preference_dir`, see https://docs.rs/dirs/latest/dirs/fn.preference_dir.html : +# +# | Platform | Value | Example | +# | -------- | ------------------------------------- | ---------------------------------------------- | +# | Linux | `$XDG_CONFIG_HOME` or `$HOME/.config` | `/home/alice/.config/zebrad.toml` | +# | macOS | `$HOME/Library/Preferences` | `/Users/Alice/Library/Preferences/zebrad.toml` | +# | Windows | `{FOLDERID_RoamingAppData}` | `C:\Users\Alice\AppData\Local\zebrad.toml` | + +[consensus] +checkpoint_sync = true + +[mempool] +eviction_memory_time = "1h" +tx_cost_limit = 80000000 + +[metrics] + +[mining] +debug_like_zcashd = true + +[network] +cache_dir = true +crawl_new_peer_interval = "1m 1s" +initial_mainnet_peers = [ + "dnsseed.z.cash:8233", + "dnsseed.str4d.xyz:8233", + "mainnet.seeder.zfnd.org:8233", + "mainnet.is.yolo.money:8233", +] +initial_testnet_peers = [ + "dnsseed.testnet.z.cash:18233", + "testnet.seeder.zfnd.org:18233", + "testnet.is.yolo.money:18233", +] +listen_addr = "0.0.0.0:8233" +max_connections_per_ip = 1 +network = "Mainnet" +peerset_initial_target_size = 25 + +[rpc] +debug_force_finished_sync = false +parallel_cpu_threads = 0 + +[state] +cache_dir = 'cache_dir' +delete_old_database = true +ephemeral = false + +[sync] +checkpoint_verify_concurrency_limit = 1000 +download_concurrency_limit = 50 +full_verify_concurrency_limit = 20 +parallel_cpu_threads = 0 + +[tracing] +buffer_limit = 128000 +force_use_color = false +use_color = true +use_journald = false \ No newline at end of file From 47a9bf4f6263ac7d212dc685d6c4a4af049ca05f Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Thu, 11 Apr 2024 18:55:16 -0300 Subject: [PATCH 04/12] try exact output from CI --- zebrad/tests/common/configs/v1.6.0-windows.toml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/zebrad/tests/common/configs/v1.6.0-windows.toml b/zebrad/tests/common/configs/v1.6.0-windows.toml index efd56f751..6235972e9 100644 --- a/zebrad/tests/common/configs/v1.6.0-windows.toml +++ b/zebrad/tests/common/configs/v1.6.0-windows.toml @@ -28,19 +28,14 @@ # | Linux | `$XDG_CONFIG_HOME` or `$HOME/.config` | `/home/alice/.config/zebrad.toml` | # | macOS | `$HOME/Library/Preferences` | `/Users/Alice/Library/Preferences/zebrad.toml` | # | Windows | `{FOLDERID_RoamingAppData}` | `C:\Users\Alice\AppData\Local\zebrad.toml` | - [consensus] checkpoint_sync = true - [mempool] eviction_memory_time = "1h" tx_cost_limit = 80000000 - [metrics] - [mining] debug_like_zcashd = true - [network] cache_dir = true crawl_new_peer_interval = "1m 1s" @@ -59,22 +54,18 @@ listen_addr = "0.0.0.0:8233" max_connections_per_ip = 1 network = "Mainnet" peerset_initial_target_size = 25 - [rpc] debug_force_finished_sync = false parallel_cpu_threads = 0 - [state] cache_dir = 'cache_dir' delete_old_database = true ephemeral = false - [sync] checkpoint_verify_concurrency_limit = 1000 download_concurrency_limit = 50 full_verify_concurrency_limit = 20 parallel_cpu_threads = 0 - [tracing] buffer_limit = 128000 force_use_color = false From d2c0af02b767ae381244abf0dc704cc61f0a9da4 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Tue, 16 Apr 2024 12:55:13 -0300 Subject: [PATCH 05/12] ignore config test in windows --- zebrad/tests/acceptance.rs | 1 + .../tests/common/configs/v1.6.0-windows.toml | 73 ------------------- 2 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 zebrad/tests/common/configs/v1.6.0-windows.toml diff --git a/zebrad/tests/acceptance.rs b/zebrad/tests/acceptance.rs index 6ae68ce43..5257b8b72 100644 --- a/zebrad/tests/acceptance.rs +++ b/zebrad/tests/acceptance.rs @@ -622,6 +622,7 @@ fn config_tests() -> Result<()> { invalid_generated_config()?; // Check that we have a current version of the config stored + #[cfg(not(target_os = "windows"))] last_config_is_stored()?; // Check that Zebra's previous configurations still work diff --git a/zebrad/tests/common/configs/v1.6.0-windows.toml b/zebrad/tests/common/configs/v1.6.0-windows.toml deleted file mode 100644 index 6235972e9..000000000 --- a/zebrad/tests/common/configs/v1.6.0-windows.toml +++ /dev/null @@ -1,73 +0,0 @@ -# Default configuration for zebrad. -# -# This file can be used as a skeleton for custom configs. -# -# Unspecified fields use default values. Optional fields are Some(field) if the -# field is present and None if it is absent. -# -# This file is generated as an example using zebrad's current defaults. -# You should set only the config options you want to keep, and delete the rest. -# Only a subset of fields are present in the skeleton, since optional values -# whose default is None are omitted. -# -# The config format (including a complete list of sections and fields) is -# documented here: -# https://docs.rs/zebrad/latest/zebrad/config/struct.ZebradConfig.html -# -# zebrad attempts to load configs in the following order: -# -# 1. The -c flag on the command line, e.g., `zebrad -c myconfig.toml start`; -# 2. The file `zebrad.toml` in the users's preference directory (platform-dependent); -# 3. The default config. -# -# The user's preference directory and the default path to the `zebrad` config are platform dependent, -# based on `dirs::preference_dir`, see https://docs.rs/dirs/latest/dirs/fn.preference_dir.html : -# -# | Platform | Value | Example | -# | -------- | ------------------------------------- | ---------------------------------------------- | -# | Linux | `$XDG_CONFIG_HOME` or `$HOME/.config` | `/home/alice/.config/zebrad.toml` | -# | macOS | `$HOME/Library/Preferences` | `/Users/Alice/Library/Preferences/zebrad.toml` | -# | Windows | `{FOLDERID_RoamingAppData}` | `C:\Users\Alice\AppData\Local\zebrad.toml` | -[consensus] -checkpoint_sync = true -[mempool] -eviction_memory_time = "1h" -tx_cost_limit = 80000000 -[metrics] -[mining] -debug_like_zcashd = true -[network] -cache_dir = true -crawl_new_peer_interval = "1m 1s" -initial_mainnet_peers = [ - "dnsseed.z.cash:8233", - "dnsseed.str4d.xyz:8233", - "mainnet.seeder.zfnd.org:8233", - "mainnet.is.yolo.money:8233", -] -initial_testnet_peers = [ - "dnsseed.testnet.z.cash:18233", - "testnet.seeder.zfnd.org:18233", - "testnet.is.yolo.money:18233", -] -listen_addr = "0.0.0.0:8233" -max_connections_per_ip = 1 -network = "Mainnet" -peerset_initial_target_size = 25 -[rpc] -debug_force_finished_sync = false -parallel_cpu_threads = 0 -[state] -cache_dir = 'cache_dir' -delete_old_database = true -ephemeral = false -[sync] -checkpoint_verify_concurrency_limit = 1000 -download_concurrency_limit = 50 -full_verify_concurrency_limit = 20 -parallel_cpu_threads = 0 -[tracing] -buffer_limit = 128000 -force_use_color = false -use_color = true -use_journald = false \ No newline at end of file From a584822b1c4acb95d5be2998907fc840f59af640 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Tue, 16 Apr 2024 14:41:17 -0300 Subject: [PATCH 06/12] disable test for windows --- zebra-state/src/service/non_finalized_state/tests/prop.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/zebra-state/src/service/non_finalized_state/tests/prop.rs b/zebra-state/src/service/non_finalized_state/tests/prop.rs index fcd9ba544..fab4a127c 100644 --- a/zebra-state/src/service/non_finalized_state/tests/prop.rs +++ b/zebra-state/src/service/non_finalized_state/tests/prop.rs @@ -451,6 +451,7 @@ fn finalized_equals_pushed_history_tree() -> Result<()> { /// Check that rejected blocks do not change the internal state of a genesis chain /// in a non-finalized state. #[test] +#[cfg(not(target_os = "windows"))] fn rejection_restores_internal_state_genesis() -> Result<()> { let _init_guard = zebra_test::init(); From beec6cd65597fb4bcf597da4e24ddae2dd671b6f Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Tue, 16 Apr 2024 16:11:55 -0300 Subject: [PATCH 07/12] remove test for windows --- zebra-rpc/src/server/tests/vectors.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/zebra-rpc/src/server/tests/vectors.rs b/zebra-rpc/src/server/tests/vectors.rs index 2622b84ba..c0024d59e 100644 --- a/zebra-rpc/src/server/tests/vectors.rs +++ b/zebra-rpc/src/server/tests/vectors.rs @@ -23,6 +23,7 @@ use super::super::*; /// Test that the JSON-RPC server spawns when configured with a single thread. #[test] +#[cfg(not(target_os = "windows"))] fn rpc_server_spawn_single_thread() { rpc_server_spawn(false) } From a43171871e3f299dbba0daf9738769abfc3d595a Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Fri, 19 Apr 2024 11:22:55 -0300 Subject: [PATCH 08/12] change zcash_script branch to release --- Cargo.lock | 4 ++-- zebra-script/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fbb09f904..b7996d5f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5788,8 +5788,8 @@ dependencies = [ [[package]] name = "zcash_script" -version = "0.1.14" -source = "git+https://github.com/ZcashFoundation/zcash_script?branch=bump-0.1.15#a98abdebfe29bc2fb0b6fee9167609d13e10e18f" +version = "0.1.15" +source = "git+https://github.com/ZcashFoundation/zcash_script?branch=bump_v0.1.15#e9844798b13e7c441756854ae86ae0cd939a10d2" dependencies = [ "bellman", "bindgen", diff --git a/zebra-script/Cargo.toml b/zebra-script/Cargo.toml index 443ab7968..d62a38521 100644 --- a/zebra-script/Cargo.toml +++ b/zebra-script/Cargo.toml @@ -16,7 +16,7 @@ categories = ["api-bindings", "cryptography::cryptocurrencies"] [dependencies] #zcash_script = "0.1.14" -zcash_script = { git = "https://github.com/ZcashFoundation/zcash_script", branch = "bump-0.1.15" } +zcash_script = { git = "https://github.com/ZcashFoundation/zcash_script", branch = "bump_v0.1.15" } zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.35" } From 5d3fb3b6959615daa2215cee827747eccc5b1105 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Fri, 19 Apr 2024 14:24:19 -0300 Subject: [PATCH 09/12] bump top the last zcash_script release version --- Cargo.lock | 7 ++++--- zebra-script/Cargo.toml | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 67eeac30a..30b5b85a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1089,9 +1089,9 @@ dependencies = [ [[package]] name = "cxx-gen" -version = "0.7.117" +version = "0.7.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b629c0d006c7e44c1444dd17d18a458c9390d32276b758ac7abd21a75c99b0" +checksum = "383ecb9f96a536a1c7a2a61c5786f583da84f9240da149d78d005a4413c9a71e" dependencies = [ "codespan-reporting", "proc-macro2", @@ -5805,7 +5805,8 @@ dependencies = [ [[package]] name = "zcash_script" version = "0.1.15" -source = "git+https://github.com/ZcashFoundation/zcash_script?branch=bump_v0.1.15#e9844798b13e7c441756854ae86ae0cd939a10d2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3de6aece21108f502f724183955d244e02338613eaa4f9010386c63618a3a8" dependencies = [ "bellman", "bindgen", diff --git a/zebra-script/Cargo.toml b/zebra-script/Cargo.toml index 8edeb3239..da6932cdc 100644 --- a/zebra-script/Cargo.toml +++ b/zebra-script/Cargo.toml @@ -15,8 +15,7 @@ keywords = ["zebra", "zcash"] categories = ["api-bindings", "cryptography::cryptocurrencies"] [dependencies] -#zcash_script = "0.1.14" -zcash_script = { git = "https://github.com/ZcashFoundation/zcash_script", branch = "bump_v0.1.15" } +zcash_script = "0.1.15" zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.36" } From 60b43c0ff4a8c4c8305141c18ac3709712f75886 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Mon, 22 Apr 2024 08:39:08 -0300 Subject: [PATCH 10/12] restore `rejection_restores_internal_state_genesis` test --- zebra-state/src/service/non_finalized_state/tests/prop.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/zebra-state/src/service/non_finalized_state/tests/prop.rs b/zebra-state/src/service/non_finalized_state/tests/prop.rs index d4ef55344..209af90e0 100644 --- a/zebra-state/src/service/non_finalized_state/tests/prop.rs +++ b/zebra-state/src/service/non_finalized_state/tests/prop.rs @@ -451,7 +451,6 @@ fn finalized_equals_pushed_history_tree() -> Result<()> { /// Check that rejected blocks do not change the internal state of a genesis chain /// in a non-finalized state. #[test] -#[cfg(not(target_os = "windows"))] fn rejection_restores_internal_state_genesis() -> Result<()> { let _init_guard = zebra_test::init(); From b53b0b99ef44253a20a4adc6ff32f2fc6e56ec55 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Mon, 22 Apr 2024 09:52:34 -0300 Subject: [PATCH 11/12] fix typo in test name and enable single thread on windows --- zebra-rpc/src/server/tests/vectors.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zebra-rpc/src/server/tests/vectors.rs b/zebra-rpc/src/server/tests/vectors.rs index c0024d59e..93b67cd29 100644 --- a/zebra-rpc/src/server/tests/vectors.rs +++ b/zebra-rpc/src/server/tests/vectors.rs @@ -23,14 +23,14 @@ use super::super::*; /// Test that the JSON-RPC server spawns when configured with a single thread. #[test] -#[cfg(not(target_os = "windows"))] fn rpc_server_spawn_single_thread() { rpc_server_spawn(false) } /// Test that the JSON-RPC server spawns when configured with multiple threads. #[test] -fn rpc_sever_spawn_parallel_threads() { +#[cfg(not(target_os = "windows"))] +fn rpc_server_spawn_parallel_threads() { rpc_server_spawn(true) } From 941a082de1a63fe2c82c69739baa5a5de9cac710 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Mon, 22 Apr 2024 10:51:58 -0300 Subject: [PATCH 12/12] disable single thread --- zebra-rpc/src/server/tests/vectors.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zebra-rpc/src/server/tests/vectors.rs b/zebra-rpc/src/server/tests/vectors.rs index 93b67cd29..0f4aca010 100644 --- a/zebra-rpc/src/server/tests/vectors.rs +++ b/zebra-rpc/src/server/tests/vectors.rs @@ -23,13 +23,13 @@ use super::super::*; /// Test that the JSON-RPC server spawns when configured with a single thread. #[test] +#[cfg(not(target_os = "windows"))] fn rpc_server_spawn_single_thread() { rpc_server_spawn(false) } /// Test that the JSON-RPC server spawns when configured with multiple threads. #[test] -#[cfg(not(target_os = "windows"))] fn rpc_server_spawn_parallel_threads() { rpc_server_spawn(true) }