From 6c2f2777153cf8e2d84402ce4ecf1cb54f896d47 Mon Sep 17 00:00:00 2001 From: Jost Schulte Date: Thu, 19 Sep 2024 15:12:31 -0600 Subject: [PATCH] refactor: rename scenario to remote_signals --- .github/workflows/performance.yaml | 18 +- .github/workflows/test.yaml | 28 +-- Cargo.lock | 165 ++++++++++-------- Cargo.toml | 10 +- .../Cargo.toml | 4 +- .../README.md | 4 +- .../src/main.rs | 0 7 files changed, 130 insertions(+), 99 deletions(-) rename scenarios/{remote_signal_scenario => remote_signals}/Cargo.toml (87%) rename scenarios/{remote_signal_scenario => remote_signals}/README.md (86%) rename scenarios/{remote_signal_scenario => remote_signals}/src/main.rs (100%) diff --git a/.github/workflows/performance.yaml b/.github/workflows/performance.yaml index 32f181c8..bf2627ee 100644 --- a/.github/workflows/performance.yaml +++ b/.github/workflows/performance.yaml @@ -14,7 +14,15 @@ jobs: fail-fast: false matrix: # To run a local test with default configuration, add the scenario name to this array. - scenario: [ zome_call_single_value, single_write_many_read, write_read, write_query, local_signals, write_validated ] + scenario: + [ + zome_call_single_value, + single_write_many_read, + write_read, + write_query, + local_signals, + write_validated, + ] # To run a local test with additional configuration, add the scenario name and `extra-args` as an `include` item. include: - scenario: dht_sync_lag @@ -87,7 +95,13 @@ jobs: fail-fast: false matrix: # To run a test with TryCP and default configuration, add the scenario name to this array. - scenario: [ trycp_write_validated, remote_call_rate, validation_receipts, remote_signal_scenario ] + scenario: + [ + trycp_write_validated, + remote_call_rate, + validation_receipts, + remote_signals, + ] # To run a test with TryCP and additional configuration, add the scenario name and `extra-args` as an `include` item. include: - scenario: two_party_countersigning diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7d568a3b..e85ad9a3 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -2,9 +2,9 @@ name: "test" on: push: - branches: [ main, develop ] + branches: [main, develop] pull_request: - branches: [ main, develop ] + branches: [main, develop] merge_group: concurrency: @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-latest ] + os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} steps: @@ -26,10 +26,10 @@ jobs: if: runner.os == 'Linux' uses: AdityaGarg8/remove-unwanted-software@v2 with: - remove-dotnet: 'true' - remove-android: 'true' - remove-codeql: 'true' - remove-docker-images: 'true' + remove-dotnet: "true" + remove-android: "true" + remove-codeql: "true" + remove-docker-images: "true" - name: Install nix uses: cachix/install-nix-action@v27 @@ -74,20 +74,20 @@ jobs: run: | # Start a sandbox conductor and run it in the background nix develop .#ci -c bash -c "hc s clean && echo "1234" | hc s --piped create && echo "1234" | hc s --piped -f 8888 run &" - + # Run the scenario for 5 seconds RUST_LOG=info nix run .#zome_call_single_value -- --connection-string ws://localhost:8888 --duration 5 --no-progress - + pkill hc && pkill holochain && pkill lair-keystore - name: Smoke test - single_write_many_read run: | # Start a sandbox conductor and run it in the background nix develop .#ci -c bash -c "hc s clean && echo "1234" | hc s --piped create && echo "1234" | hc s --piped -f 8888 run &" - + # Run the scenario for 5 seconds RUST_LOG=info nix run .#single_write_many_read -- --connection-string ws://localhost:8888 --duration 5 --no-progress - + pkill hc && pkill holochain && pkill lair-keystore - name: Smoke test - dht_sync_lag @@ -180,7 +180,7 @@ jobs: - name: Smoke test - remote_call_rate run: | set -x - + # Start local network services nix develop .#ci -c bash -c "hc-run-local-services --bootstrap-port 4422 --signal-port 4423 &" # Start a TryCP instance @@ -226,7 +226,7 @@ jobs: # Stop local network services pkill hc-run-local - - name: Smoke test - remote_signal_scenario + - name: Smoke test - remote_signals run: | set -x @@ -236,7 +236,7 @@ jobs: nix develop .#ci -c bash -c "source ./scripts/trycp.sh && start_trycp &" # Run the scenario for 10 seconds - RUST_LOG=warn CONDUCTOR_CONFIG="CI" MIN_PEERS=2 nix run .#remote_signal_scenario -- --targets targets-ci.yaml --instances-per-target 2 --duration 10 --no-progress + RUST_LOG=warn CONDUCTOR_CONFIG="CI" MIN_PEERS=2 nix run .#remote_signals -- --targets targets-ci.yaml --instances-per-target 2 --duration 10 --no-progress # Stop the TryCP instance nix develop .#ci -c bash -c "source ./scripts/trycp.sh && stop_trycp" diff --git a/Cargo.lock b/Cargo.lock index 3b3d4f0f..1321fca7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,13 +4,19 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + [[package]] name = "adler2" version = "2.0.0" @@ -137,9 +143,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "app_install" @@ -171,9 +177,9 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.9" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -229,17 +235,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.74" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", + "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", - "windows-targets 0.52.6", ] [[package]] @@ -336,9 +342,9 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" [[package]] name = "byteorder" @@ -348,9 +354,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "callback" @@ -402,9 +408,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.21" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ "shlex", ] @@ -453,9 +459,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -463,9 +469,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -581,9 +587,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -763,9 +769,9 @@ checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" [[package]] name = "dashmap" -version = "6.1.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1100,7 +1106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1283,9 +1289,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "h2" @@ -2076,15 +2082,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.3" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http 1.1.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.13", + "rustls 0.23.12", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -2122,9 +2128,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", @@ -2142,9 +2148,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.61" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2221,7 +2227,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88" dependencies = [ "ahash", - "clap 4.5.17", + "clap 4.5.16", "crossbeam-channel", "crossbeam-utils", "dashmap", @@ -2267,9 +2273,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" @@ -2546,14 +2552,14 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.3", ] [[package]] name = "libsodium-sys-stable" -version = "1.21.2" +version = "1.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42631d334de875c636a1aae7adb515653ac2e771e5a2ce74b1053f5a4412df3a" +checksum = "5fd1882b85f01cdd4021c0664fd897710a04c5d01b593a5a70e1b0baa999c1f8" dependencies = [ "cc", "libc", @@ -2668,6 +2674,15 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a05b5d0594e0cb1ad8cee3373018d2b84e25905dc75b2468114cc9a8e86cfc20" +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + [[package]] name = "miniz_oxide" version = "0.8.0" @@ -3049,7 +3064,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.3", "smallvec", "windows-targets 0.52.6", ] @@ -3146,9 +3161,9 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.4.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ "diff", "yansi", @@ -3412,9 +3427,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ "bitflags 2.6.0", ] @@ -3494,7 +3509,7 @@ dependencies = [ ] [[package]] -name = "remote_signal_coordinator" +name = "remote_signal" version = "0.1.0" dependencies = [ "hdk", @@ -3510,7 +3525,7 @@ dependencies = [ ] [[package]] -name = "remote_signal_scenario" +name = "remote_signals" version = "0.1.0" dependencies = [ "anyhow", @@ -3583,7 +3598,7 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 1.4.1", - "hyper-rustls 0.27.3", + "hyper-rustls 0.27.2", "hyper-tls 0.6.0", "hyper-util", "ipnet", @@ -3748,9 +3763,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ "bitflags 2.6.0", "errno", @@ -3773,13 +3788,13 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "once_cell", "rustls-pki-types", - "rustls-webpki 0.102.8", + "rustls-webpki 0.102.7", "subtle", "zeroize", ] @@ -3821,9 +3836,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.8" +version = "0.102.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" dependencies = [ "ring 0.17.8", "rustls-pki-types", @@ -3868,11 +3883,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -3972,9 +3987,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "indexmap 2.5.0", "itoa", @@ -4681,7 +4696,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.13", + "rustls 0.23.12", "rustls-pki-types", "tokio", ] @@ -4700,9 +4715,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -4734,9 +4749,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.21" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap 2.5.0", "serde", @@ -4924,7 +4939,7 @@ name = "trycp_wind_tunnel_runner" version = "0.3.0-alpha.1" dependencies = [ "anyhow", - "clap 4.5.17", + "clap 4.5.16", "derive_more 1.0.0", "env_logger", "holochain_client", @@ -5026,24 +5041,24 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.24" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.12.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -5433,7 +5448,7 @@ name = "wind_tunnel_runner" version = "0.3.0-alpha.1" dependencies = [ "anyhow", - "clap 4.5.17", + "clap 4.5.16", "derive_more 1.0.0", "env_logger", "indicatif", @@ -5765,9 +5780,9 @@ dependencies = [ [[package]] name = "yansi" -version = "1.0.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "yasna" diff --git a/Cargo.toml b/Cargo.toml index 7c7c1351..3ba8d1d4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ members = [ "scenarios/write_query", "scenarios/local_signals", "scenarios/remote_call_rate", - "scenarios/remote_signal_scenario", + "scenarios/remote_signals", "scenarios/two_party_countersigning", "scenarios/write_validated", "scenarios/trycp_write_validated", @@ -44,7 +44,7 @@ members = [ "zomes/countersigning/coordinator", "zomes/countersigning/integrity", "zomes/validated/coordinator", - "zomes/validated/integrity" + "zomes/validated/integrity", ] # By default, don't build the scenarios or zomes. @@ -82,7 +82,9 @@ url = "2.5.0" tabled = "0.16.0" indicatif = "0.17.8" # TODO waiting for 0.7.3+ relase to use the new reqwest-client-native-tls-vendored feature -influxdb = { version = "0.7.3-beta.1", package = "ts_influxdb", features = ["reqwest-client-native-tls-vendored"] } +influxdb = { version = "0.7.3-beta.1", package = "ts_influxdb", features = [ + "reqwest-client-native-tls-vendored", +] } influxive-core = "0.0.2-alpha.1" nanoid = "0.4.0" which = "6.0.1" @@ -101,7 +103,7 @@ holochain_types = { version = "0.4.0-dev.24" } holochain_conductor_api = { version = "0.4.0-dev.25" } holochain_nonce = { version = "0.4.0-dev.7" } kitsune_p2p_types = { version = "0.4.0-dev.13" } -holochain_websocket = { version = "0.4.0-dev.24"} +holochain_websocket = { version = "0.4.0-dev.24" } hdk = { version = "0.4.0-dev.17" } hdi = "0.5.0-dev.15" mr_bundle = "0.4.0-dev.7" diff --git a/scenarios/remote_signal_scenario/Cargo.toml b/scenarios/remote_signals/Cargo.toml similarity index 87% rename from scenarios/remote_signal_scenario/Cargo.toml rename to scenarios/remote_signals/Cargo.toml index a01b1ee0..7147dd63 100644 --- a/scenarios/remote_signal_scenario/Cargo.toml +++ b/scenarios/remote_signals/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "remote_signal_scenario" +name = "remote_signals" version = "0.1.0" edition = "2021" build = "../scenario_build.rs" @@ -12,7 +12,7 @@ log = { workspace = true } holochain_types = { workspace = true } trycp_wind_tunnel_runner = { workspace = true } -remote_signal_integrity = { workspace = true} +remote_signal_integrity = { workspace = true } [build-dependencies] happ_builder = { workspace = true } diff --git a/scenarios/remote_signal_scenario/README.md b/scenarios/remote_signals/README.md similarity index 86% rename from scenarios/remote_signal_scenario/README.md rename to scenarios/remote_signals/README.md index 325b4a1d..52ca8f1c 100644 --- a/scenarios/remote_signal_scenario/README.md +++ b/scenarios/remote_signals/README.md @@ -2,7 +2,7 @@ ### Description -This scenario tests the throughput of `remote_signal_scenario` operations. +This scenario tests the throughput of `remote_signals` operations. **warning** This is a TryCP-based scenario and needs to be run differently to other scenarios. @@ -24,7 +24,7 @@ This configuration defaults to 2 peers. You can run the scenario locally with the following command: ```bash -RUST_LOG=info CONDUCTOR_CONFIG="CI" TRYCP_RUST_LOG="info" MIN_PEERS=2 cargo run --package remote_signal_scenario -- --targets targets-ci.yaml --instances-per-target 2 --duration 300 +RUST_LOG=info CONDUCTOR_CONFIG="CI" TRYCP_RUST_LOG="info" MIN_PEERS=2 cargo run --package remote_signals -- --targets targets-ci.yaml --instances-per-target 2 --duration 300 ``` This assumes that `trycp_server` is running. See the script `scripts/trycp.sh` and run with `start_trycp`. diff --git a/scenarios/remote_signal_scenario/src/main.rs b/scenarios/remote_signals/src/main.rs similarity index 100% rename from scenarios/remote_signal_scenario/src/main.rs rename to scenarios/remote_signals/src/main.rs