From daf70cbb766921b8b7ad89f0a5d5196728cd55db Mon Sep 17 00:00:00 2001
From: 0x009922 <43530070+0x009922@users.noreply.github.com>
Date: Thu, 19 Sep 2024 17:28:07 +0900
Subject: [PATCH 1/7] refactor!: black-box integration tests
Signed-off-by: 0x009922 <43530070+0x009922@users.noreply.github.com>
fix: lints, correct upload of `executor.wasm`
Signed-off-by: 0x009922 <43530070+0x009922@users.noreply.github.com>
fix: make `iroha_core` compile without `telemetry` feature
Signed-off-by: 0x009922 <43530070+0x009922@users.noreply.github.com>
ci: copy executor from script; debug; single test command
Signed-off-by: 0x009922 <43530070+0x009922@users.noreply.github.com>
ci: remove debug, enable full tests
And remove extra `iroha_wasm_builder` dependency
Signed-off-by: 0x009922 <43530070+0x009922@users.noreply.github.com>
---
.github/workflows/iroha2-dev-pr.yml | 85 +-
.gitignore | 1 +
Cargo.lock | 981 +++++++----
Cargo.toml | 9 +-
README.md | 29 -
crates/iroha/Cargo.toml | 26 +-
crates/iroha/benches/torii.rs | 189 ---
crates/iroha/benches/tps/README.md | 42 -
crates/iroha/benches/tps/config.json | 8 -
crates/iroha/benches/tps/dev.rs | 91 -
crates/iroha/benches/tps/oneshot.rs | 41 -
crates/iroha/benches/tps/utils.rs | 236 ---
.../examples/million_accounts_genesis.rs | 92 -
.../iroha/examples/register_1000_triggers.rs | 90 -
crates/iroha/src/client.rs | 15 +-
crates/iroha/src/config.rs | 2 +
crates/iroha/src/lib.rs | 46 -
crates/iroha/tests/integration/asset.rs | 231 +--
.../tests/integration/asset_propagation.rs | 51 +-
crates/iroha/tests/integration/events/data.rs | 164 +-
.../tests/integration/events/notification.rs | 82 +-
.../tests/integration/events/pipeline.rs | 181 +-
.../extra_functional/connected_peers.rs | 195 ++-
.../integration/extra_functional/genesis.rs | 57 +-
.../tests/integration/extra_functional/mod.rs | 1 -
.../multiple_blocks_created.rs | 245 ++-
.../integration/extra_functional/normal.rs | 42 +-
.../extra_functional/offline_peers.rs | 100 +-
.../extra_functional/restart_peer.rs | 130 +-
.../extra_functional/unregister_peer.rs | 202 +--
.../extra_functional/unstable_network.rs | 122 --
crates/iroha/tests/integration/multisig.rs | 21 +-
.../iroha/tests/integration/non_mintable.rs | 85 +-
crates/iroha/tests/integration/pagination.rs | 12 +-
crates/iroha/tests/integration/permissions.rs | 102 +-
.../tests/integration/queries/account.rs | 4 +-
.../iroha/tests/integration/queries/asset.rs | 4 +-
crates/iroha/tests/integration/queries/mod.rs | 6 +-
.../tests/integration/queries/query_errors.rs | 7 +-
.../iroha/tests/integration/queries/role.rs | 20 +-
.../integration/queries/smart_contract.rs | 8 +-
crates/iroha/tests/integration/roles.rs | 36 +-
.../iroha/tests/integration/set_parameter.rs | 6 +-
crates/iroha/tests/integration/sorting.rs | 12 +-
.../tests/integration/status_response.rs | 62 +-
.../iroha/tests/integration/transfer_asset.rs | 62 +-
.../tests/integration/transfer_domain.rs | 78 +-
.../integration/triggers/by_call_trigger.rs | 125 +-
.../integration/triggers/data_trigger.rs | 4 +-
.../integration/triggers/event_trigger.rs | 29 +-
.../iroha/tests/integration/triggers/mod.rs | 18 +
.../tests/integration/triggers/orphans.rs | 37 +-
.../integration/triggers/time_trigger.rs | 61 +-
.../integration/triggers/trigger_rollback.rs | 4 +-
crates/iroha/tests/integration/tx_chain_id.rs | 10 +-
crates/iroha/tests/integration/tx_history.rs | 15 +-
crates/iroha/tests/integration/tx_rollback.rs | 4 +-
crates/iroha/tests/integration/upgrade.rs | 34 +-
crates/iroha_config_base/src/toml.rs | 13 +
crates/iroha_core/Cargo.toml | 2 -
crates/iroha_core/src/sumeragi/main_loop.rs | 92 +-
crates/iroha_core/src/sumeragi/mod.rs | 9 +-
crates/iroha_crypto/src/lib.rs | 5 +
crates/iroha_p2p/src/network.rs | 25 +-
crates/iroha_p2p/src/peer.rs | 4 +-
crates/iroha_p2p/tests/integration/p2p.rs | 20 +-
crates/iroha_test_network/Cargo.toml | 15 +-
crates/iroha_test_network/src/config.rs | 94 ++
crates/iroha_test_network/src/fslock_ports.rs | 116 ++
crates/iroha_test_network/src/lib.rs | 1492 +++++++++--------
crates/iroha_torii/src/lib.rs | 9 +-
crates/iroha_torii/src/utils.rs | 1 +
crates/iroha_wasm_builder/src/lib.rs | 1 +
crates/irohad/src/lib.rs | 855 ----------
crates/irohad/src/main.rs | 820 ++++++++-
crates/irohad/src/samples.rs | 98 --
hooks/pre-commit.sample | 29 +-
.../assets/test_register_asset_definitions.py | 1 +
78 files changed, 3864 insertions(+), 4489 deletions(-)
delete mode 100644 crates/iroha/benches/tps/README.md
delete mode 100644 crates/iroha/benches/tps/config.json
delete mode 100644 crates/iroha/benches/tps/dev.rs
delete mode 100644 crates/iroha/benches/tps/oneshot.rs
delete mode 100644 crates/iroha/benches/tps/utils.rs
delete mode 100644 crates/iroha/examples/million_accounts_genesis.rs
delete mode 100644 crates/iroha/examples/register_1000_triggers.rs
delete mode 100644 crates/iroha/tests/integration/extra_functional/unstable_network.rs
create mode 100644 crates/iroha_test_network/src/config.rs
create mode 100644 crates/iroha_test_network/src/fslock_ports.rs
delete mode 100644 crates/irohad/src/lib.rs
delete mode 100644 crates/irohad/src/samples.rs
diff --git a/.github/workflows/iroha2-dev-pr.yml b/.github/workflows/iroha2-dev-pr.yml
index 32436a5b0ed..cf3fab941a8 100644
--- a/.github/workflows/iroha2-dev-pr.yml
+++ b/.github/workflows/iroha2-dev-pr.yml
@@ -83,7 +83,7 @@ jobs:
path: ${{ env.DOCKER_COMPOSE_PATH }}/executor.wasm
retention-days: 1
- unit_tests_with_coverage:
+ test_with_coverage:
runs-on: [self-hosted, Linux, iroha2]
container:
image: hyperledger/iroha2-ci:nightly-2024-09-09
@@ -97,24 +97,29 @@ jobs:
with:
name: executor.wasm
path: ${{ env.DOCKER_COMPOSE_PATH }}
+ - name: Download the rest of WASM samples
+ uses: actions/download-artifact@v4
+ with:
+ name: wasm_samples
+ path: ${{ env.WASM_SAMPLES_TARGET_DIR }}
+ - name: Install irohad
+ run: which irohad || cargo install --path crates/irohad --locked
- uses: taiki-e/install-action@nextest
- uses: taiki-e/install-action@cargo-llvm-cov
- - name: Run unit tests (no default features)
+ - name: Run tests (no default features)
run: >
mold --run cargo llvm-cov nextest
- --no-fail-fast
- --workspace --lib
--no-default-features
- --branch
- --no-report
- - name: Run unit tests (all features)
+ --no-fail-fast --retries 2
+ --failure-output immediate-final
+ --branch --no-report
+ - name: Run tests (all features)
run: >
mold --run cargo llvm-cov nextest
- --no-fail-fast
- --workspace --lib
--all-features
- --branch
- --no-report
+ --no-fail-fast --retries 2
+ --failure-output immediate-final
+ --branch --no-report
- name: Generate lcov report
run: cargo llvm-cov report --lcov --output-path lcov.info
- name: Upload lcov report
@@ -123,64 +128,6 @@ jobs:
name: report-coverage
path: lcov.info
- # include: iroha/tests/integration/
- # exclude: iroha/tests/integration/extra_functional
- integration:
- runs-on: [self-hosted, Linux, iroha2]
- container:
- image: hyperledger/iroha2-ci:nightly-2024-09-09
- needs: build_wasm_samples
- timeout-minutes: 30
- steps:
- - uses: actions/checkout@v4
- - name: Download executor.wasm
- uses: actions/download-artifact@v4
- with:
- name: executor.wasm
- path: ${{ env.DOCKER_COMPOSE_PATH }}
- - name: Download the rest of WASM samples
- uses: actions/download-artifact@v4
- with:
- name: wasm_samples
- path: ${{ env.WASM_SAMPLES_TARGET_DIR }}
- - uses: taiki-e/install-action@nextest
- - name: Run integration tests, with all features
- run: >
- mold --run cargo nextest run
- --all-features
- --no-fail-fast
- --failure-output immediate-final
- -E 'package(iroha) and test(integration) and not test(extra_functional)'
-
- # include: iroha/tests/integration/extra_functional
- extra_functional:
- runs-on: [self-hosted, Linux, iroha2]
- container:
- image: hyperledger/iroha2-ci:nightly-2024-09-09
- needs: build_wasm_samples
- timeout-minutes: 60
- steps:
- - uses: actions/checkout@v4
- - name: Download executor.wasm
- uses: actions/download-artifact@v4
- with:
- name: executor.wasm
- path: ${{ env.DOCKER_COMPOSE_PATH }}
- - name: Download the rest of WASM samples
- uses: actions/download-artifact@v4
- with:
- name: wasm_samples
- path: ${{ env.WASM_SAMPLES_TARGET_DIR }}
- - uses: taiki-e/install-action@nextest
- - name: Run integration tests, with all features
- run: >
- mold --run cargo nextest run
- --all-features
- --no-fail-fast
- --failure-output final
- --test-threads 1
- -E 'test(extra_functional)'
-
# Run the job to check that the docker containers are properly buildable
pr-generator-build:
# Job will only execute if the head of the pull request is a branch for PR-generator case
diff --git a/.gitignore b/.gitignore
index f4baa3a1eac..70d5f05109b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@ result
/lcov.info
test_docker
**/*.wasm
+.iroha_test_network_run.json*
diff --git a/Cargo.lock b/Cargo.lock
index 6a03b06ef07..1341af4663a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -156,9 +156,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.86"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
[[package]]
name = "arbitrary"
@@ -306,9 +306,9 @@ dependencies = [
[[package]]
name = "arrayref"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
[[package]]
name = "arrayvec"
@@ -316,6 +316,12 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+[[package]]
+name = "assert_matches"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
+
[[package]]
name = "assertables"
version = "7.0.1"
@@ -324,9 +330,9 @@ checksum = "0c24e9d990669fbd16806bff449e4ac644fd9b1fca014760087732fe4102f131"
[[package]]
name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
dependencies = [
"async-stream-impl",
"futures-core",
@@ -335,26 +341,32 @@ dependencies = [
[[package]]
name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
name = "async-trait"
-version = "0.1.81"
+version = "0.1.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
[[package]]
name = "attohttpc"
version = "0.28.0"
@@ -364,7 +376,7 @@ dependencies = [
"http 1.1.0",
"log",
"native-tls",
- "rustls",
+ "rustls 0.22.4",
"rustls-native-certs",
"url",
"webpki-roots",
@@ -383,9 +395,9 @@ dependencies = [
[[package]]
name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "axum"
@@ -410,20 +422,20 @@ dependencies = [
"rustversion",
"serde",
"sync_wrapper 0.1.2",
- "tower",
+ "tower 0.4.13",
"tower-layer",
"tower-service",
]
[[package]]
name = "axum"
-version = "0.7.5"
+version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
+checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae"
dependencies = [
"async-trait",
- "axum-core 0.4.3",
- "base64 0.21.7",
+ "axum-core 0.4.5",
+ "base64 0.22.1",
"bytes",
"futures-util",
"http 1.1.0",
@@ -446,8 +458,8 @@ dependencies = [
"sha1",
"sync_wrapper 1.0.1",
"tokio",
- "tokio-tungstenite",
- "tower",
+ "tokio-tungstenite 0.24.0",
+ "tower 0.5.1",
"tower-layer",
"tower-service",
]
@@ -471,9 +483,9 @@ dependencies = [
[[package]]
name = "axum-core"
-version = "0.4.3"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
+checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
dependencies = [
"async-trait",
"bytes",
@@ -484,11 +496,25 @@ dependencies = [
"mime",
"pin-project-lite",
"rustversion",
- "sync_wrapper 0.1.2",
+ "sync_wrapper 1.0.1",
"tower-layer",
"tower-service",
]
+[[package]]
+name = "backoff"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
+dependencies = [
+ "futures-core",
+ "getrandom",
+ "instant",
+ "pin-project-lite",
+ "rand",
+ "tokio",
+]
+
[[package]]
name = "backtrace"
version = "0.3.71"
@@ -590,7 +616,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
"syn_derive",
]
@@ -601,7 +627,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
dependencies = [
"memchr",
- "regex-automata 0.4.7",
+ "regex-automata 0.4.8",
"serde",
]
@@ -658,9 +684,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.7.1"
+version = "1.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
[[package]]
name = "camino"
@@ -702,9 +728,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
-version = "1.1.13"
+version = "1.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
+checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
dependencies = [
"jobserver",
"libc",
@@ -802,9 +828,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.16"
+version = "4.5.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
+checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615"
dependencies = [
"clap_builder",
"clap_derive",
@@ -812,9 +838,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.15"
+version = "4.5.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
dependencies = [
"anstream",
"anstyle",
@@ -824,14 +850,14 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -1000,18 +1026,18 @@ dependencies = [
[[package]]
name = "cpp_demangle"
-version = "0.4.3"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119"
+checksum = "96e58d342ad113c2b878f16d5d034c03be492ae460cdbc02b7f0f2284d310c7d"
dependencies = [
"cfg-if",
]
[[package]]
name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
dependencies = [
"libc",
]
@@ -1291,14 +1317,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
name = "cxx"
-version = "1.0.126"
+version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c4eae4b7fc8dcb0032eb3b1beee46b38d371cdeaf2d0c64b9944f6f69ad7755"
+checksum = "54ccead7d199d584d139148b04b4a368d1ec7556a1d9ea2548febb1b9d49f9a4"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -1308,9 +1334,9 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.126"
+version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c822bf7fb755d97328d6c337120b6f843678178751cba33c9da25cf522272e0"
+checksum = "c77953e99f01508f89f55c494bfa867171ef3a6c8cea03d26975368f2121a5c1"
dependencies = [
"cc",
"codespan-reporting",
@@ -1318,24 +1344,24 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
name = "cxxbridge-flags"
-version = "1.0.126"
+version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719d6197dc016c88744aff3c0d0340a01ecce12e8939fc282e7c8f583ee64bc6"
+checksum = "65777e06cc48f0cb0152024c77d6cf9e4bdb4408e7b48bea993d42fa0f5b02b6"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.126"
+version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35de3b547387863c8f82013c4f79f1c2162edee956383e4089e1d04c18c4f16c"
+checksum = "98532a60dedaebc4848cb2cba5023337cc9ea3af16a5b062633fabfd9f18fb60"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -1359,7 +1385,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -1370,7 +1396,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -1446,7 +1472,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -1457,7 +1483,7 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -1501,7 +1527,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -1695,9 +1721,9 @@ checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183"
[[package]]
name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "ff"
@@ -1717,9 +1743,9 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
[[package]]
name = "filetime"
-version = "0.2.24"
+version = "0.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
dependencies = [
"cfg-if",
"libc",
@@ -1747,9 +1773,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flate2"
-version = "1.0.32"
+version = "1.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
dependencies = [
"crc32fast",
"miniz_oxide 0.8.0",
@@ -1785,6 +1811,16 @@ dependencies = [
"percent-encoding",
]
+[[package]]
+name = "fslock"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
[[package]]
name = "funty"
version = "2.0.0"
@@ -1847,7 +1883,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -1926,14 +1962,14 @@ dependencies = [
[[package]]
name = "getset"
-version = "0.1.2"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9"
+checksum = "f636605b743120a8d32ed92fc27b6cde1a769f8f936c065151eb66f88ded513c"
dependencies = [
- "proc-macro-error",
+ "proc-macro-error2",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.79",
]
[[package]]
@@ -1943,7 +1979,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
dependencies = [
"fallible-iterator",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"stable_deref_trait",
]
@@ -2000,7 +2036,7 @@ dependencies = [
"gix-utils",
"itoa",
"thiserror",
- "winnow 0.6.18",
+ "winnow",
]
[[package]]
@@ -2053,7 +2089,7 @@ dependencies = [
"smallvec",
"thiserror",
"unicode-bom",
- "winnow 0.6.18",
+ "winnow",
]
[[package]]
@@ -2219,7 +2255,7 @@ checksum = "999ce923619f88194171a67fb3e6d613653b8d4d6078b529b15a765da0edcc17"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -2238,7 +2274,7 @@ dependencies = [
"itoa",
"smallvec",
"thiserror",
- "winnow 0.6.18",
+ "winnow",
]
[[package]]
@@ -2281,9 +2317,9 @@ dependencies = [
[[package]]
name = "gix-path"
-version = "0.10.10"
+version = "0.10.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d5b8722112fa2fa87135298780bc833b0e9f6c56cc82795d209804b3a03484"
+checksum = "ebfc4febd088abdcbc9f1246896e57e37b7a34f6909840045a1767c6dafac7af"
dependencies = [
"bstr",
"gix-trace",
@@ -2322,7 +2358,7 @@ dependencies = [
"gix-validate",
"memmap2",
"thiserror",
- "winnow 0.6.18",
+ "winnow",
]
[[package]]
@@ -2399,9 +2435,9 @@ dependencies = [
[[package]]
name = "gix-trace"
-version = "0.1.9"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f924267408915fddcd558e3f37295cc7d6a3e50f8bd8b606cee0808c3915157e"
+checksum = "6cae0e8661c3ff92688ce1c8b8058b3efb312aba9492bbe93661a21705ab431b"
[[package]]
name = "gix-traverse"
@@ -2483,7 +2519,26 @@ dependencies = [
"futures-sink",
"futures-util",
"http 0.2.12",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "h2"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http 1.1.0",
+ "indexmap 2.6.0",
"slab",
"tokio",
"tokio-util",
@@ -2529,6 +2584,12 @@ dependencies = [
"serde",
]
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
[[package]]
name = "hdrhistogram"
version = "7.5.4"
@@ -2675,9 +2736,9 @@ dependencies = [
[[package]]
name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
[[package]]
name = "httpdate"
@@ -2701,7 +2762,7 @@ dependencies = [
"futures-channel",
"futures-core",
"futures-util",
- "h2",
+ "h2 0.3.26",
"http 0.2.12",
"http-body 0.4.6",
"httparse",
@@ -2724,6 +2785,7 @@ dependencies = [
"bytes",
"futures-channel",
"futures-util",
+ "h2 0.4.6",
"http 1.1.0",
"http-body 1.0.1",
"httparse",
@@ -2732,6 +2794,24 @@ dependencies = [
"pin-project-lite",
"smallvec",
"tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
+dependencies = [
+ "futures-util",
+ "http 1.1.0",
+ "hyper 1.4.1",
+ "hyper-util",
+ "rustls 0.23.13",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.26.0",
+ "tower-service",
]
[[package]]
@@ -2746,26 +2826,46 @@ dependencies = [
"tokio-io-timeout",
]
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
[[package]]
name = "hyper-util"
-version = "0.1.7"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
dependencies = [
"bytes",
+ "futures-channel",
"futures-util",
"http 1.1.0",
"http-body 1.0.1",
"hyper 1.4.1",
"pin-project-lite",
+ "socket2",
"tokio",
+ "tower-service",
+ "tracing",
]
[[package]]
name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
dependencies = [
"android_system_properties",
"core-foundation-sys",
@@ -2842,12 +2942,12 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.4.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
"serde",
]
@@ -2876,15 +2976,30 @@ dependencies = [
"unicode-width",
]
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
+
[[package]]
name = "iroha"
version = "2.0.0-rc.1.0"
dependencies = [
+ "assert_matches",
"assertables",
"attohttpc",
"base64 0.22.1",
"color-eyre",
- "criterion",
"derive_more",
"displaydoc",
"error-stack",
@@ -2906,22 +3021,20 @@ dependencies = [
"iroha_test_samples",
"iroha_torii_const",
"iroha_version",
- "irohad",
"nonzero_ext",
"parity-scale-codec",
"rand",
+ "reqwest",
"serde",
"serde_json",
"serde_with",
"tempfile",
"thiserror",
"tokio",
- "tokio-tungstenite",
+ "tokio-tungstenite 0.21.0",
"toml",
- "tracing-flame",
- "tracing-subscriber",
"trybuild",
- "tungstenite",
+ "tungstenite 0.21.0",
"url",
]
@@ -3027,7 +3140,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde",
- "syn 2.0.75",
+ "syn 2.0.79",
"trybuild",
]
@@ -3045,7 +3158,7 @@ dependencies = [
"eyre",
"futures",
"hex",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"iroha_config",
"iroha_crypto",
"iroha_data_model",
@@ -3157,7 +3270,7 @@ dependencies = [
"quote",
"serde",
"serde_json",
- "syn 2.0.75",
+ "syn 2.0.79",
"trybuild",
]
@@ -3171,7 +3284,7 @@ dependencies = [
"manyhow",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
"trybuild",
]
@@ -3208,7 +3321,7 @@ dependencies = [
"manyhow",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -3220,7 +3333,7 @@ dependencies = [
"manyhow",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -3246,7 +3359,7 @@ dependencies = [
"quote",
"rustc-hash",
"strum 0.25.0",
- "syn 2.0.75",
+ "syn 2.0.79",
"trybuild",
]
@@ -3275,7 +3388,7 @@ dependencies = [
"manyhow",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -3349,7 +3462,7 @@ dependencies = [
"manyhow",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -3422,7 +3535,7 @@ dependencies = [
"manyhow",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -3446,7 +3559,7 @@ dependencies = [
"manyhow",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
"trybuild",
]
@@ -3486,7 +3599,7 @@ dependencies = [
"manyhow",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -3543,7 +3656,7 @@ dependencies = [
"streaming-stats",
"tokio",
"tokio-stream",
- "tokio-tungstenite",
+ "tokio-tungstenite 0.21.0",
"url",
"vergen",
]
@@ -3557,7 +3670,7 @@ dependencies = [
"manyhow",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
"trybuild",
]
@@ -3565,7 +3678,10 @@ dependencies = [
name = "iroha_test_network"
version = "2.0.0-rc.1.0"
dependencies = [
- "eyre",
+ "backoff",
+ "color-eyre",
+ "derive_more",
+ "fslock",
"futures",
"iroha",
"iroha_config",
@@ -3577,15 +3693,19 @@ dependencies = [
"iroha_genesis",
"iroha_logger",
"iroha_primitives",
+ "iroha_telemetry",
"iroha_test_samples",
- "iroha_wasm_builder",
- "irohad",
+ "nix 0.29.0",
"parity-scale-codec",
"rand",
+ "serde",
"serde_json",
"tempfile",
+ "thiserror",
"tokio",
+ "toml",
"unique_port",
+ "which",
]
[[package]]
@@ -3603,7 +3723,7 @@ name = "iroha_torii"
version = "2.0.0-rc.1.0"
dependencies = [
"async-trait",
- "axum 0.7.5",
+ "axum 0.7.7",
"displaydoc",
"error-stack",
"eyre",
@@ -3657,7 +3777,7 @@ dependencies = [
"manyhow",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -3687,7 +3807,7 @@ dependencies = [
"quote",
"serde",
"serde_json",
- "syn 2.0.75",
+ "syn 2.0.79",
"trybuild",
]
@@ -3724,7 +3844,7 @@ dependencies = [
"manyhow",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -3867,9 +3987,9 @@ dependencies = [
[[package]]
name = "k256"
-version = "0.13.3"
+version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
+checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b"
dependencies = [
"cfg-if",
"ecdsa",
@@ -3911,9 +4031,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
[[package]]
name = "libc"
-version = "0.2.158"
+version = "0.2.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
[[package]]
name = "libflate"
@@ -3958,9 +4078,9 @@ dependencies = [
[[package]]
name = "libsodium-sys-stable"
-version = "1.21.1"
+version = "1.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd1882b85f01cdd4021c0664fd897710a04c5d01b593a5a70e1b0baa999c1f8"
+checksum = "42631d334de875c636a1aae7adb515653ac2e771e5a2ce74b1053f5a4412df3a"
dependencies = [
"cc",
"libc",
@@ -4038,7 +4158,7 @@ dependencies = [
"manyhow-macros",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -4084,9 +4204,9 @@ dependencies = [
[[package]]
name = "memmap2"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
dependencies = [
"libc",
]
@@ -4114,9 +4234,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "minisign-verify"
-version = "0.2.1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
+checksum = "a05b5d0594e0cb1ad8cee3373018d2b84e25905dc75b2468114cc9a8e86cfc20"
[[package]]
name = "miniz_oxide"
@@ -4224,6 +4344,18 @@ dependencies = [
"libc",
]
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
[[package]]
name = "nom"
version = "7.1.3"
@@ -4304,21 +4436,24 @@ dependencies = [
[[package]]
name = "object"
-version = "0.36.3"
+version = "0.36.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
+checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
dependencies = [
"crc32fast",
"hashbrown 0.14.5",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"memchr",
]
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
+dependencies = [
+ "portable-atomic",
+]
[[package]]
name = "oorandom"
@@ -4355,7 +4490,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -4366,9 +4501,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-src"
-version = "300.3.1+3.3.1"
+version = "300.3.2+3.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91"
+checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b"
dependencies = [
"cc",
]
@@ -4491,9 +4626,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "pest"
-version = "2.7.11"
+version = "2.7.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95"
+checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9"
dependencies = [
"memchr",
"thiserror",
@@ -4502,9 +4637,9 @@ dependencies = [
[[package]]
name = "pest_derive"
-version = "2.7.11"
+version = "2.7.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a"
+checksum = "4d3a6e3394ec80feb3b6393c725571754c6188490265c61aaf260810d6b95aa0"
dependencies = [
"pest",
"pest_generator",
@@ -4512,22 +4647,22 @@ dependencies = [
[[package]]
name = "pest_generator"
-version = "2.7.11"
+version = "2.7.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183"
+checksum = "94429506bde1ca69d1b5601962c73f4172ab4726571a59ea95931218cb0e930e"
dependencies = [
"pest",
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
name = "pest_meta"
-version = "2.7.11"
+version = "2.7.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f"
+checksum = "ac8a071862e93690b6e34e9a5fb8e33ff3734473ac0245b27232222c4906a33f"
dependencies = [
"once_cell",
"pest",
@@ -4541,7 +4676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
dependencies = [
"fixedbitset",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
]
[[package]]
@@ -4561,7 +4696,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -4588,15 +4723,15 @@ dependencies = [
[[package]]
name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "plotters"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
dependencies = [
"num-traits",
"plotters-backend",
@@ -4607,15 +4742,15 @@ dependencies = [
[[package]]
name = "plotters-backend"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
[[package]]
name = "plotters-svg"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
dependencies = [
"plotters-backend",
]
@@ -4631,6 +4766,12 @@ dependencies = [
"universal-hash",
]
+[[package]]
+name = "portable-atomic"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+
[[package]]
name = "postcard"
version = "1.0.10"
@@ -4659,7 +4800,7 @@ dependencies = [
"findshlibs",
"libc",
"log",
- "nix",
+ "nix 0.26.4",
"once_cell",
"parking_lot",
"protobuf",
@@ -4695,16 +4836,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "788992637e9c73f809f7bdc647572785efb06cb7c860105a4e55e9c7d6935d39"
dependencies = [
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
name = "proc-macro-crate"
-version = "3.1.0"
+version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
dependencies = [
- "toml_edit 0.21.1",
+ "toml_edit",
]
[[package]]
@@ -4716,7 +4857,6 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn 1.0.109",
"version_check",
]
@@ -4731,6 +4871,28 @@ dependencies = [
"version_check",
]
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
+]
+
[[package]]
name = "proc-macro-utils"
version = "0.8.0"
@@ -4791,7 +4953,7 @@ dependencies = [
"itertools 0.12.1",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -4830,9 +4992,9 @@ dependencies = [
[[package]]
name = "psm"
-version = "0.1.21"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
+checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205"
dependencies = [
"cc",
]
@@ -4924,9 +5086,9 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
dependencies = [
"bitflags 2.6.0",
]
@@ -4957,14 +5119,14 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.10.6"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
dependencies = [
"aho-corasick",
"memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
]
[[package]]
@@ -4978,13 +5140,13 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
]
[[package]]
@@ -4995,9 +5157,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "rend"
@@ -5008,6 +5170,49 @@ dependencies = [
"bytecheck",
]
+[[package]]
+name = "reqwest"
+version = "0.12.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2 0.4.6",
+ "http 1.1.0",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-rustls",
+ "hyper-tls",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 1.0.1",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "windows-registry",
+]
+
[[package]]
name = "rfc6979"
version = "0.4.0"
@@ -5098,18 +5303,18 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
dependencies = [
"semver",
]
[[package]]
name = "rustix"
-version = "0.38.34"
+version = "0.38.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
dependencies = [
"bitflags 2.6.0",
"errno",
@@ -5132,11 +5337,24 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "rustls"
+version = "0.23.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
+dependencies = [
+ "once_cell",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
[[package]]
name = "rustls-native-certs"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa"
+checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
dependencies = [
"openssl-probe",
"rustls-pemfile",
@@ -5147,25 +5365,24 @@ dependencies = [
[[package]]
name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
dependencies = [
- "base64 0.22.1",
"rustls-pki-types",
]
[[package]]
name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
[[package]]
name = "rustls-webpki"
-version = "0.102.6"
+version = "0.102.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
dependencies = [
"ring",
"rustls-pki-types",
@@ -5195,20 +5412,20 @@ dependencies = [
[[package]]
name = "scc"
-version = "2.1.16"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeb7ac86243095b70a7920639507b71d51a63390d1ba26c4f60a552fbb914a37"
+checksum = "836f1e0f4963ef5288b539b643b35e043e76a32d0f4e47e67febf69576527f50"
dependencies = [
"sdd",
]
[[package]]
name = "schannel"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -5225,9 +5442,9 @@ checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152"
[[package]]
name = "sdd"
-version = "3.0.2"
+version = "3.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0495e4577c672de8254beb68d01a9b62d0e8a13c099edecdbedccce3223cd29f"
+checksum = "60a7b59a5d9b0099720b417b6325d91a52cbf5b3dcb5041d864be53eefa58abc"
[[package]]
name = "seahash"
@@ -5251,9 +5468,9 @@ dependencies = [
[[package]]
name = "secp256k1"
-version = "0.29.0"
+version = "0.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3"
+checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
dependencies = [
"rand",
"secp256k1-sys",
@@ -5262,9 +5479,9 @@ dependencies = [
[[package]]
name = "secp256k1-sys"
-version = "0.10.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1433bd67156263443f14d603720b082dd3121779323fce20cba2aa07b874bc1b"
+checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9"
dependencies = [
"cc",
]
@@ -5284,9 +5501,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
dependencies = [
"core-foundation-sys",
"libc",
@@ -5303,29 +5520,29 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.208"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.208"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
name = "serde_json"
-version = "1.0.125"
+version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
dependencies = [
"itoa",
"memchr",
@@ -5345,9 +5562,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
dependencies = [
"serde",
]
@@ -5366,15 +5583,15 @@ dependencies = [
[[package]]
name = "serde_with"
-version = "3.9.0"
+version = "3.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "9720086b3357bcb44fce40117d769a4d068c70ecfa190850a980a71755f66fcc"
dependencies = [
"base64 0.22.1",
"chrono",
"hex",
"indexmap 1.9.3",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"serde",
"serde_derive",
"serde_json",
@@ -5384,14 +5601,14 @@ dependencies = [
[[package]]
name = "serde_with_macros"
-version = "3.9.0"
+version = "3.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "5f1abbfe725f27678f4663bcacb75a83e829fd464c25d78dd038a3a29e307cec"
dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -5400,7 +5617,7 @@ version = "0.9.34+deprecated"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
dependencies = [
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"itoa",
"ryu",
"serde",
@@ -5429,7 +5646,7 @@ checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -5546,9 +5763,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
[[package]]
name = "simdutf8"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
[[package]]
name = "slab"
@@ -5699,7 +5916,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -5730,9 +5947,9 @@ dependencies = [
[[package]]
name = "symbolic-common"
-version = "12.10.0"
+version = "12.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16629323a4ec5268ad23a575110a724ad4544aae623451de600c747bf87b36cf"
+checksum = "366f1b4c6baf6cfefc234bbd4899535fca0b06c74443039a73f6dfb2fad88d77"
dependencies = [
"debugid",
"memmap2",
@@ -5742,9 +5959,9 @@ dependencies = [
[[package]]
name = "symbolic-demangle"
-version = "12.10.0"
+version = "12.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c043a45f08f41187414592b3ceb53fb0687da57209cc77401767fb69d5b596"
+checksum = "aba05ba5b9962ea5617baf556293720a8b2d0a282aa14ee4bf10e22efc7da8c8"
dependencies = [
"cpp_demangle",
"rustc-demangle",
@@ -5764,9 +5981,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.75"
+version = "2.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
dependencies = [
"proc-macro2",
"quote",
@@ -5782,7 +5999,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -5796,6 +6013,30 @@ name = "sync_wrapper"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
[[package]]
name = "tap"
@@ -5805,9 +6046,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
[[package]]
name = "tar"
-version = "0.4.41"
+version = "0.4.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
dependencies = [
"filetime",
"libc",
@@ -5822,9 +6063,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
dependencies = [
"cfg-if",
"fastrand",
@@ -5844,22 +6085,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.63"
+version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -5942,9 +6183,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.39.3"
+version = "1.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
dependencies = [
"backtrace",
"bytes",
@@ -5976,7 +6217,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -5995,16 +6236,27 @@ version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
dependencies = [
- "rustls",
+ "rustls 0.22.4",
+ "rustls-pki-types",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+dependencies = [
+ "rustls 0.23.13",
"rustls-pki-types",
"tokio",
]
[[package]]
name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
dependencies = [
"futures-core",
"pin-project-lite",
@@ -6021,21 +6273,33 @@ dependencies = [
"futures-util",
"log",
"native-tls",
- "rustls",
+ "rustls 0.22.4",
"rustls-native-certs",
"rustls-pki-types",
"tokio",
"tokio-native-tls",
- "tokio-rustls",
- "tungstenite",
+ "tokio-rustls 0.25.0",
+ "tungstenite 0.21.0",
"webpki-roots",
]
+[[package]]
+name = "tokio-tungstenite"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9"
+dependencies = [
+ "futures-util",
+ "log",
+ "tokio",
+ "tungstenite 0.24.0",
+]
+
[[package]]
name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
dependencies = [
"bytes",
"futures-core",
@@ -6055,7 +6319,7 @@ dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
- "toml_edit 0.22.20",
+ "toml_edit",
]
[[package]]
@@ -6069,26 +6333,15 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.21.1"
+version = "0.22.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
dependencies = [
- "indexmap 2.4.0",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
-dependencies = [
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"serde",
"serde_spanned",
"toml_datetime",
- "winnow 0.6.18",
+ "winnow",
]
[[package]]
@@ -6102,7 +6355,7 @@ dependencies = [
"axum 0.6.20",
"base64 0.21.7",
"bytes",
- "h2",
+ "h2 0.3.26",
"http 0.2.12",
"http-body 0.4.6",
"hyper 0.14.30",
@@ -6112,7 +6365,7 @@ dependencies = [
"prost",
"tokio",
"tokio-stream",
- "tower",
+ "tower 0.4.13",
"tower-layer",
"tower-service",
"tracing",
@@ -6138,6 +6391,21 @@ dependencies = [
"tracing",
]
+[[package]]
+name = "tower"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper 0.1.2",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
[[package]]
name = "tower-http"
version = "0.5.2"
@@ -6188,7 +6456,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -6211,17 +6479,6 @@ dependencies = [
"tracing-subscriber",
]
-[[package]]
-name = "tracing-flame"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9"
-dependencies = [
- "lazy_static",
- "tracing",
- "tracing-subscriber",
-]
-
[[package]]
name = "tracing-futures"
version = "0.2.5"
@@ -6255,7 +6512,6 @@ dependencies = [
"serde",
"serde_json",
"sharded-slab",
- "smallvec",
"thread_local",
"tracing",
"tracing-core",
@@ -6296,7 +6552,7 @@ dependencies = [
"log",
"native-tls",
"rand",
- "rustls",
+ "rustls 0.22.4",
"rustls-native-certs",
"rustls-pki-types",
"sha1",
@@ -6306,6 +6562,24 @@ dependencies = [
"webpki-roots",
]
+[[package]]
+name = "tungstenite"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http 1.1.0",
+ "httparse",
+ "log",
+ "rand",
+ "sha1",
+ "thiserror",
+ "utf-8",
+]
+
[[package]]
name = "typeid"
version = "1.0.2"
@@ -6320,15 +6594,15 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]]
name = "ucd-trie"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
[[package]]
name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
[[package]]
name = "unicode-bom"
@@ -6338,36 +6612,36 @@ checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217"
[[package]]
name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
[[package]]
name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
[[package]]
name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
[[package]]
name = "unique_port"
@@ -6555,10 +6829,22 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
"wasm-bindgen-shared",
]
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.93"
@@ -6577,7 +6863,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -6599,9 +6885,9 @@ dependencies = [
[[package]]
name = "wasm-encoder"
-version = "0.216.0"
+version = "0.218.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c23aebea22c8a75833ae08ed31ccc020835b12a41999e58c31464271b94a88"
+checksum = "22b896fa8ceb71091ace9bcb81e853f54043183a1c9667cf93422c40252ffa0a"
dependencies = [
"leb128",
]
@@ -6655,7 +6941,7 @@ dependencies = [
"ahash 0.8.11",
"bitflags 2.6.0",
"hashbrown 0.14.5",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"semver",
"serde",
]
@@ -6686,7 +6972,7 @@ dependencies = [
"fxprof-processed-profile",
"gimli",
"hashbrown 0.14.5",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"ittapi",
"libc",
"libm",
@@ -6694,7 +6980,7 @@ dependencies = [
"mach2",
"memfd",
"memoffset",
- "object 0.36.3",
+ "object 0.36.4",
"once_cell",
"paste",
"postcard",
@@ -6764,7 +7050,7 @@ dependencies = [
"anyhow",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
"wasmtime-component-util",
"wasmtime-wit-bindgen",
"wit-parser",
@@ -6792,7 +7078,7 @@ dependencies = [
"cranelift-wasm",
"gimli",
"log",
- "object 0.36.3",
+ "object 0.36.4",
"target-lexicon",
"thiserror",
"wasmparser",
@@ -6810,9 +7096,9 @@ dependencies = [
"cpp_demangle",
"cranelift-entity",
"gimli",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"log",
- "object 0.36.3",
+ "object 0.36.4",
"postcard",
"rustc-demangle",
"serde",
@@ -6846,7 +7132,7 @@ version = "22.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9bc54198c6720f098210a85efb3ba8c078d1de4d373cdb6778850a66ae088d11"
dependencies = [
- "object 0.36.3",
+ "object 0.36.4",
"once_cell",
"rustix",
"wasmtime-versioned-export-macros",
@@ -6891,7 +7177,7 @@ checksum = "de5a9bc4f44ceeb168e9e8e3be4e0b4beb9095b468479663a9e24c667e36826f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -6903,7 +7189,7 @@ dependencies = [
"anyhow",
"cranelift-codegen",
"gimli",
- "object 0.36.3",
+ "object 0.36.4",
"target-lexicon",
"wasmparser",
"wasmtime-cranelift",
@@ -6919,28 +7205,28 @@ checksum = "70dc077306b38288262e5ba01d4b21532a6987416cdc0aedf04bb06c22a68fdc"
dependencies = [
"anyhow",
"heck 0.4.1",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"wit-parser",
]
[[package]]
name = "wast"
-version = "216.0.0"
+version = "218.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7eb1f2eecd913fdde0dc6c3439d0f24530a98ac6db6cb3d14d92a5328554a08"
+checksum = "8a53cd1f0fa505df97557e36a58bddb8296e2fcdcd089529545ebfdb18a1b9d7"
dependencies = [
"bumpalo",
"leb128",
"memchr",
"unicode-width",
- "wasm-encoder 0.216.0",
+ "wasm-encoder 0.218.0",
]
[[package]]
name = "wat"
-version = "1.216.0"
+version = "1.218.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac0409090fb5154f95fb5ba3235675fd9e579e731524d63b6a2f653e1280c82a"
+checksum = "4f87f8e14e776762e07927c27c2054d2cf678aab9aae2d431a79b3e31e4dd391"
dependencies = [
"wast",
]
@@ -6967,13 +7253,25 @@ dependencies = [
[[package]]
name = "webpki-roots"
-version = "0.26.3"
+version = "0.26.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
dependencies = [
"rustls-pki-types",
]
+[[package]]
+name = "which"
+version = "6.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
+dependencies = [
+ "either",
+ "home",
+ "rustix",
+ "winsafe",
+]
+
[[package]]
name = "winapi"
version = "0.3.9"
@@ -7031,6 +7329,36 @@ dependencies = [
"windows-targets 0.52.6",
]
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
+]
+
[[package]]
name = "windows-sys"
version = "0.48.0"
@@ -7181,21 +7509,18 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
-version = "0.5.40"
+version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
dependencies = [
"memchr",
]
[[package]]
-name = "winnow"
-version = "0.6.18"
+name = "winsafe"
+version = "0.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
-dependencies = [
- "memchr",
-]
+checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
[[package]]
name = "wit-parser"
@@ -7205,7 +7530,7 @@ checksum = "3e79b9e3c0b6bb589dec46317e645851e0db2734c44e2be5e251b03ff4a51269"
dependencies = [
"anyhow",
"id-arena",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"log",
"semver",
"serde",
@@ -7263,7 +7588,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -7283,7 +7608,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.79",
]
[[package]]
@@ -7297,7 +7622,7 @@ dependencies = [
"crossbeam-utils",
"displaydoc",
"flate2",
- "indexmap 2.4.0",
+ "indexmap 2.6.0",
"memchr",
"thiserror",
"zopfli",
diff --git a/Cargo.toml b/Cargo.toml
index f1e82af249e..e8f1bd24f67 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,6 @@ categories = ["cryptography::cryptocurrencies"]
[workspace.dependencies]
iroha_core = { version = "=2.0.0-rc.1.0 ", path = "crates/iroha_core" }
-irohad = { version = "=2.0.0-rc.1.0", path = "crates/irohad" }
iroha_torii = { version = "=2.0.0-rc.1.0", path = "crates/iroha_torii" }
iroha_torii_const = { version = "=2.0.0-rc.1.0", path = "crates/iroha_torii_const" }
@@ -58,7 +57,7 @@ darling = "0.20.10"
drop_bomb = "0.1.5"
futures = { version = "0.3.30", default-features = false }
-tokio = "1.39.2"
+tokio = "1.40.0"
tokio-stream = "0.1.15"
tokio-tungstenite = "0.21.0"
tokio-util = "0.7.11"
@@ -128,9 +127,9 @@ mv = { version = "0.1.0" }
[workspace.lints]
rustdoc.private_doc_tests = "deny"
-rust.future_incompatible = {level = "deny", priority = -1 }
-rust.nonstandard_style = {level = "deny", priority = -1 }
-rust.rust_2018_idioms = {level = "deny", priority = -1 }
+rust.future_incompatible = { level = "deny", priority = -1 }
+rust.nonstandard_style = { level = "deny", priority = -1 }
+rust.rust_2018_idioms = { level = "deny", priority = -1 }
rust.unused = { level = "deny", priority = -1 }
rust.anonymous_parameters = "deny"
diff --git a/README.md b/README.md
index 02fea5edf46..a2511eb2d3d 100644
--- a/README.md
+++ b/README.md
@@ -68,35 +68,6 @@ Prerequisites:
* (Optional) [Docker](https://docs.docker.com/get-docker/)
* (Optional) [Docker Compose](https://docs.docker.com/compose/install/)
-<details> <summary> (Optional) Run included tests</summary>
-
-Run included code tests:
-
-```bash
-cargo test
-```
-
-Run API functional tests:
-
-```bash
-cargo build
-chmod +x target/debug/irohad
-chmod +x target/debug/iroha
-
-bash ./scripts/test_env.sh setup
-bash ./scripts/tests/register_mint_quantity.sh
-bash ./scripts/test_env.sh cleanup
-```
-To generate WASM files for smart contracts, use the provided script `generate_wasm.sh`. If you are in the root directory of Iroha run the following command:
-
-```bash
-bash ./scripts/generate_wasm.sh [path/to/smartcontracts]
-```
-
-The generated WASM files will be saved in a generated directory `test-smartcontracts`, relative to your current working directory. The default path for smart contracts in this project is `wasm_samples`.
-
-</details>
-
### Build Iroha
- Build Iroha and accompanying binaries:
diff --git a/crates/iroha/Cargo.toml b/crates/iroha/Cargo.toml
index 6270392be37..0c1b753c0f7 100644
--- a/crates/iroha/Cargo.toml
+++ b/crates/iroha/Cargo.toml
@@ -83,37 +83,15 @@ toml = { workspace = true }
nonzero_ext = { workspace = true }
[dev-dependencies]
-# FIXME: These three activate `transparent_api` but client should never activate this feature.
-# Additionally there is a dependency on iroha_core in dev-dependencies in iroha_telemetry/derive
-# Hopefully, once the integration tests migration is finished these can be removed
-irohad = { workspace = true }
-
iroha_genesis = { workspace = true }
iroha_test_network = { workspace = true }
executor_custom_data_model = { version = "=2.0.0-rc.1.0", path = "../../wasm_samples/executor_custom_data_model" }
tokio = { workspace = true, features = ["rt-multi-thread"] }
-criterion = { workspace = true, features = ["html_reports"] }
+reqwest = { version = "0.12.7", features = ["json"] }
color-eyre = { workspace = true }
tempfile = { workspace = true }
hex = { workspace = true }
assertables = { workspace = true }
-
-tracing-subscriber = { workspace = true, features = ["fmt", "ansi"] }
-tracing-flame = "0.2.0"
-
trybuild = { workspace = true }
-
-[[bench]]
-name = "torii"
-harness = false
-
-[[bench]]
-name = "tps-dev"
-harness = false
-path = "benches/tps/dev.rs"
-
-[[example]]
-name = "tps-oneshot"
-harness = false
-path = "benches/tps/oneshot.rs"
+assert_matches = "1.5.0"
diff --git a/crates/iroha/benches/torii.rs b/crates/iroha/benches/torii.rs
index 68b285ad0b4..e69de29bb2d 100644
--- a/crates/iroha/benches/torii.rs
+++ b/crates/iroha/benches/torii.rs
@@ -1,189 +0,0 @@
-#![allow(missing_docs, clippy::pedantic)]
-
-use std::thread;
-
-use criterion::{criterion_group, criterion_main, Criterion, Throughput};
-use iroha::{
- client::{asset, Client},
- data_model::prelude::*,
-};
-use iroha_genesis::GenesisBuilder;
-use iroha_primitives::unique_vec;
-use iroha_test_network::{get_chain_id, get_key_pair, Peer as TestPeer, PeerBuilder, TestRuntime};
-use iroha_test_samples::{gen_account_in, load_sample_wasm};
-use irohad::samples::get_config;
-use tokio::runtime::Runtime;
-
-const MINIMUM_SUCCESS_REQUEST_RATIO: f32 = 0.9;
-
-fn query_requests(criterion: &mut Criterion) {
- let mut peer = <TestPeer>::new().expect("Failed to create peer");
-
- let chain_id = get_chain_id();
- let genesis_key_pair = get_key_pair(iroha_test_network::Signatory::Genesis);
- let configuration = get_config(
- unique_vec![peer.id.clone()],
- chain_id.clone(),
- get_key_pair(iroha_test_network::Signatory::Peer),
- genesis_key_pair.public_key(),
- );
-
- let rt = Runtime::test();
- let executor = Executor::new(load_sample_wasm("default_executor"));
- let topology = vec![peer.id.clone()];
- let genesis = GenesisBuilder::default()
- .domain("wonderland".parse().expect("Valid"))
- .account(
- get_key_pair(iroha_test_network::Signatory::Alice)
- .into_parts()
- .0,
- )
- .finish_domain()
- .build_and_sign(chain_id, executor, topology, &genesis_key_pair);
-
- let builder = PeerBuilder::new()
- .with_config(configuration)
- .with_genesis(genesis);
-
- rt.block_on(builder.start_with_peer(&mut peer));
- rt.block_on(async {
- iroha_logger::test_logger()
- .reload_level(iroha::data_model::Level::ERROR.into())
- .await
- .unwrap()
- });
- let mut group = criterion.benchmark_group("query-requests");
- let domain_id: DomainId = "domain".parse().expect("Valid");
- let create_domain = Register::domain(Domain::new(domain_id));
- let (account_id, _account_keypair) = gen_account_in("domain");
- let create_account = Register::account(Account::new(account_id.clone()));
- let asset_definition_id: AssetDefinitionId = "xor#domain".parse().expect("Valid");
- let create_asset =
- Register::asset_definition(AssetDefinition::numeric(asset_definition_id.clone()));
- let mint_asset = Mint::asset_numeric(
- 200u32,
- AssetId::new(asset_definition_id, account_id.clone()),
- );
- let client_config = iroha::samples::get_client_config(
- get_chain_id(),
- get_key_pair(iroha_test_network::Signatory::Alice),
- format!("http://{}", peer.api_address).parse().unwrap(),
- );
-
- let iroha = Client::new(client_config);
- thread::sleep(std::time::Duration::from_millis(5000));
-
- let _ = iroha
- .submit_all::<InstructionBox>([
- create_domain.into(),
- create_account.into(),
- create_asset.into(),
- mint_asset.into(),
- ])
- .expect("Failed to prepare state");
-
- let query = iroha
- .query(asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id));
- thread::sleep(std::time::Duration::from_millis(1500));
- let mut success_count = 0;
- let mut failures_count = 0;
- // reporting elements and not bytes here because the new query builder doesn't easily expose the box type used in transport
- let _dropable = group.throughput(Throughput::Elements(1));
- let _dropable2 = group.bench_function("query", |b| {
- b.iter(|| {
- let iter = query.clone().execute_all();
-
- match iter {
- Ok(assets) => {
- assert!(!assets.is_empty());
- success_count += 1;
- }
- Err(e) => {
- eprintln!("Query failed: {e}");
- failures_count += 1;
- }
- }
- });
- });
- println!("Success count: {success_count}, Failures count: {failures_count}");
- group.finish();
- if (failures_count + success_count) > 0 {
- assert!(
- success_count as f32 / (failures_count + success_count) as f32
- > MINIMUM_SUCCESS_REQUEST_RATIO
- );
- }
-}
-
-fn instruction_submits(criterion: &mut Criterion) {
- println!("instruction submits");
- let rt = Runtime::test();
- let mut peer = <TestPeer>::new().expect("Failed to create peer");
-
- let chain_id = get_chain_id();
- let genesis_key_pair = get_key_pair(iroha_test_network::Signatory::Genesis);
- let topology = vec![peer.id.clone()];
- let configuration = get_config(
- unique_vec![peer.id.clone()],
- chain_id.clone(),
- get_key_pair(iroha_test_network::Signatory::Peer),
- genesis_key_pair.public_key(),
- );
- let executor = Executor::new(load_sample_wasm("default_executor"));
- let genesis = GenesisBuilder::default()
- .domain("wonderland".parse().expect("Valid"))
- .account(configuration.common.key_pair.public_key().clone())
- .finish_domain()
- .build_and_sign(chain_id, executor, topology, &genesis_key_pair);
- let builder = PeerBuilder::new()
- .with_config(configuration)
- .with_genesis(genesis);
- rt.block_on(builder.start_with_peer(&mut peer));
- let mut group = criterion.benchmark_group("instruction-requests");
- let domain_id: DomainId = "domain".parse().expect("Valid");
- let create_domain = Register::domain(Domain::new(domain_id));
- let (account_id, _account_keypair) = gen_account_in("domain");
- let create_account = Register::account(Account::new(account_id.clone()));
- let asset_definition_id: AssetDefinitionId = "xor#domain".parse().expect("Valid");
- let client_config = iroha::samples::get_client_config(
- get_chain_id(),
- get_key_pair(iroha_test_network::Signatory::Alice),
- format!("http://{}", peer.api_address).parse().unwrap(),
- );
- let iroha = Client::new(client_config);
- thread::sleep(std::time::Duration::from_millis(5000));
- let _ = iroha
- .submit_all::<InstructionBox>([create_domain.into(), create_account.into()])
- .expect("Failed to create role.");
- thread::sleep(std::time::Duration::from_millis(500));
- let mut success_count = 0;
- let mut failures_count = 0;
- let _dropable = group.bench_function("instructions", |b| {
- b.iter(|| {
- let mint_asset = Mint::asset_numeric(
- 200u32,
- AssetId::new(asset_definition_id.clone(), account_id.clone()),
- );
- match iroha.submit(mint_asset) {
- Ok(_) => success_count += 1,
- Err(e) => {
- eprintln!("Failed to execute instruction: {e}");
- failures_count += 1;
- }
- };
- })
- });
- println!("Success count: {success_count}, Failures count: {failures_count}");
- group.finish();
- if (failures_count + success_count) > 0 {
- assert!(
- success_count as f32 / (failures_count + success_count) as f32
- > MINIMUM_SUCCESS_REQUEST_RATIO
- );
- }
-}
-
-criterion_group!(instructions, instruction_submits);
-criterion_group!(queries, query_requests);
-criterion_main!(queries, instructions);
diff --git a/crates/iroha/benches/tps/README.md b/crates/iroha/benches/tps/README.md
deleted file mode 100644
index 46223669003..00000000000
--- a/crates/iroha/benches/tps/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# Benchmarks: Transactions per Second (TPS)
-
-Benchmark your code during development and get a statistical report with tps measurements. [Criterion.rs](https://github.com/bheisler/criterion.rs) is used for benchmarking.
-
-## Usage
-
-1. Establish a baseline:
-
- Checkout the target branch (`main`):
- ```
- git checkout main
- ```
- Then run:
- ```
- cargo bench --bench tps-dev
- ```
-
-2. Compare against the baseline:
-
- Checkout the commit you want to benchmark:
- ```
- git checkout <your-optimization-commit>
- ```
- Then run:
- ```
- cargo bench --bench tps-dev
- ```
-
- :exclamation: Since Criterion.rs measures time instead of throughput by default, `"improved"` and `"regressed"` messages are reversed.
-
-3. Check the report at `../../../target/criterion/report/index.html`.
-
-## Troubleshooting
-
-If a benchmark fails, reduce the load by increasing the interval between transactions (`interval_us_per_tx`) in the [configuration file](config.json).
-
-You can also run a single trial of the measurement:
-
-```
-cd client
-cargo run --release --example tps-oneshot
-```
diff --git a/crates/iroha/benches/tps/config.json b/crates/iroha/benches/tps/config.json
deleted file mode 100644
index 8b62736a4ec..00000000000
--- a/crates/iroha/benches/tps/config.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "peers": 4,
- "interval_us_per_tx": 0,
- "max_txs_per_block": 1024,
- "blocks": 15,
- "sample_size": 10,
- "genesis_max_retries": 30
-}
diff --git a/crates/iroha/benches/tps/dev.rs b/crates/iroha/benches/tps/dev.rs
deleted file mode 100644
index 716fdfe2eb3..00000000000
--- a/crates/iroha/benches/tps/dev.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-//! Benchmark by iterating a tps measurement and analyzing it into a statistical report
-//! using [criterion](https://github.com/bheisler/criterion.rs)
-//! for performance check during development
-#![allow(missing_docs)]
-
-use criterion::{
- black_box, criterion_group, criterion_main,
- measurement::{Measurement, ValueFormatter},
- BenchmarkId, Criterion, Throughput,
-};
-
-use crate::utils::Config;
-
-mod utils;
-
-impl Config {
- fn bench(self, c: &mut Criterion<Tps>) {
- let mut group = c.benchmark_group("tps");
-
- group.sample_size(self.sample_size as usize);
-
- group.bench_function(BenchmarkId::from_parameter(self), move |b| {
- b.iter_custom(|_| self.measure().expect("Failed to measure"));
- });
-
- group.finish();
- }
-}
-
-fn bench_tps_with_config(c: &mut Criterion<Tps>) {
- let config = Config::from_path("benches/tps/config.json").expect("Failed to configure");
- iroha_logger::info!(?config);
- black_box(config).bench(c);
-}
-
-fn alternate_measurement() -> Criterion<Tps> {
- Criterion::default().with_measurement(Tps)
-}
-
-criterion_group! {
- name = benches;
- config = alternate_measurement();
- targets = bench_tps_with_config
-}
-criterion_main!(benches);
-
-struct Tps;
-
-impl Measurement for Tps {
- type Intermediate = ();
- type Value = utils::Tps;
-
- fn start(&self) -> Self::Intermediate {
- unreachable!()
- }
- fn end(&self, _i: Self::Intermediate) -> Self::Value {
- unreachable!()
- }
- #[allow(clippy::float_arithmetic)]
- fn add(&self, v1: &Self::Value, v2: &Self::Value) -> Self::Value {
- *v1 + *v2
- }
- fn zero(&self) -> Self::Value {
- f64::MIN_POSITIVE
- }
- fn to_f64(&self, value: &Self::Value) -> f64 {
- *value
- }
- fn formatter(&self) -> &dyn ValueFormatter {
- &TpsFormatter
- }
-}
-
-struct TpsFormatter;
-
-impl ValueFormatter for TpsFormatter {
- fn scale_values(&self, _typical_value: f64, _values: &mut [f64]) -> &'static str {
- "tps"
- }
- fn scale_throughputs(
- &self,
- _typical_value: f64,
- _throughput: &Throughput,
- _values: &mut [f64],
- ) -> &'static str {
- unreachable!()
- }
- fn scale_for_machines(&self, _values: &mut [f64]) -> &'static str {
- "tps"
- }
-}
diff --git a/crates/iroha/benches/tps/oneshot.rs b/crates/iroha/benches/tps/oneshot.rs
deleted file mode 100644
index 99efceac8b2..00000000000
--- a/crates/iroha/benches/tps/oneshot.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-//! Single trial of the benchmark
-
-mod utils;
-
-use std::{fs::File, io::BufWriter};
-
-use tracing_flame::{FlameLayer, FlushGuard};
-use tracing_subscriber::prelude::*;
-
-fn main() {
- let args: Vec<String> = std::env::args().collect();
- let mut flush_guard: Option<FlushGuard<BufWriter<File>>> = None;
-
- if args.len() >= 2 {
- let file = File::create(&args[1]).expect("valid path");
-
- let flame_layer = FlameLayer::new(BufWriter::new(file))
- .with_threads_collapsed(true)
- .with_empty_samples(true);
- flush_guard = Some(flame_layer.flush_on_drop());
-
- tracing_subscriber::registry().with(flame_layer).init();
- iroha_logger::disable_global().expect("Logger should not be set yet");
- }
-
- let config = utils::Config::from_path("benches/tps/config.json").expect("Failed to configure");
- let tps = config.measure().expect("Failed to measure");
-
- flush_guard.map_or_else(
- || {
- iroha_logger::info!(?config);
- iroha_logger::info!(%tps);
- },
- |guard| {
- guard.flush().expect("Flushed data without errors");
- println!("Tracing data outputted to file: {}", &args[1]);
- println!("TPS was {tps}");
- println!("Config was {config:?}");
- },
- )
-}
diff --git a/crates/iroha/benches/tps/utils.rs b/crates/iroha/benches/tps/utils.rs
deleted file mode 100644
index 08a95111946..00000000000
--- a/crates/iroha/benches/tps/utils.rs
+++ /dev/null
@@ -1,236 +0,0 @@
-use std::{fmt, fs::File, io::BufReader, num::NonZeroUsize, path::Path, sync::mpsc, thread, time};
-
-use eyre::{Result, WrapErr};
-use iroha::{
- client::Client,
- crypto::KeyPair,
- data_model::{
- events::pipeline::{BlockEventFilter, BlockStatus},
- parameter::BlockParameter,
- prelude::*,
- },
-};
-use iroha_test_network::*;
-use iroha_test_samples::ALICE_ID;
-use nonzero_ext::nonzero;
-use serde::Deserialize;
-
-pub type Tps = f64;
-
-#[derive(Debug, Clone, Copy, Deserialize)]
-pub struct Config {
- pub peers: u32,
- /// Interval in microseconds between transactions to reduce load
- pub interval_us_per_tx: u64,
- pub block_limits: BlockParameter,
- pub blocks: u32,
- pub sample_size: u32,
- pub genesis_max_retries: u32,
-}
-
-impl fmt::Display for Config {
- fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
- write!(
- f,
- "{}peers-{}interval_µs-{}max_txs-{}blocks-{}samples",
- self.peers, self.interval_us_per_tx, self.block_limits, self.blocks, self.sample_size,
- )
- }
-}
-
-impl Config {
- pub fn from_path<P: AsRef<Path> + fmt::Debug>(path: P) -> Result<Self> {
- let file = File::open(path).wrap_err("Failed to open the config file")?;
- let reader = BufReader::new(file);
- serde_json::from_reader(reader).wrap_err("Failed to deserialize json from reader")
- }
-
- pub fn measure(self) -> Result<Tps> {
- // READY
- let (_rt, network, client) = Network::start_test_with_runtime(self.peers, None);
- let clients = network.clients();
- wait_for_genesis_committed_with_max_retries(&clients, 0, self.genesis_max_retries);
-
- client.submit_blocking(SetParameter::new(Parameter::Block(self.block_limits)))?;
-
- let unit_names = (UnitName::MIN..).take(self.peers as usize);
- let units = clients
- .into_iter()
- .zip(unit_names)
- .map(|(client, name)| {
- let unit = MeasurerUnit {
- config: self,
- client,
- name,
- signatory: KeyPair::random().into_parts().0,
- };
- unit.ready()
- })
- .collect::<Result<Vec<_>>>()?;
-
- let event_counter_handles = units
- .iter()
- .map(MeasurerUnit::spawn_event_counter)
- .collect::<Vec<_>>();
-
- // START
- let timer = time::Instant::now();
- let transaction_submitter_handles = units
- .iter()
- .map(|unit| {
- let (shutdown_sender, shutdown_reciever) = mpsc::channel();
- let handle = unit.spawn_transaction_submitter(shutdown_reciever);
- (handle, shutdown_sender)
- })
- .collect::<Vec<_>>();
-
- // Wait for slowest peer to commit required number of blocks
- for handle in event_counter_handles {
- handle.join().expect("Event counter panicked")?;
- }
-
- // END
- let elapsed_secs = timer.elapsed().as_secs_f64();
-
- // Stop transaction submitters
- for (handle, shutdown_sender) in transaction_submitter_handles {
- shutdown_sender
- .send(())
- .expect("Failed to send shutdown signal");
- handle.join().expect("Transaction submitter panicked");
- }
-
- let blocks_out_of_measure = 2 + MeasurerUnit::PREPARATION_BLOCKS_NUMBER * self.peers;
- let state_view = network
- .first_peer
- .irohad
- .as_ref()
- .expect("Must be some")
- .state()
- .view();
- let mut blocks =
- state_view.all_blocks(NonZeroUsize::new(blocks_out_of_measure as usize + 1).unwrap());
- let (txs_accepted, txs_rejected) = (0..self.blocks)
- .map(|_| {
- let block = blocks
- .next()
- .expect("The block is not yet in state. Need more sleep?");
- (
- block.transactions().filter(|tx| tx.error.is_none()).count(),
- block.transactions().filter(|tx| tx.error.is_some()).count(),
- )
- })
- .fold((0, 0), |acc, pair| (acc.0 + pair.0, acc.1 + pair.1));
- #[allow(clippy::float_arithmetic, clippy::cast_precision_loss)]
- let tps = txs_accepted as f64 / elapsed_secs;
- iroha_logger::info!(%tps, %txs_accepted, %elapsed_secs, %txs_rejected);
- Ok(tps)
- }
-}
-
-struct MeasurerUnit {
- pub config: Config,
- pub client: Client,
- pub name: UnitName,
- pub signatory: PublicKey,
-}
-
-type UnitName = u32;
-
-impl MeasurerUnit {
- /// Number of blocks that will be committed by [`Self::ready()`] call
- const PREPARATION_BLOCKS_NUMBER: u32 = 2;
-
- /// Submit initial transactions for measurement
- fn ready(self) -> Result<Self> {
- let register_me = Register::account(Account::new(self.account_id()));
- self.client.submit_blocking(register_me)?;
-
- let mint_a_rose = Mint::asset_numeric(1_u32, self.asset_id());
- self.client.submit_blocking(mint_a_rose)?;
-
- Ok(self)
- }
-
- /// Spawn who checks if all the expected blocks are committed
- fn spawn_event_counter(&self) -> thread::JoinHandle<Result<()>> {
- let listener = self.client.clone();
- let (init_sender, init_receiver) = mpsc::channel();
- let event_filter = BlockEventFilter::default().for_status(BlockStatus::Applied);
- let blocks_expected = self.config.blocks as usize;
- let name = self.name;
- let handle = thread::spawn(move || -> Result<()> {
- let mut event_iterator = listener.listen_for_events([event_filter])?;
- init_sender.send(())?;
- for i in 1..=blocks_expected {
- let _event = event_iterator.next().expect("Event stream closed")?;
- iroha_logger::info!(name, block = i, "Received block committed event");
- }
- Ok(())
- });
- init_receiver
- .recv()
- .expect("Failed to initialize an event counter");
-
- handle
- }
-
- /// Spawn who periodically submits transactions
- fn spawn_transaction_submitter(
- &self,
- shutdown_signal: mpsc::Receiver<()>,
- ) -> thread::JoinHandle<()> {
- let chain_id = ChainId::from("00000000-0000-0000-0000-000000000000");
-
- let submitter = self.client.clone();
- let interval_us_per_tx = self.config.interval_us_per_tx;
- let instructions = self.instructions();
- let alice_id = ALICE_ID.clone();
-
- let mut nonce = nonzero!(1_u32);
-
- thread::spawn(move || {
- for instruction in instructions {
- match shutdown_signal.try_recv() {
- Err(mpsc::TryRecvError::Empty) => {
- let mut transaction =
- TransactionBuilder::new(chain_id.clone(), alice_id.clone())
- .with_instructions([instruction]);
- transaction.set_nonce(nonce); // Use nonce to avoid transaction duplication within the same thread
-
- let transaction = submitter.sign_transaction(transaction);
- if let Err(error) = submitter.submit_transaction(&transaction) {
- iroha_logger::error!(?error, "Failed to submit transaction");
- }
-
- nonce = nonce.checked_add(1).unwrap_or_else(|| nonzero!(1_u32));
- thread::sleep(time::Duration::from_micros(interval_us_per_tx));
- }
- Err(mpsc::TryRecvError::Disconnected) => {
- panic!("Unexpected disconnection of shutdown sender");
- }
- Ok(()) => {
- iroha_logger::info!("Shutdown transaction submitter");
- return;
- }
- }
- }
- })
- }
-
- fn instructions(&self) -> impl Iterator<Item = InstructionBox> {
- std::iter::once(self.mint()).cycle()
- }
-
- fn mint(&self) -> InstructionBox {
- Mint::asset_numeric(1_u32, self.asset_id()).into()
- }
-
- fn account_id(&self) -> AccountId {
- AccountId::new("wonderland".parse().expect("Valid"), self.signatory.clone())
- }
-
- fn asset_id(&self) -> AssetId {
- AssetId::new("rose#wonderland".parse().expect("Valid"), self.account_id())
- }
-}
diff --git a/crates/iroha/examples/million_accounts_genesis.rs b/crates/iroha/examples/million_accounts_genesis.rs
deleted file mode 100644
index aa50d6ab98a..00000000000
--- a/crates/iroha/examples/million_accounts_genesis.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-//! This file contains examples from the Rust tutorial.
-use std::{thread, time::Duration};
-
-use iroha::{
- crypto::KeyPair,
- data_model::{isi::InstructionBox, prelude::*},
-};
-use iroha_genesis::{GenesisBlock, GenesisBuilder};
-use iroha_primitives::unique_vec;
-use iroha_test_network::{
- get_chain_id, get_key_pair, wait_for_genesis_committed, Peer as TestPeer, PeerBuilder,
- TestRuntime,
-};
-use iroha_test_samples::load_sample_wasm;
-use irohad::samples::get_config;
-use tokio::runtime::Runtime;
-
-fn generate_genesis(
- num_domains: u32,
- chain_id: ChainId,
- genesis_key_pair: &KeyPair,
- topology: Vec<PeerId>,
-) -> GenesisBlock {
- let mut builder = GenesisBuilder::default();
-
- let signatory_alice = get_key_pair(iroha_test_network::Signatory::Alice)
- .into_parts()
- .0;
- for i in 0_u32..num_domains {
- builder = builder
- .domain(format!("wonderland-{i}").parse().expect("Valid"))
- .account(signatory_alice.clone())
- .asset(
- format!("xor-{i}").parse().expect("Valid"),
- AssetType::Numeric(NumericSpec::default()),
- )
- .finish_domain();
- }
-
- let executor = Executor::new(load_sample_wasm("default_executor"));
- builder.build_and_sign(chain_id, executor, topology, genesis_key_pair)
-}
-
-fn main_genesis() {
- let mut peer = <TestPeer>::new().expect("Failed to create peer");
-
- let chain_id = get_chain_id();
- let genesis_key_pair = get_key_pair(iroha_test_network::Signatory::Genesis);
- let topology = vec![peer.id.clone()];
- let configuration = get_config(
- unique_vec![peer.id.clone()],
- chain_id.clone(),
- get_key_pair(iroha_test_network::Signatory::Peer),
- genesis_key_pair.public_key(),
- );
- let rt = Runtime::test();
- let genesis = generate_genesis(1_000_000_u32, chain_id, &genesis_key_pair, topology);
-
- let builder = PeerBuilder::new()
- .with_genesis(genesis)
- .with_config(configuration);
-
- // This only submits the genesis. It doesn't check if the accounts
- // are created, because that check is 1) not needed for what the
- // test is actually for, 2) incredibly slow, making this sort of
- // test impractical, 3) very likely to overflow memory on systems
- // with less than 16GiB of free memory.
- rt.block_on(builder.start_with_peer(&mut peer));
-}
-
-fn create_million_accounts_directly() {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
- for i in 0_u32..1_000_000_u32 {
- let domain_id: DomainId = format!("wonderland-{i}").parse().expect("Valid");
- let normal_account_id = AccountId::new(domain_id.clone(), KeyPair::random().into_parts().0);
- let create_domain = Register::domain(Domain::new(domain_id));
- let create_account = Register::account(Account::new(normal_account_id.clone()));
- if test_client
- .submit_all::<InstructionBox>([create_domain.into(), create_account.into()])
- .is_err()
- {
- thread::sleep(Duration::from_millis(100));
- }
- }
- thread::sleep(Duration::from_secs(1000));
-}
-
-fn main() {
- create_million_accounts_directly();
- main_genesis();
-}
diff --git a/crates/iroha/examples/register_1000_triggers.rs b/crates/iroha/examples/register_1000_triggers.rs
deleted file mode 100644
index 63954526fc1..00000000000
--- a/crates/iroha/examples/register_1000_triggers.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-//! Example of registering multiple triggers
-//! Used to show Iroha's trigger deduplication capabilities
-
-use std::num::NonZeroU64;
-
-use iroha::{
- client::Client,
- crypto::KeyPair,
- data_model::{prelude::*, trigger::TriggerId},
-};
-use iroha_data_model::parameter::{Parameter, SmartContractParameter};
-use iroha_genesis::{GenesisBlock, GenesisBuilder};
-use iroha_primitives::unique_vec;
-use iroha_test_network::{
- get_chain_id, get_key_pair, wait_for_genesis_committed_with_max_retries, Peer as TestPeer,
- PeerBuilder, TestClient, TestRuntime,
-};
-use iroha_test_samples::{gen_account_in, load_sample_wasm};
-use irohad::samples::get_config;
-use tokio::runtime::Runtime;
-
-fn generate_genesis(
- num_triggers: u32,
- chain_id: ChainId,
- genesis_key_pair: &KeyPair,
- topology: Vec<PeerId>,
-) -> Result<GenesisBlock, Box<dyn std::error::Error>> {
- let builder = GenesisBuilder::default()
- .append_instruction(SetParameter::new(Parameter::Executor(
- SmartContractParameter::Fuel(NonZeroU64::MAX),
- )))
- .append_instruction(SetParameter::new(Parameter::Executor(
- SmartContractParameter::Memory(NonZeroU64::MAX),
- )));
-
- let (account_id, _account_keypair) = gen_account_in("wonderland");
-
- let build_trigger = |trigger_id: TriggerId| {
- Trigger::new(
- trigger_id.clone(),
- Action::new(
- load_sample_wasm("mint_rose_trigger"),
- Repeats::Indefinitely,
- account_id.clone(),
- ExecuteTriggerEventFilter::new()
- .for_trigger(trigger_id)
- .under_authority(account_id.clone()),
- ),
- )
- };
-
- let builder = (0..num_triggers)
- .map(|i| {
- let trigger_id = i.to_string().parse::<TriggerId>().unwrap();
- let trigger = build_trigger(trigger_id);
- Register::trigger(trigger)
- })
- .fold(builder, GenesisBuilder::append_instruction);
-
- let executor = Executor::new(load_sample_wasm("default_executor"));
- Ok(builder.build_and_sign(chain_id, executor, topology, genesis_key_pair))
-}
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
- let mut peer: TestPeer = <TestPeer>::new().expect("Failed to create peer");
-
- let chain_id = get_chain_id();
- let genesis_key_pair = get_key_pair(iroha_test_network::Signatory::Genesis);
- let topology = vec![peer.id.clone()];
- let configuration = get_config(
- unique_vec![peer.id.clone()],
- chain_id.clone(),
- get_key_pair(iroha_test_network::Signatory::Peer),
- genesis_key_pair.public_key(),
- );
-
- let genesis = generate_genesis(1_000_u32, chain_id, &genesis_key_pair, topology)?;
-
- let builder = PeerBuilder::new()
- .with_genesis(genesis)
- .with_config(configuration);
-
- let rt = Runtime::test();
- let test_client = Client::test(&peer.api_address);
- rt.block_on(builder.start_with_peer(&mut peer));
-
- wait_for_genesis_committed_with_max_retries(&vec![test_client.clone()], 0, 600);
-
- Ok(())
-}
diff --git a/crates/iroha/src/client.rs b/crates/iroha/src/client.rs
index dfcf644b0d3..93a8e54d04f 100644
--- a/crates/iroha/src/client.rs
+++ b/crates/iroha/src/client.rs
@@ -70,12 +70,7 @@ impl TransactionResponseHandler {
pub struct StatusResponseHandler;
impl StatusResponseHandler {
- pub(crate) fn handle(resp: &Response<Vec<u8>>) -> Result<Status> {
- let slice = Self::handle_raw(resp)?;
- serde_json::from_slice(slice).wrap_err("Failed to decode body")
- }
-
- fn handle_raw(resp: &Response<Vec<u8>>) -> Result<&Vec<u8>> {
+ fn handle(resp: &Response<Vec<u8>>) -> Result<&Vec<u8>> {
if resp.status() != StatusCode::OK {
return Err(ResponseReport::with_msg("Unexpected status response", resp)
.unwrap_or_else(core::convert::identity)
@@ -362,6 +357,12 @@ impl Client {
Self::listen_for_tx_confirmation_loop(&mut event_iterator, hash),
)
.await
+ .wrap_err_with(|| {
+ eyre!(
+ "haven't got tx confirmation within {:?} (configured with `transaction_status_timeout`)",
+ self.transaction_status_timeout
+ )
+ })
.map_err(Into::into)
.and_then(std::convert::identity);
event_iterator.close().await;
@@ -615,7 +616,7 @@ impl Client {
.prepare_status_request::<DefaultRequestBuilder>()
.header(http::header::ACCEPT, "application/x-parity-scale");
let resp = req.build()?.send()?;
- let scaled_resp = StatusResponseHandler::handle_raw(&resp).cloned()?;
+ let scaled_resp = StatusResponseHandler::handle(&resp).cloned()?;
DecodeAll::decode_all(&mut scaled_resp.as_slice()).map_err(|err| eyre!("{err}"))
}
diff --git a/crates/iroha/src/config.rs b/crates/iroha/src/config.rs
index 2092f79ebd5..48948780bf0 100644
--- a/crates/iroha/src/config.rs
+++ b/crates/iroha/src/config.rs
@@ -19,6 +19,8 @@ use crate::{
mod user;
+pub use user::Root as UserConfig;
+
#[allow(missing_docs)]
pub const DEFAULT_TRANSACTION_TIME_TO_LIVE: Duration = Duration::from_secs(100);
#[allow(missing_docs)]
diff --git a/crates/iroha/src/lib.rs b/crates/iroha/src/lib.rs
index 6185fb12c10..a88e5aef996 100644
--- a/crates/iroha/src/lib.rs
+++ b/crates/iroha/src/lib.rs
@@ -6,51 +6,5 @@ pub mod http;
mod http_default;
pub mod query;
-pub mod samples {
- //! Module containing sample configurations for tests and benchmarks.
-
- use eyre::Result;
- use iroha_telemetry::metrics::Status;
- use url::Url;
-
- use crate::{
- client::{Client, StatusResponseHandler},
- config::{
- Config, DEFAULT_TRANSACTION_NONCE, DEFAULT_TRANSACTION_STATUS_TIMEOUT,
- DEFAULT_TRANSACTION_TIME_TO_LIVE,
- },
- crypto::KeyPair,
- data_model::ChainId,
- http_default::DefaultRequestBuilder,
- };
-
- /// Get sample client configuration.
- pub fn get_client_config(chain_id: ChainId, key_pair: KeyPair, torii_api_url: Url) -> Config {
- let account_id = format!("{}@wonderland", key_pair.public_key())
- .parse()
- .expect("should be valid");
- Config {
- chain: chain_id,
- key_pair,
- torii_api_url,
- account: account_id,
- basic_auth: None,
- transaction_ttl: DEFAULT_TRANSACTION_TIME_TO_LIVE,
- transaction_status_timeout: DEFAULT_TRANSACTION_STATUS_TIMEOUT,
- transaction_add_nonce: DEFAULT_TRANSACTION_NONCE,
- }
- }
-
- /// Gets network status seen from the peer in json format
- ///
- /// # Errors
- /// Fails if sending request or decoding fails
- pub fn get_status_json(client: &Client) -> Result<Status> {
- let req = client.prepare_status_request::<DefaultRequestBuilder>();
- let resp = req.build()?.send()?;
- StatusResponseHandler::handle(&resp)
- }
-}
-
pub use iroha_crypto as crypto;
pub use iroha_data_model as data_model;
diff --git a/crates/iroha/tests/integration/asset.rs b/crates/iroha/tests/integration/asset.rs
index b06871b1007..e605b0c3432 100644
--- a/crates/iroha/tests/integration/asset.rs
+++ b/crates/iroha/tests/integration/asset.rs
@@ -1,5 +1,3 @@
-use std::thread;
-
use eyre::Result;
use iroha::{
client,
@@ -11,7 +9,6 @@ use iroha::{
transaction::error::TransactionRejectionReason,
},
};
-use iroha_config::parameters::actual::Root as Config;
use iroha_executor_data_model::permission::asset::CanTransferAsset;
use iroha_test_network::*;
use iroha_test_samples::{gen_account_in, ALICE_ID, BOB_ID};
@@ -20,8 +17,8 @@ use iroha_test_samples::{gen_account_in, ALICE_ID, BOB_ID};
// This test is also covered at the UI level in the iroha_cli tests
// in test_register_asset_definitions.py
fn client_register_asset_should_add_asset_once_but_not_twice() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_620).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
// Given
let account_id = ALICE_ID.clone();
@@ -36,22 +33,21 @@ fn client_register_asset_should_add_asset_once_but_not_twice() -> Result<()> {
0_u32,
));
- test_client
- .submit_all::<InstructionBox>([create_asset.into(), register_asset.clone().into()])?;
+ test_client.submit_all_blocking::<InstructionBox>([
+ create_asset.into(),
+ register_asset.clone().into(),
+ ])?;
// Registering an asset to an account which doesn't have one
// should result in asset being created
- test_client.poll(move |client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id))
- .execute_all()?;
-
- Ok(assets.iter().any(|asset| {
- *asset.id().definition() == asset_definition_id
- && *asset.value() == AssetValue::Numeric(Numeric::ZERO)
- }))
- })?;
+ let asset = test_client
+ .query(client::asset::all())
+ .filter_with(|asset| asset.id.account.eq(account_id))
+ .execute_all()?
+ .into_iter()
+ .find(|asset| *asset.id().definition() == asset_definition_id)
+ .unwrap();
+ assert_eq!(*asset.value(), AssetValue::Numeric(Numeric::ZERO));
// But registering an asset to account already having one should fail
assert!(test_client.submit_blocking(register_asset).is_err());
@@ -61,8 +57,8 @@ fn client_register_asset_should_add_asset_once_but_not_twice() -> Result<()> {
#[test]
fn unregister_asset_should_remove_asset_from_account() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_555).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
// Given
let account_id = ALICE_ID.clone();
@@ -76,33 +72,29 @@ fn unregister_asset_should_remove_asset_from_account() -> Result<()> {
let register_asset = Register::asset(Asset::new(asset_id.clone(), 0_u32)).into();
let unregister_asset = Unregister::asset(asset_id);
- test_client.submit_all([create_asset, register_asset])?;
+ test_client.submit_all_blocking([create_asset, register_asset])?;
- // Wait for asset to be registered
- test_client.poll(|client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id.clone()))
- .execute_all()?;
+ // Check for asset to be registered
+ let assets = test_client
+ .query(client::asset::all())
+ .filter_with(|asset| asset.id.account.eq(account_id.clone()))
+ .execute_all()?;
- Ok(assets
- .iter()
- .any(|asset| *asset.id().definition() == asset_definition_id))
- })?;
+ assert!(assets
+ .iter()
+ .any(|asset| *asset.id().definition() == asset_definition_id));
- test_client.submit(unregister_asset)?;
+ test_client.submit_blocking(unregister_asset)?;
// ... and check that it is removed after Unregister
- test_client.poll(|client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id.clone()))
- .execute_all()?;
+ let assets = test_client
+ .query(client::asset::all())
+ .filter_with(|asset| asset.id.account.eq(account_id.clone()))
+ .execute_all()?;
- Ok(assets
- .iter()
- .all(|asset| *asset.id().definition() != asset_definition_id))
- })?;
+ assert!(assets
+ .iter()
+ .all(|asset| *asset.id().definition() != asset_definition_id));
Ok(())
}
@@ -111,8 +103,8 @@ fn unregister_asset_should_remove_asset_from_account() -> Result<()> {
// This test is also covered at the UI level in the iroha_cli tests
// in test_mint_assets.py
fn client_add_asset_quantity_to_existing_asset_should_increase_asset_amount() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_000).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
// Given
let account_id = ALICE_ID.clone();
@@ -130,25 +122,23 @@ fn client_add_asset_quantity_to_existing_asset_should_increase_asset_amount() ->
);
let instructions: [InstructionBox; 2] = [create_asset.into(), mint.into()];
let tx = test_client.build_transaction(instructions, metadata);
- test_client.submit_transaction(&tx)?;
- test_client.poll(|client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id))
- .execute_all()?;
-
- Ok(assets.iter().any(|asset| {
- *asset.id().definition() == asset_definition_id
- && *asset.value() == AssetValue::Numeric(quantity)
- }))
- })?;
+ test_client.submit_transaction_blocking(&tx)?;
+
+ let asset = test_client
+ .query(client::asset::all())
+ .filter_with(|asset| asset.id.account.eq(account_id))
+ .execute_all()?
+ .into_iter()
+ .find(|asset| *asset.id().definition() == asset_definition_id)
+ .unwrap();
+ assert_eq!(*asset.value(), AssetValue::Numeric(quantity));
Ok(())
}
#[test]
fn client_add_big_asset_quantity_to_existing_asset_should_increase_asset_amount() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_510).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
// Given
let account_id = ALICE_ID.clone();
@@ -158,7 +148,7 @@ fn client_add_big_asset_quantity_to_existing_asset_should_increase_asset_amount(
let create_asset =
Register::asset_definition(AssetDefinition::numeric(asset_definition_id.clone()));
let metadata = iroha::data_model::metadata::Metadata::default();
- //When
+ // When
let quantity = Numeric::new(2_u128.pow(65), 0);
let mint = Mint::asset_numeric(
quantity,
@@ -166,25 +156,23 @@ fn client_add_big_asset_quantity_to_existing_asset_should_increase_asset_amount(
);
let instructions: [InstructionBox; 2] = [create_asset.into(), mint.into()];
let tx = test_client.build_transaction(instructions, metadata);
- test_client.submit_transaction(&tx)?;
- test_client.poll(|client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id))
- .execute_all()?;
-
- Ok(assets.iter().any(|asset| {
- *asset.id().definition() == asset_definition_id
- && *asset.value() == AssetValue::Numeric(quantity)
- }))
- })?;
+ test_client.submit_transaction_blocking(&tx)?;
+
+ let asset = test_client
+ .query(client::asset::all())
+ .filter_with(|asset| asset.id.account.eq(account_id))
+ .execute_all()?
+ .into_iter()
+ .find(|asset| *asset.id().definition() == asset_definition_id)
+ .unwrap();
+ assert_eq!(*asset.value(), AssetValue::Numeric(quantity));
Ok(())
}
#[test]
fn client_add_asset_with_decimal_should_increase_asset_amount() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_515).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
// Given
let account_id = ALICE_ID.clone();
@@ -203,18 +191,16 @@ fn client_add_asset_with_decimal_should_increase_asset_amount() -> Result<()> {
);
let instructions: [InstructionBox; 2] = [create_asset.into(), mint.into()];
let tx = test_client.build_transaction(instructions, metadata);
- test_client.submit_transaction(&tx)?;
- test_client.poll(|client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id.clone()))
- .execute_all()?;
-
- Ok(assets.iter().any(|asset| {
- *asset.id().definition() == asset_definition_id
- && *asset.value() == AssetValue::Numeric(quantity)
- }))
- })?;
+ test_client.submit_transaction_blocking(&tx)?;
+
+ let asset = test_client
+ .query(client::asset::all())
+ .filter_with(|asset| asset.id.account.eq(account_id.clone()))
+ .execute_all()?
+ .into_iter()
+ .find(|asset| *asset.id().definition() == asset_definition_id)
+ .unwrap();
+ assert_eq!(*asset.value(), AssetValue::Numeric(quantity));
// Add some fractional part
let quantity2 = numeric!(0.55);
@@ -226,65 +212,16 @@ fn client_add_asset_with_decimal_should_increase_asset_amount() -> Result<()> {
let sum = quantity
.checked_add(quantity2)
.ok_or_else(|| eyre::eyre!("overflow"))?;
- test_client.submit(mint)?;
- test_client.poll(|client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id))
- .execute_all()?;
-
- Ok(assets.iter().any(|asset| {
- *asset.id().definition() == asset_definition_id
- && *asset.value() == AssetValue::Numeric(sum)
- }))
- })?;
- Ok(())
-}
+ test_client.submit_blocking(mint)?;
-#[test]
-// This test is also covered at the UI level in the iroha_cli tests
-// in test_register_asset_definitions.py
-fn client_add_asset_with_name_length_more_than_limit_should_not_commit_transaction() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_520).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
- let pipeline_time = Config::pipeline_time();
-
- // Given
- let normal_asset_definition_id = "xor#wonderland"
- .parse::<AssetDefinitionId>()
- .expect("Valid");
- let create_asset =
- Register::asset_definition(AssetDefinition::numeric(normal_asset_definition_id.clone()));
- test_client.submit(create_asset)?;
- iroha_logger::info!("Creating asset");
-
- let too_long_asset_name = "0".repeat(2_usize.pow(14));
- let incorrect_asset_definition_id = (too_long_asset_name + "#wonderland")
- .parse::<AssetDefinitionId>()
- .expect("Valid");
- let create_asset = Register::asset_definition(AssetDefinition::numeric(
- incorrect_asset_definition_id.clone(),
- ));
-
- test_client.submit(create_asset)?;
- iroha_logger::info!("Creating another asset");
- thread::sleep(pipeline_time * 4);
-
- let mut asset_definition_ids = test_client
- .query(client::asset::all_definitions())
- .execute_all()
- .expect("Failed to execute request.")
+ let asset = test_client
+ .query(client::asset::all())
+ .filter_with(|asset| asset.id.account.eq(account_id))
+ .execute_all()?
.into_iter()
- .map(|asset| asset.id().clone());
- iroha_logger::debug!(
- "Collected asset definitions ID's: {:?}",
- &asset_definition_ids
- );
-
- assert!(asset_definition_ids
- .any(|asset_definition_id| asset_definition_id == normal_asset_definition_id));
- assert!(!asset_definition_ids
- .any(|asset_definition_id| asset_definition_id == incorrect_asset_definition_id));
+ .find(|asset| *asset.id().definition() == asset_definition_id)
+ .unwrap();
+ assert_eq!(*asset.value(), AssetValue::Numeric(sum));
Ok(())
}
@@ -294,8 +231,8 @@ fn client_add_asset_with_name_length_more_than_limit_should_not_commit_transacti
#[allow(clippy::expect_fun_call)]
#[test]
fn find_rate_and_make_exchange_isi_should_succeed() {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_675).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let test_client = network.client();
let (dex_id, _dex_keypair) = gen_account_in("exchange");
let (seller_id, seller_keypair) = gen_account_in("company");
@@ -388,8 +325,8 @@ fn find_rate_and_make_exchange_isi_should_succeed() {
#[test]
fn transfer_asset_definition() {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_060).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let test_client = network.client();
let alice_id = ALICE_ID.clone();
let bob_id = BOB_ID.clone();
@@ -426,8 +363,8 @@ fn transfer_asset_definition() {
#[test]
fn fail_if_dont_satisfy_spec() {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_125).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let test_client = network.client();
let alice_id = ALICE_ID.clone();
let bob_id = BOB_ID.clone();
diff --git a/crates/iroha/tests/integration/asset_propagation.rs b/crates/iroha/tests/integration/asset_propagation.rs
index 33254264e6b..45d298dd1f1 100644
--- a/crates/iroha/tests/integration/asset_propagation.rs
+++ b/crates/iroha/tests/integration/asset_propagation.rs
@@ -1,11 +1,10 @@
-use std::thread;
+// use std::thread;
use eyre::Result;
use iroha::{
client,
data_model::{parameter::BlockParameter, prelude::*},
};
-use iroha_config::parameters::actual::Root as Config;
use iroha_test_network::*;
use iroha_test_samples::gen_account_in;
use nonzero_ext::nonzero;
@@ -16,13 +15,15 @@ use nonzero_ext::nonzero;
fn client_add_asset_quantity_to_existing_asset_should_increase_asset_amount_on_another_peer(
) -> Result<()> {
// Given
- let (_rt, network, client) = Network::start_test_with_runtime(4, Some(10_450));
- wait_for_genesis_committed(&network.clients(), 0);
- let pipeline_time = Config::pipeline_time();
-
- client.submit_blocking(SetParameter::new(Parameter::Block(
- BlockParameter::MaxTransactions(nonzero!(1_u64)),
- )))?;
+ let (network, rt) = NetworkBuilder::new()
+ .with_peers(4)
+ .with_genesis_instruction(SetParameter::new(Parameter::Block(
+ BlockParameter::MaxTransactions(nonzero!(1_u64)),
+ )))
+ .start_blocking()?;
+ let mut peers = network.peers().iter();
+ let peer_a = peers.next().unwrap();
+ let peer_b = peers.next().unwrap();
let create_domain = Register::domain(Domain::new("domain".parse()?));
let (account_id, _account_keypair) = gen_account_in("domain");
@@ -30,32 +31,30 @@ fn client_add_asset_quantity_to_existing_asset_should_increase_asset_amount_on_a
let asset_definition_id = "xor#domain".parse::<AssetDefinitionId>()?;
let create_asset =
Register::asset_definition(AssetDefinition::numeric(asset_definition_id.clone()));
- client.submit_all::<InstructionBox>([
+ peer_a.client().submit_all_blocking::<InstructionBox>([
create_domain.into(),
create_account.into(),
create_asset.into(),
])?;
- thread::sleep(pipeline_time * 3);
- //When
+
+ // When
let quantity = numeric!(200);
- client.submit(Mint::asset_numeric(
+ peer_a.client().submit_blocking(Mint::asset_numeric(
quantity,
AssetId::new(asset_definition_id.clone(), account_id.clone()),
))?;
- thread::sleep(pipeline_time);
+ rt.block_on(async { network.ensure_blocks(3).await })?;
- //Then
- let peer = network.peers.values().last().unwrap();
- client::Client::test(&peer.api_address).poll(|client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id))
- .execute_all()?;
+ // Then
+ let asset = peer_b
+ .client()
+ .query(client::asset::all())
+ .filter_with(|asset| asset.id.account.eq(account_id))
+ .execute_all()?
+ .into_iter()
+ .find(|asset| *asset.id().definition() == asset_definition_id)
+ .expect("should be");
+ assert_eq!(*asset.value(), AssetValue::Numeric(quantity));
- Ok(assets.iter().any(|asset| {
- *asset.id().definition() == asset_definition_id
- && *asset.value() == AssetValue::Numeric(quantity)
- }))
- })?;
Ok(())
}
diff --git a/crates/iroha/tests/integration/events/data.rs b/crates/iroha/tests/integration/events/data.rs
index 217623a8df0..cce8763dc57 100644
--- a/crates/iroha/tests/integration/events/data.rs
+++ b/crates/iroha/tests/integration/events/data.rs
@@ -1,6 +1,8 @@
-use std::{fmt::Write as _, sync::mpsc, thread};
+use std::fmt::Write as _;
+use assert_matches::assert_matches;
use eyre::Result;
+use futures_util::StreamExt;
use iroha::data_model::{prelude::*, transaction::WasmSmartContract};
use iroha_executor_data_model::permission::{
account::CanModifyAccountMetadata, domain::CanModifyDomainMetadata,
@@ -8,6 +10,7 @@ use iroha_executor_data_model::permission::{
use iroha_test_network::*;
use iroha_test_samples::{ALICE_ID, BOB_ID};
use parity_scale_codec::Encode as _;
+use tokio::task::spawn_blocking;
/// Return string containing exported memory, dummy allocator, and
/// host function imports which you can embed into your wasm module.
@@ -79,13 +82,13 @@ fn produce_instructions() -> Vec<InstructionBox> {
.collect::<Vec<_>>()
}
-#[test]
-fn instruction_execution_should_produce_events() -> Result<()> {
- transaction_execution_should_produce_events(produce_instructions(), 10_665)
+#[tokio::test]
+async fn instruction_execution_should_produce_events() -> Result<()> {
+ transaction_execution_should_produce_events(produce_instructions()).await
}
-#[test]
-fn wasm_execution_should_produce_events() -> Result<()> {
+#[tokio::test]
+async fn wasm_execution_should_produce_events() -> Result<()> {
#![allow(clippy::integer_division)]
let isi_hex: Vec<String> = produce_instructions()
.into_iter()
@@ -124,105 +127,84 @@ fn wasm_execution_should_produce_events() -> Result<()> {
isi_calls = isi_calls
);
- transaction_execution_should_produce_events(
- WasmSmartContract::from_compiled(wat.into_bytes()),
- 10_615,
- )
+ transaction_execution_should_produce_events(WasmSmartContract::from_compiled(wat.into_bytes()))
+ .await
}
-fn transaction_execution_should_produce_events(
- executable: impl Into<Executable>,
- port: u16,
+async fn transaction_execution_should_produce_events(
+ executable: impl Into<Executable> + Send,
) -> Result<()> {
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(port).start_with_runtime();
- wait_for_genesis_committed(&[client.clone()], 0);
-
- // spawn event reporter
- let listener = client.clone();
- let (init_sender, init_receiver) = mpsc::channel();
- let (event_sender, event_receiver) = mpsc::channel();
- let event_filter = DataEventFilter::Any;
- thread::spawn(move || -> Result<()> {
- let event_iterator = listener.listen_for_events([event_filter])?;
- init_sender.send(())?;
- for event in event_iterator {
- event_sender.send(event)?
- }
- Ok(())
- });
-
- // submit transaction to produce events
- init_receiver.recv()?;
- let transaction = client.build_transaction(executable, Metadata::default());
- client.submit_transaction_blocking(&transaction)?;
-
- // assertion
- iroha_logger::info!("Listening for events");
- for i in 0..4_usize {
- let event: DataEvent = event_receiver.recv()??.try_into()?;
- iroha_logger::info!("Event: {:?}", event);
- assert!(matches!(event, DataEvent::Domain(_)));
- if let DataEvent::Domain(domain_event) = event {
- assert!(matches!(domain_event, DomainEvent::Created(_)));
-
- if let DomainEvent::Created(created_domain) = domain_event {
- let domain_id = DomainId::new(i.to_string().parse().expect("Valid"));
- assert_eq!(domain_id, *created_domain.id());
- }
- }
+ let network = NetworkBuilder::new().start().await?;
+ let mut events_stream = network
+ .client()
+ .listen_for_events_async([DataEventFilter::Any])
+ .await?;
+
+ {
+ let client = network.client();
+ let tx = client.build_transaction(executable, <_>::default());
+ spawn_blocking(move || client.submit_transaction_blocking(&tx)).await??;
+ }
+
+ for i in 0..4 {
+ let event = events_stream
+ .next()
+ .await
+ .expect("there are at least 4 events")?;
+
+ let domain = assert_matches!(
+ event,
+ EventBox::Data(DataEvent::Domain(DomainEvent::Created(domain))) => domain
+ );
+ assert_eq!(domain.id().name().as_ref(), i.to_string())
}
Ok(())
}
-#[test]
-fn produce_multiple_events() -> Result<()> {
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(10_645).start_with_runtime();
- wait_for_genesis_committed(&[client.clone()], 0);
-
- // Spawn event reporter
- let listener = client.clone();
- let (init_sender, init_receiver) = mpsc::channel();
- let (event_sender, event_receiver) = mpsc::channel();
- let event_filter = DataEventFilter::Any;
- thread::spawn(move || -> Result<()> {
- let event_iterator = listener.listen_for_events([event_filter])?;
- init_sender.send(())?;
- for event in event_iterator {
- event_sender.send(event)?
- }
- Ok(())
- });
-
- // Wait for event listener
- init_receiver.recv()?;
+#[tokio::test]
+#[allow(clippy::too_many_lines)]
+async fn produce_multiple_events() -> Result<()> {
+ let network = NetworkBuilder::new().start().await?;
+ let mut events_stream = network
+ .client()
+ .listen_for_events_async([DataEventFilter::Any])
+ .await?;
- // Registering role
- let alice_id = ALICE_ID.clone();
+ // Register role
let role_id = "TEST_ROLE".parse::<RoleId>()?;
let permission_1 = CanModifyAccountMetadata {
- account: alice_id.clone(),
+ account: ALICE_ID.clone(),
};
let permission_2 = CanModifyDomainMetadata {
- domain: alice_id.domain().clone(),
+ domain: ALICE_ID.domain().clone(),
};
- let role = iroha::data_model::role::Role::new(role_id.clone(), alice_id.clone())
+ let role = Role::new(role_id.clone(), ALICE_ID.clone())
.add_permission(permission_1.clone())
.add_permission(permission_2.clone());
- let instructions = [Register::role(role.clone())];
- client.submit_all_blocking(instructions)?;
+ let register_role = Register::role(role.clone());
- // Grants role to Bob
+ // Grant the role to Bob
let bob_id = BOB_ID.clone();
- let grant_role = Grant::account_role(role_id.clone(), bob_id.clone());
- client.submit_blocking(grant_role)?;
+ let grant_role = Grant::account_role(role_id.clone(), BOB_ID.clone());
- // Unregister role
+ // Unregister the role
let unregister_role = Unregister::role(role_id.clone());
- client.submit_blocking(unregister_role)?;
+
+ {
+ let client = network.client();
+ spawn_blocking(move || {
+ client.submit_all_blocking::<InstructionBox>([
+ register_role.into(),
+ grant_role.into(),
+ unregister_role.into(),
+ ])
+ })
+ .await??;
+ }
// Inspect produced events
- let event: DataEvent = event_receiver.recv()??.try_into()?;
+ let event: DataEvent = events_stream.next().await.unwrap()?.try_into()?;
assert!(matches!(event, DataEvent::Role(_)));
if let DataEvent::Role(role_event) = event {
assert!(matches!(role_event, RoleEvent::Created(_)));
@@ -238,16 +220,16 @@ fn produce_multiple_events() -> Result<()> {
}
if let DataEvent::Domain(DomainEvent::Account(AccountEvent::RoleGranted(event))) =
- event_receiver.recv()??.try_into()?
+ events_stream.next().await.unwrap()?.try_into()?
{
- assert_eq!(*event.account(), alice_id);
+ assert_eq!(*event.account(), *ALICE_ID);
assert_eq!(*event.role(), role_id);
} else {
panic!("Expected event is not an AccountEvent::RoleGranted")
}
if let DataEvent::Domain(DomainEvent::Account(AccountEvent::RoleGranted(event))) =
- event_receiver.recv()??.try_into()?
+ events_stream.next().await.unwrap()?.try_into()?
{
assert_eq!(*event.account(), bob_id);
assert_eq!(*event.role(), role_id);
@@ -256,7 +238,7 @@ fn produce_multiple_events() -> Result<()> {
}
if let DataEvent::Domain(DomainEvent::Account(AccountEvent::RoleRevoked(event))) =
- event_receiver.recv()??.try_into()?
+ events_stream.next().await.unwrap()?.try_into()?
{
assert_eq!(*event.account(), bob_id);
assert_eq!(*event.role(), role_id);
@@ -265,15 +247,17 @@ fn produce_multiple_events() -> Result<()> {
}
if let DataEvent::Domain(DomainEvent::Account(AccountEvent::RoleRevoked(event))) =
- event_receiver.recv()??.try_into()?
+ events_stream.next().await.unwrap()?.try_into()?
{
- assert_eq!(*event.account(), alice_id);
+ assert_eq!(*event.account(), *ALICE_ID);
assert_eq!(*event.role(), role_id);
} else {
panic!("Expected event is not an AccountEvent::RoleRevoked")
}
- if let DataEvent::Role(RoleEvent::Deleted(event)) = event_receiver.recv()??.try_into()? {
+ if let DataEvent::Role(RoleEvent::Deleted(event)) =
+ events_stream.next().await.unwrap()?.try_into()?
+ {
assert_eq!(event, role_id);
} else {
panic!("Expected event is not an RoleEvent::Deleted")
diff --git a/crates/iroha/tests/integration/events/notification.rs b/crates/iroha/tests/integration/events/notification.rs
index 5bf381c1543..662e96c011a 100644
--- a/crates/iroha/tests/integration/events/notification.rs
+++ b/crates/iroha/tests/integration/events/notification.rs
@@ -1,14 +1,15 @@
-use std::{sync::mpsc, thread, time::Duration};
+use std::time::Duration;
-use eyre::{eyre, Result, WrapErr};
+use eyre::Result;
+use futures_util::StreamExt;
use iroha::data_model::prelude::*;
use iroha_test_network::*;
use iroha_test_samples::ALICE_ID;
+use tokio::{task::spawn_blocking, time::timeout};
-#[test]
-fn trigger_completion_success_should_produce_event() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_050).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+#[tokio::test]
+async fn trigger_completion_success_should_produce_event() -> Result<()> {
+ let network = NetworkBuilder::new().start().await?;
let asset_definition_id = "rose#wonderland".parse()?;
let account_id = ALICE_ID.clone();
@@ -27,34 +28,28 @@ fn trigger_completion_success_should_produce_event() -> Result<()> {
.under_authority(asset_id.account().clone()),
),
));
- test_client.submit_blocking(register_trigger)?;
+ let client = network.client();
+ spawn_blocking(move || client.submit_blocking(register_trigger)).await??;
- let call_trigger = ExecuteTrigger::new(trigger_id.clone());
+ let mut events = network
+ .client()
+ .listen_for_events_async([TriggerCompletedEventFilter::new()
+ .for_trigger(trigger_id.clone())
+ .for_outcome(TriggerCompletedOutcomeType::Success)])
+ .await?;
- let thread_client = test_client.clone();
- let (sender, receiver) = mpsc::channel();
- let _handle = thread::spawn(move || -> Result<()> {
- let mut event_it = thread_client.listen_for_events([TriggerCompletedEventFilter::new()
- .for_trigger(trigger_id)
- .for_outcome(TriggerCompletedOutcomeType::Success)])?;
- if event_it.next().is_some() {
- sender.send(())?;
- return Ok(());
- }
- Err(eyre!("No events emitted"))
- });
+ let call_trigger = ExecuteTrigger::new(trigger_id);
+ let client = network.client();
+ spawn_blocking(move || client.submit_blocking(call_trigger)).await??;
- test_client.submit(call_trigger)?;
+ let _ = timeout(Duration::from_secs(5), events.next()).await?;
- receiver
- .recv_timeout(Duration::from_secs(60))
- .wrap_err("Failed to receive event message")
+ Ok(())
}
-#[test]
-fn trigger_completion_failure_should_produce_event() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_055).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+#[tokio::test]
+async fn trigger_completion_failure_should_produce_event() -> Result<()> {
+ let network = NetworkBuilder::new().start().await?;
let account_id = ALICE_ID.clone();
let trigger_id = "fail_box".parse::<TriggerId>()?;
@@ -71,26 +66,21 @@ fn trigger_completion_failure_should_produce_event() -> Result<()> {
.under_authority(account_id),
),
));
- test_client.submit_blocking(register_trigger)?;
+ let client = network.client();
+ spawn_blocking(move || client.submit_blocking(register_trigger)).await??;
- let call_trigger = ExecuteTrigger::new(trigger_id.clone());
+ let mut events = network
+ .client()
+ .listen_for_events_async([TriggerCompletedEventFilter::new()
+ .for_trigger(trigger_id.clone())
+ .for_outcome(TriggerCompletedOutcomeType::Failure)])
+ .await?;
- let thread_client = test_client.clone();
- let (sender, receiver) = mpsc::channel();
- let _handle = thread::spawn(move || -> Result<()> {
- let mut event_it = thread_client.listen_for_events([TriggerCompletedEventFilter::new()
- .for_trigger(trigger_id)
- .for_outcome(TriggerCompletedOutcomeType::Failure)])?;
- if event_it.next().is_some() {
- sender.send(())?;
- return Ok(());
- }
- Err(eyre!("No events emitted"))
- });
+ let call_trigger = ExecuteTrigger::new(trigger_id);
+ let client = network.client();
+ spawn_blocking(move || client.submit_blocking(call_trigger)).await??;
- test_client.submit(call_trigger)?;
+ let _ = timeout(Duration::from_secs(5), events.next()).await?;
- receiver
- .recv_timeout(Duration::from_secs(60))
- .wrap_err("Failed to receive event message")
+ Ok(())
}
diff --git a/crates/iroha/tests/integration/events/pipeline.rs b/crates/iroha/tests/integration/events/pipeline.rs
index d8078b0d8b3..7b51b867609 100644
--- a/crates/iroha/tests/integration/events/pipeline.rs
+++ b/crates/iroha/tests/integration/events/pipeline.rs
@@ -1,134 +1,105 @@
-use std::thread::{self, JoinHandle};
+use std::time::Duration;
+use assert_matches::assert_matches;
use eyre::Result;
-use iroha::{
- crypto::HashOf,
- data_model::{
- events::pipeline::{
- BlockEvent, BlockEventFilter, BlockStatus, TransactionEventFilter, TransactionStatus,
- },
- isi::error::InstructionExecutionError,
- parameter::BlockParameter,
- prelude::*,
- query::error::FindError,
- transaction::error::TransactionRejectionReason,
- ValidationFail,
- },
+use futures_util::StreamExt;
+use iroha::data_model::{
+ events::pipeline::{TransactionEventFilter, TransactionStatus},
+ isi::error::InstructionExecutionError,
+ prelude::*,
+ query::error::FindError,
+ transaction::error::TransactionRejectionReason,
+ ValidationFail,
};
-use iroha_config::parameters::actual::Root as Config;
use iroha_test_network::*;
-use nonzero_ext::nonzero;
+use tokio::{task::spawn_blocking, time::timeout};
-// Needed to re-enable ignored tests.
-const PEER_COUNT: usize = 7;
-
-#[ignore = "ignore, more in #2851"]
-#[test]
-fn transaction_with_no_instructions_should_be_committed() -> Result<()> {
- test_with_instruction_and_status_and_port(None, &TransactionStatus::Approved, 10_250)
+#[tokio::test]
+async fn transaction_with_ok_instruction_should_be_committed() -> Result<()> {
+ let register = Register::domain(Domain::new("looking_glass".parse()?));
+ test_with_instruction_and_status([register], &TransactionStatus::Approved).await
}
-#[ignore = "ignore, more in #2851"]
-// #[ignore = "Experiment"]
-#[test]
-fn transaction_with_fail_instruction_should_be_rejected() -> Result<()> {
+#[tokio::test]
+async fn transaction_with_fail_instruction_should_be_rejected() -> Result<()> {
let unknown_domain_id = "dummy".parse::<DomainId>()?;
let fail_isi = Unregister::domain(unknown_domain_id.clone());
- test_with_instruction_and_status_and_port(
- Some(fail_isi.into()),
+ test_with_instruction_and_status(
+ [fail_isi],
&TransactionStatus::Rejected(Box::new(TransactionRejectionReason::Validation(
ValidationFail::InstructionFailed(InstructionExecutionError::Find(FindError::Domain(
unknown_domain_id,
))),
))),
- 10_350,
)
+ .await
}
-fn test_with_instruction_and_status_and_port(
- instruction: Option<InstructionBox>,
+async fn test_with_instruction_and_status(
+ exec: impl Into<Executable> + Send,
should_be: &TransactionStatus,
- port: u16,
) -> Result<()> {
- let (_rt, network, client) =
- Network::start_test_with_runtime(PEER_COUNT.try_into()?, Some(port));
- let clients = network.clients();
- wait_for_genesis_committed(&clients, 0);
- let pipeline_time = Config::pipeline_time();
-
- client.submit_blocking(SetParameter::new(Parameter::Block(
- BlockParameter::MaxTransactions(nonzero!(1_u64)),
- )))?;
-
// Given
- let submitter = client;
- let transaction = submitter.build_transaction(instruction, Metadata::default());
- let hash = transaction.hash();
- let mut handles = Vec::new();
- for listener in clients {
- let checker = Checker { listener, hash };
- let handle_validating = checker.clone().spawn(TransactionStatus::Queued);
- handles.push(handle_validating);
- let handle_validated = checker.spawn(should_be.clone());
- handles.push(handle_validated);
- }
+ let network = NetworkBuilder::new().start().await?;
+ let client = network.client();
+
// When
- submitter.submit_transaction(&transaction)?;
- thread::sleep(pipeline_time * 2);
- // Then
- for handle in handles {
- handle.join().expect("Thread panicked")
- }
- Ok(())
-}
+ let transaction = client.build_transaction(exec, Metadata::default());
+ let hash = transaction.hash();
+ let mut events = client
+ .listen_for_events_async([TransactionEventFilter::default().for_hash(hash)])
+ .await?;
+ spawn_blocking(move || client.submit_transaction(&transaction)).await??;
-#[derive(Clone)]
-struct Checker {
- listener: iroha::client::Client,
- hash: HashOf<SignedTransaction>,
-}
+ // Then
+ timeout(Duration::from_secs(5), async move {
+ assert_matches!(
+ events.next().await.unwrap().unwrap(),
+ EventBox::Pipeline(PipelineEventBox::Transaction(TransactionEvent {
+ status: TransactionStatus::Queued,
+ ..
+ }))
+ );
+ assert_matches!(
+ events.next().await.unwrap().unwrap(),
+ EventBox::Pipeline(PipelineEventBox::Transaction(TransactionEvent {
+ status,
+ ..
+ })) if status == *should_be
+ );
+ })
+ .await?;
-impl Checker {
- fn spawn(self, status_kind: TransactionStatus) -> JoinHandle<()> {
- thread::spawn(move || {
- let mut event_iterator = self
- .listener
- .listen_for_events([TransactionEventFilter::default()
- .for_status(status_kind)
- .for_hash(self.hash)])
- .expect("Failed to create event iterator.");
- let event_result = event_iterator.next().expect("Stream closed");
- let _event = event_result.expect("Must be valid");
- })
- }
+ Ok(())
}
#[test]
+#[ignore = "unclear how to test it while treating Iroha as a block box"]
fn applied_block_must_be_available_in_kura() {
- let (_rt, peer, client) = <PeerBuilder>::new().with_port(11_040).start_with_runtime();
- wait_for_genesis_committed(&[client.clone()], 0);
-
- let event_filter = BlockEventFilter::default().for_status(BlockStatus::Applied);
- let mut event_iter = client
- .listen_for_events([event_filter])
- .expect("Failed to subscribe for events");
-
- client
- .submit(Unregister::domain("dummy".parse().unwrap()))
- .expect("Failed to submit transaction");
-
- let event: BlockEvent = event_iter
- .next()
- .expect("Block must be committed")
- .expect("Block must be committed")
- .try_into()
- .expect("Received unexpected event");
-
- peer.irohad
- .as_ref()
- .expect("Must be some")
- .kura()
- .get_block_by_height(event.header().height().try_into().unwrap())
- .expect("Block applied event was received earlier");
+ // let (_rt, peer, client) = <PeerBuilder>::new().with_port(11_040).start_with_runtime();
+ // wait_for_genesis_committed(&[client.clone()], 0);
+ //
+ // let event_filter = BlockEventFilter::default().for_status(BlockStatus::Applied);
+ // let mut event_iter = client
+ // .listen_for_events([event_filter])
+ // .expect("Failed to subscribe for events");
+ //
+ // client
+ // .submit(Unregister::domain("dummy".parse().unwrap()))
+ // .expect("Failed to submit transaction");
+ //
+ // let event: BlockEvent = event_iter
+ // .next()
+ // .expect("Block must be committed")
+ // .expect("Block must be committed")
+ // .try_into()
+ // .expect("Received unexpected event");
+ //
+ // peer.irohad
+ // .as_ref()
+ // .expect("Must be some")
+ // .kura()
+ // .get_block_by_height(event.header().height().try_into().unwrap())
+ // .expect("Block applied event was received earlier");
}
diff --git a/crates/iroha/tests/integration/extra_functional/connected_peers.rs b/crates/iroha/tests/integration/extra_functional/connected_peers.rs
index 4bc748200d3..7dbab107963 100644
--- a/crates/iroha/tests/integration/extra_functional/connected_peers.rs
+++ b/crates/iroha/tests/integration/extra_functional/connected_peers.rs
@@ -1,130 +1,127 @@
-use std::thread;
-
-use eyre::{Context, Result};
-use iroha::{
- client::Client,
- data_model::{
- isi::{Register, Unregister},
- peer::Peer as DataModelPeer,
- },
+use std::iter::once;
+
+use assert_matches::assert_matches;
+use eyre::Result;
+use futures_util::{stream::FuturesUnordered, StreamExt};
+use iroha::data_model::{
+ isi::{Register, Unregister},
+ peer::Peer,
};
-use iroha_config::parameters::actual::Root as Config;
-use iroha_primitives::unique_vec;
+use iroha_config_base::toml::WriteExt;
use iroha_test_network::*;
-use rand::{seq::SliceRandom, thread_rng, Rng};
-use tokio::runtime::Runtime;
+use rand::{prelude::IteratorRandom, seq::SliceRandom, thread_rng};
+use tokio::{task::spawn_blocking, time::timeout};
-#[ignore = "ignore, more in #2851"]
-#[test]
-fn connected_peers_with_f_2_1_2() -> Result<()> {
- connected_peers_with_f(2, Some(11_020))
+#[tokio::test]
+async fn connected_peers_with_f_2_1_2() -> Result<()> {
+ connected_peers_with_f(2).await
}
-#[test]
-fn connected_peers_with_f_1_0_1() -> Result<()> {
- connected_peers_with_f(1, Some(11_000))
+#[tokio::test]
+async fn connected_peers_with_f_1_0_1() -> Result<()> {
+ connected_peers_with_f(1).await
}
-#[test]
-fn register_new_peer() -> Result<()> {
- let (_rt, network, _) = Network::start_test_with_runtime(4, Some(11_180));
- wait_for_genesis_committed(&network.clients(), 0);
- let pipeline_time = Config::pipeline_time();
-
- let mut peer_clients: Vec<_> = Network::peers(&network)
- .zip(Network::clients(&network))
- .collect();
-
- check_status(&peer_clients, 1);
-
- // Start new peer
- let mut configuration = Config::test();
- configuration.sumeragi.trusted_peers.value_mut().others =
- unique_vec![peer_clients.choose(&mut thread_rng()).unwrap().0.id.clone()];
- let rt = Runtime::test();
- let new_peer = rt.block_on(
- PeerBuilder::new()
- .with_config(configuration)
- .with_into_genesis(WithGenesis::None)
- .with_port(11_225)
- .start(),
- );
-
- let register_peer = Register::peer(DataModelPeer::new(new_peer.id.clone()));
- peer_clients
- .choose(&mut thread_rng())
- .unwrap()
- .1
- .submit_blocking(register_peer)?;
- peer_clients.push((&new_peer, Client::test(&new_peer.api_address)));
- thread::sleep(pipeline_time * 2 * 20); // Wait for some time to allow peers to connect
+#[tokio::test]
+async fn register_new_peer() -> Result<()> {
+ let network = NetworkBuilder::new().with_peers(4).start().await?;
+
+ let peer = NetworkPeer::generate();
+ peer.start(
+ network
+ .config()
+ // only one random peer
+ .write(["sumeragi", "trusted_peers"], [network.peer().id()]),
+ None,
+ )
+ .await;
- check_status(&peer_clients, 2);
+ let register = Register::peer(Peer::new(peer.id()));
+ let client = network.client();
+ spawn_blocking(move || client.submit_blocking(register)).await??;
+
+ timeout(network.sync_timeout(), peer.once_block(2)).await?;
Ok(())
}
/// Test the number of connected peers, changing the number of faults tolerated down and up
-fn connected_peers_with_f(faults: u64, start_port: Option<u16>) -> Result<()> {
+// Note: sometimes fails due to https://github.com/hyperledger/iroha/issues/5104
+async fn connected_peers_with_f(faults: usize) -> Result<()> {
let n_peers = 3 * faults + 1;
- let (_rt, network, _) = Network::start_test_with_runtime(
- (n_peers)
- .try_into()
- .wrap_err("`faults` argument `u64` value too high, cannot convert to `u32`")?,
- start_port,
- );
- wait_for_genesis_committed(&network.clients(), 0);
- let pipeline_time = Config::pipeline_time();
+ let network = NetworkBuilder::new().with_peers(n_peers).start().await?;
- let mut peer_clients: Vec<_> = Network::peers(&network)
- .zip(Network::clients(&network))
- .collect();
+ assert_peers_status(network.peers().iter(), 1, n_peers as u64 - 1).await;
- check_status(&peer_clients, 1);
+ let mut randomized_peers = network
+ .peers()
+ .iter()
+ .choose_multiple(&mut thread_rng(), n_peers);
+ let removed_peer = randomized_peers.remove(0);
// Unregister a peer: committed with f = `faults` then `status.peers` decrements
- let removed_peer_idx = rand::thread_rng().gen_range(0..peer_clients.len());
- let (removed_peer, _) = &peer_clients[removed_peer_idx];
- let unregister_peer = Unregister::peer(removed_peer.id.clone());
- peer_clients
- .choose(&mut thread_rng())
- .unwrap()
- .1
- .submit_blocking(unregister_peer)?;
- thread::sleep(pipeline_time * 2); // Wait for some time to allow peers to connect
- let (removed_peer, removed_peer_client) = peer_clients.remove(removed_peer_idx);
-
- thread::sleep(pipeline_time * 2); // Wait for some time to allow peers to disconnect
-
- check_status(&peer_clients, 2);
- let status = removed_peer_client.get_status()?;
+ let client = randomized_peers.choose(&mut thread_rng()).unwrap().client();
+ let unregister_peer = Unregister::peer(removed_peer.id());
+ spawn_blocking(move || client.submit_blocking(unregister_peer)).await??;
+ timeout(
+ network.sync_timeout(),
+ randomized_peers
+ .iter()
+ .map(|peer| peer.once_block(2))
+ .collect::<FuturesUnordered<_>>()
+ .collect::<Vec<_>>(),
+ )
+ .await?;
+ assert_peers_status(randomized_peers.iter().copied(), 2, n_peers as u64 - 2).await;
+
+ let status = removed_peer.status().await?;
// Peer might have been disconnected before getting the block
- assert!(status.blocks == 1 || status.blocks == 2);
+ assert_matches!(status.blocks, 1 | 2);
assert_eq!(status.peers, 0);
// Re-register the peer: committed with f = `faults` - 1 then `status.peers` increments
- let register_peer = Register::peer(DataModelPeer::new(removed_peer.id.clone()));
- peer_clients
+ let register_peer = Register::peer(Peer::new(removed_peer.id()));
+ let client = randomized_peers
+ .iter()
.choose(&mut thread_rng())
.unwrap()
- .1
- .submit_blocking(register_peer)?;
- peer_clients.insert(removed_peer_idx, (removed_peer, removed_peer_client));
- thread::sleep(pipeline_time * 2); // Wait for some time to allow peers to connect
+ .client();
+ spawn_blocking(move || client.submit_blocking(register_peer)).await??;
+ network.ensure_blocks(3).await?;
- check_status(&peer_clients, 3);
+ assert_peers_status(
+ randomized_peers.iter().copied().chain(once(removed_peer)),
+ 3,
+ n_peers as u64 - 1,
+ )
+ .await;
Ok(())
}
-fn check_status(peer_clients: &[(&Peer, Client)], expected_blocks: u64) {
- let n_peers = peer_clients.len() as u64;
-
- for (_, peer_client) in peer_clients {
- let status = peer_client.get_status().unwrap();
-
- assert_eq!(status.peers, n_peers - 1);
- assert_eq!(status.blocks, expected_blocks);
- }
+async fn assert_peers_status(
+ peers: impl Iterator<Item = &NetworkPeer> + Send,
+ expected_blocks: u64,
+ expected_peers: u64,
+) {
+ peers
+ .map(|peer| async {
+ let status = peer.status().await.expect("peer should be able to reply");
+ assert_eq!(
+ status.peers,
+ expected_peers,
+ "unexpected peers for {}",
+ peer.id()
+ );
+ assert_eq!(
+ status.blocks,
+ expected_blocks,
+ "expected blocks for {}",
+ peer.id()
+ );
+ })
+ .collect::<FuturesUnordered<_>>()
+ .collect::<Vec<_>>()
+ .await;
}
diff --git a/crates/iroha/tests/integration/extra_functional/genesis.rs b/crates/iroha/tests/integration/extra_functional/genesis.rs
index 3f1e7275b9b..8d680759e94 100644
--- a/crates/iroha/tests/integration/extra_functional/genesis.rs
+++ b/crates/iroha/tests/integration/extra_functional/genesis.rs
@@ -1,33 +1,54 @@
+use eyre::Context;
+use futures_util::{stream::FuturesUnordered, StreamExt};
use iroha::data_model::{
domain::{Domain, DomainId},
isi::Register,
};
-use iroha_test_network::{wait_for_genesis_committed, NetworkBuilder};
+use iroha_test_network::NetworkBuilder;
+use tokio::{task::spawn_blocking, time::timeout};
-#[test]
-fn all_peers_submit_genesis() {
- multiple_genesis_peers(4, 4, 13_800);
+#[tokio::test]
+async fn all_peers_submit_genesis() -> eyre::Result<()> {
+ multiple_genesis_peers(4, 4).await
}
-#[test]
-fn multiple_genesis_4_peers_3_genesis() {
- multiple_genesis_peers(4, 3, 13_820);
+#[tokio::test]
+async fn multiple_genesis_4_peers_3_genesis() -> eyre::Result<()> {
+ multiple_genesis_peers(4, 3).await
}
-#[test]
-fn multiple_genesis_4_peers_2_genesis() {
- multiple_genesis_peers(4, 2, 13_840);
+#[tokio::test]
+async fn multiple_genesis_4_peers_2_genesis() -> eyre::Result<()> {
+ multiple_genesis_peers(4, 2).await
}
-fn multiple_genesis_peers(n_peers: u32, n_genesis_peers: u32, port: u16) {
- let (_rt, network, client) = NetworkBuilder::new(n_peers, Some(port))
- .with_genesis_peers(n_genesis_peers)
- .create_with_runtime();
- wait_for_genesis_committed(&network.clients(), 0);
+async fn multiple_genesis_peers(n_peers: usize, n_genesis_peers: usize) -> eyre::Result<()> {
+ let network = NetworkBuilder::new().with_peers(n_peers).build();
+ timeout(
+ network.peer_startup_timeout(),
+ network
+ .peers()
+ .iter()
+ .enumerate()
+ .map(|(i, peer)| {
+ let cfg = network.config();
+ let genesis = (i < n_genesis_peers).then_some(network.genesis());
+ async move {
+ peer.start(cfg, genesis).await;
+ peer.once_block(1).await;
+ }
+ })
+ .collect::<FuturesUnordered<_>>()
+ .collect::<Vec<_>>(),
+ )
+ .await?;
+ let client = network.client();
let domain_id: DomainId = "foo".parse().expect("Valid");
let create_domain = Register::domain(Domain::new(domain_id));
- client
- .submit_blocking(create_domain)
- .expect("Failed to register domain");
+ spawn_blocking(move || client.submit_blocking(create_domain))
+ .await?
+ .wrap_err("Failed to register domain")?;
+
+ Ok(())
}
diff --git a/crates/iroha/tests/integration/extra_functional/mod.rs b/crates/iroha/tests/integration/extra_functional/mod.rs
index 6e35d278cbd..df11a06313e 100644
--- a/crates/iroha/tests/integration/extra_functional/mod.rs
+++ b/crates/iroha/tests/integration/extra_functional/mod.rs
@@ -5,4 +5,3 @@ mod normal;
mod offline_peers;
mod restart_peer;
mod unregister_peer;
-mod unstable_network;
diff --git a/crates/iroha/tests/integration/extra_functional/multiple_blocks_created.rs b/crates/iroha/tests/integration/extra_functional/multiple_blocks_created.rs
index f66da0e4425..b5335e1af58 100644
--- a/crates/iroha/tests/integration/extra_functional/multiple_blocks_created.rs
+++ b/crates/iroha/tests/integration/extra_functional/multiple_blocks_created.rs
@@ -1,28 +1,40 @@
-use std::thread;
+use std::{num::NonZero, time::Duration};
use eyre::Result;
+use futures_util::StreamExt;
use iroha::{
- client::{self, Client},
- data_model::{parameter::BlockParameter, prelude::*},
+ client::{self},
+ data_model::prelude::*,
+};
+use iroha_data_model::{
+ events::pipeline::{BlockEventFilter, TransactionEventFilter},
+ parameter::BlockParameter,
};
-use iroha_config::parameters::actual::Root as Config;
use iroha_test_network::*;
use iroha_test_samples::gen_account_in;
-use nonzero_ext::nonzero;
+use rand::{prelude::IteratorRandom, thread_rng};
+use tokio::{
+ sync::{mpsc, watch},
+ task::{spawn_blocking, JoinSet},
+ time::{sleep, timeout},
+};
-const N_BLOCKS: usize = 510;
+/// Bombard random peers with random mints in multiple rounds, ensuring they all have
+/// a consistent total amount in the end.
+#[tokio::test]
+async fn multiple_blocks_created() -> Result<()> {
+ const N_ROUNDS: u64 = 50;
+ const N_MAX_TXS_PER_BLOCK: u64 = 10;
-#[ignore = "Takes a lot of time."]
-#[test]
-fn long_multiple_blocks_created() -> Result<()> {
// Given
- let (_rt, network, client) = Network::start_test_with_runtime(4, Some(10_965));
- wait_for_genesis_committed(&network.clients(), 0);
- let pipeline_time = Config::pipeline_time();
-
- client.submit_blocking(SetParameter::new(Parameter::Block(
- BlockParameter::MaxTransactions(nonzero!(1_u64)),
- )))?;
+ let network = NetworkBuilder::new()
+ .with_peers(4)
+ .with_genesis_instruction(SetParameter(Parameter::Block(
+ BlockParameter::MaxTransactions(NonZero::new(N_MAX_TXS_PER_BLOCK).expect("valid")),
+ )))
+ .with_pipeline_time(Duration::from_secs(1))
+ .start()
+ .await?;
let create_domain = Register::domain(Domain::new("domain".parse()?));
let (account_id, _account_keypair) = gen_account_in("domain");
@@ -31,41 +43,174 @@ fn long_multiple_blocks_created() -> Result<()> {
let create_asset =
Register::asset_definition(AssetDefinition::numeric(asset_definition_id.clone()));
- client.submit_all::<InstructionBox>([
- create_domain.into(),
- create_account.into(),
- create_asset.into(),
- ])?;
-
- thread::sleep(pipeline_time);
-
- let mut account_has_quantity = Numeric::ZERO;
- let quantity = numeric!(1);
- //When
- for _ in 0..N_BLOCKS {
- let mint_asset = Mint::asset_numeric(
- quantity,
- AssetId::new(asset_definition_id.clone(), account_id.clone()),
- );
- client.submit(mint_asset)?;
- account_has_quantity = account_has_quantity.checked_add(quantity).unwrap();
- thread::sleep(pipeline_time / 4);
+ {
+ let client = network.client();
+ spawn_blocking(move || {
+ client.clone().submit_all::<InstructionBox>([
+ create_domain.into(),
+ create_account.into(),
+ create_asset.into(),
+ ])
+ })
+ .await??;
+ }
+
+ network.ensure_blocks(2).await?;
+
+ let blocks = BlocksTracker::start(&network);
+
+ // When
+ let mut total: u128 = 0;
+ for _ in 1..=N_ROUNDS {
+ let txs = (1..=N_MAX_TXS_PER_BLOCK)
+ .choose(&mut thread_rng())
+ .expect("there is a room to choose from");
+ println!("submitting {txs} transactions to random peers");
+ for _ in 0..txs {
+ let value = (0..999_999)
+ .choose(&mut thread_rng())
+ .expect("there is quite a room to choose from");
+ total += value;
+
+ let client = network.client();
+ let tx = client.build_transaction(
+ [Mint::asset_numeric(
+ Numeric::new(value, 0),
+ AssetId::new(asset_definition_id.clone(), account_id.clone()),
+ )],
+ <_>::default(),
+ );
+ spawn_blocking(move || client.submit_transaction(&tx)).await??;
+ }
+
+ timeout(network.sync_timeout(), blocks.sync()).await?;
+ }
+
+ // ensuring all have the same total
+ sleep(Duration::from_secs(2)).await;
+ println!("all peers should have total={total}");
+ let expected_value = AssetValue::Numeric(Numeric::new(total, 0));
+ for peer in network.peers() {
+ let client = peer.client();
+ let expected_value = expected_value.clone();
+ let account_id = account_id.clone();
+ let definition = asset_definition_id.clone();
+ let assets = spawn_blocking(move || {
+ client
+ .query(client::asset::all())
+ .filter_with(|asset| {
+ asset.id.account.eq(account_id) & asset.id.definition_id.eq(definition)
+ })
+ .execute_all()
+ })
+ .await??;
+ assert_eq!(assets.len(), 1);
+ let asset = assets.into_iter().next().unwrap();
+ assert_eq!(*asset.value(), expected_value);
}
- thread::sleep(pipeline_time * 5);
-
- //Then
- let peer = network.peers().last().unwrap();
- Client::test(&peer.api_address).poll(|client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id))
- .execute_all()?;
-
- Ok(assets.iter().any(|asset| {
- *asset.id().definition() == asset_definition_id
- && *asset.value() == AssetValue::Numeric(account_has_quantity)
- }))
- })?;
Ok(())
}
+
+// TODO: consider making a part of `iroha_test_network`
+struct BlocksTracker {
+ sync_tx: watch::Sender<bool>,
+ _children: JoinSet<()>,
+}
+
+impl BlocksTracker {
+ fn start(network: &Network) -> Self {
+ enum PeerEvent {
+ Block(u64),
+ Transaction,
+ }
+
+ let mut children = JoinSet::new();
+
+ let (block_tx, mut block_rx) = mpsc::channel::<(PeerEvent, usize)>(10);
+ for (i, peer) in network.peers().iter().cloned().enumerate() {
+ let tx = block_tx.clone();
+ children.spawn(async move {
+ let mut events = peer
+ .client()
+ .listen_for_events_async([
+ EventFilterBox::from(BlockEventFilter::default()),
+ TransactionEventFilter::default().into(),
+ ])
+ .await
+ .expect("peer should be up");
+ while let Some(Ok(event)) = events.next().await {
+ match event {
+ EventBox::Pipeline(PipelineEventBox::Block(x))
+ if matches!(*x.status(), BlockStatus::Applied) =>
+ {
+ let _ = tx
+ .send((PeerEvent::Block(x.header().height().get()), i))
+ .await;
+ }
+ EventBox::Pipeline(PipelineEventBox::Transaction(x))
+ if matches!(*x.status(), TransactionStatus::Queued) =>
+ {
+ let _ = tx.send((PeerEvent::Transaction, i)).await;
+ }
+ _ => {}
+ }
+ }
+ });
+ }
+
+ let peers_count = network.peers().len();
+ let (sync_tx, _sync_rx) = watch::channel(false);
+ let sync_clone = sync_tx.clone();
+ children.spawn(async move {
+ #[derive(Copy, Clone)]
+ struct PeerState {
+ height: u64,
+ mutated: bool,
+ }
+
+ let mut blocks = vec![
+ PeerState {
+ height: 0,
+ mutated: false
+ };
+ peers_count
+ ];
+ loop {
+ tokio::select! {
+ Some((event, i)) = block_rx.recv() => {
+ let state = blocks.get_mut(i).unwrap();
+ match event {
+ PeerEvent::Block(height) => {
+ state.height = height;
+ state.mutated = false;
+ }
+ PeerEvent::Transaction => {
+ state.mutated = true;
+ }
+ }
+
+ let max_height = blocks.iter().map(|x| x.height).max().expect("there is at least 1");
+ let is_sync = blocks.iter().all(|x| x.height == max_height && !x.mutated);
+ sync_tx.send_modify(|flag| *flag = is_sync);
+ }
+ }
+ }
+ });
+
+ Self {
+ sync_tx: sync_clone,
+ _children: children,
+ }
+ }
+
+ async fn sync(&self) {
+ let mut recv = self.sync_tx.subscribe();
+ loop {
+ if *recv.borrow_and_update() {
+ return;
+ }
+ recv.changed().await.unwrap()
+ }
+ }
+}
diff --git a/crates/iroha/tests/integration/extra_functional/normal.rs b/crates/iroha/tests/integration/extra_functional/normal.rs
index 4185cd2c6fd..09daf1f2d4d 100644
--- a/crates/iroha/tests/integration/extra_functional/normal.rs
+++ b/crates/iroha/tests/integration/extra_functional/normal.rs
@@ -1,3 +1,4 @@
+use eyre::Result;
use iroha::{
client,
data_model::{asset::AssetDefinitionId, parameter::BlockParameter, prelude::*},
@@ -6,48 +7,45 @@ use iroha_test_network::*;
use nonzero_ext::nonzero;
#[test]
-fn tranasctions_should_be_applied() {
- let (_rt, network, iroha) = NetworkBuilder::new(4, Some(11_300)).create_with_runtime();
- wait_for_genesis_committed(&network.clients(), 0);
- iroha
- .submit_blocking(SetParameter::new(Parameter::Block(
- BlockParameter::MaxTransactions(nonzero!(1_u64)),
- )))
- .unwrap();
-
- let domain_id = "and".parse::<DomainId>().unwrap();
+fn transactions_should_be_applied() -> Result<()> {
+ let (network, _rt) = NetworkBuilder::new().with_peers(4).start_blocking()?;
+ let iroha = network.client();
+ iroha.submit_blocking(SetParameter::new(Parameter::Block(
+ BlockParameter::MaxTransactions(nonzero!(1_u64)),
+ )))?;
+
+ let domain_id = "and".parse::<DomainId>()?;
let account_id = "ed01201F803CB23B1AAFB958368DF2F67CB78A2D1DFB47FFFC3133718F165F54DFF677@and"
- .parse::<AccountId>()
- .unwrap();
- let asset_definition_id = "MAY#and".parse::<AssetDefinitionId>().unwrap();
+ .parse::<AccountId>()?;
+ let asset_definition_id = "MAY#and".parse::<AssetDefinitionId>()?;
let asset_id =
"MAY##ed01201F803CB23B1AAFB958368DF2F67CB78A2D1DFB47FFFC3133718F165F54DFF677@and"
- .parse()
- .unwrap();
+ .parse()?;
let create_domain = Register::domain(Domain::new(domain_id));
- iroha.submit_blocking(create_domain).unwrap();
+ iroha.submit_blocking(create_domain)?;
let create_asset =
Register::asset_definition(AssetDefinition::numeric(asset_definition_id.clone()));
- iroha.submit_blocking(create_asset).unwrap();
+ iroha.submit_blocking(create_asset)?;
let create_account = Register::account(Account::new(account_id.clone()));
- iroha.submit_blocking(create_account).unwrap();
+ iroha.submit_blocking(create_account)?;
let mint_asset = Mint::asset_numeric(
numeric!(57_787_013_353_273_097_936_105_299_296),
AssetId::new(asset_definition_id.clone(), account_id.clone()),
);
- iroha.submit_blocking(mint_asset).unwrap();
+ iroha.submit_blocking(mint_asset)?;
let mint_asset =
Mint::asset_numeric(numeric!(1), AssetId::new(asset_definition_id, account_id));
- iroha.submit_blocking(mint_asset).unwrap();
+ iroha.submit_blocking(mint_asset)?;
iroha
.query(client::asset::all())
.filter_with(|asset| asset.id.eq(asset_id))
- .execute_single()
- .unwrap();
+ .execute_single()?;
+
+ Ok(())
}
diff --git a/crates/iroha/tests/integration/extra_functional/offline_peers.rs b/crates/iroha/tests/integration/extra_functional/offline_peers.rs
index cecd19ee96d..33344eb66d6 100644
--- a/crates/iroha/tests/integration/extra_functional/offline_peers.rs
+++ b/crates/iroha/tests/integration/extra_functional/offline_peers.rs
@@ -1,53 +1,71 @@
-use eyre::Result;
+use eyre::{OptionExt, Result};
+use futures_util::stream::{FuturesUnordered, StreamExt};
use iroha::{
- client::{self, Client},
+ client::{self},
crypto::KeyPair,
data_model::{
peer::{Peer as DataModelPeer, PeerId},
prelude::*,
},
};
-use iroha_config::parameters::actual::Root as Config;
use iroha_primitives::addr::socket_addr;
use iroha_test_network::*;
use iroha_test_samples::ALICE_ID;
+use tokio::task::spawn_blocking;
-#[test]
-fn genesis_block_is_committed_with_some_offline_peers() -> Result<()> {
+#[tokio::test]
+async fn genesis_block_is_committed_with_some_offline_peers() -> Result<()> {
// Given
- let (_rt, network, client) = NetworkBuilder::new(4, Some(10_560))
- .with_offline_peers(1)
- .create_with_runtime();
- wait_for_genesis_committed(&network.clients(), 1);
-
- //When
let alice_id = ALICE_ID.clone();
let roses = "rose#wonderland".parse()?;
let alice_has_roses = numeric!(13);
- //Then
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(alice_id))
- .execute_all()?;
- let asset = assets
+ // When
+ let network = NetworkBuilder::new().with_peers(4).build();
+ let cfg = network.config();
+ let genesis = network.genesis();
+ network
+ .peers()
+ .iter()
+ // only 2 out of 4
+ .take(2)
+ .enumerate()
+ .map(|(i, peer)| peer.start(cfg.clone(), (i == 0).then_some(genesis)))
+ .collect::<FuturesUnordered<_>>()
+ .collect::<Vec<_>>()
+ .await;
+ network.ensure_blocks(1).await?;
+
+ // Then
+ let client = network
+ .peers()
.iter()
- .find(|asset| *asset.id().definition() == roses)
- .unwrap();
- assert_eq!(AssetValue::Numeric(alice_has_roses), *asset.value());
+ .find(|x| x.is_running())
+ .expect("there are two running peers")
+ .client();
+ spawn_blocking(move || -> Result<()> {
+ let assets = client
+ .query(client::asset::all())
+ .filter_with(|asset| asset.id.account.eq(alice_id))
+ .execute_all()?;
+ let asset = assets
+ .iter()
+ .find(|asset| *asset.id().definition() == roses)
+ .ok_or_eyre("asset should be found")?;
+ assert_eq!(AssetValue::Numeric(alice_has_roses), *asset.value());
+ Ok(())
+ })
+ .await??;
+
Ok(())
}
-#[test]
-fn register_offline_peer() -> Result<()> {
- let n_peers = 4;
-
- let (_rt, network, client) = Network::start_test_with_runtime(n_peers, Some(11_160));
- wait_for_genesis_committed(&network.clients(), 0);
- let pipeline_time = Config::pipeline_time();
- let peer_clients = Network::clients(&network);
+#[tokio::test]
+async fn register_offline_peer() -> Result<()> {
+ const N_PEERS: usize = 4;
- check_status(&peer_clients, 1);
+ let network = NetworkBuilder::new().with_peers(N_PEERS).start().await?;
+ check_status(&network, N_PEERS as u64 - 1).await;
let address = socket_addr!(128.0.0.2:8085);
let key_pair = KeyPair::random();
@@ -56,22 +74,24 @@ fn register_offline_peer() -> Result<()> {
let register_peer = Register::peer(DataModelPeer::new(peer_id));
// Wait for some time to allow peers to connect
- client.submit_blocking(register_peer)?;
- std::thread::sleep(pipeline_time * 2);
+ let client = network.client();
+ spawn_blocking(move || client.submit_blocking(register_peer)).await??;
+ network.ensure_blocks(2).await?;
- // Make sure status hasn't change
- check_status(&peer_clients, 2);
+ // Make sure peers count hasn't changed
+ check_status(&network, N_PEERS as u64 - 1).await;
Ok(())
}
-fn check_status(peer_clients: &[Client], expected_blocks: u64) {
- let n_peers = peer_clients.len() as u64;
-
- for peer_client in peer_clients {
- let status = peer_client.get_status().unwrap();
+async fn check_status(network: &Network, expected_peers: u64) {
+ for peer in network.peers() {
+ let client = peer.client();
+ let status = spawn_blocking(move || client.get_status())
+ .await
+ .expect("no panic")
+ .expect("status should not fail");
- assert_eq!(status.peers, n_peers - 1);
- assert_eq!(status.blocks, expected_blocks);
+ assert_eq!(status.peers, expected_peers);
}
}
diff --git a/crates/iroha/tests/integration/extra_functional/restart_peer.rs b/crates/iroha/tests/integration/extra_functional/restart_peer.rs
index 4b51e7c2d8d..b6681c4b645 100644
--- a/crates/iroha/tests/integration/extra_functional/restart_peer.rs
+++ b/crates/iroha/tests/integration/extra_functional/restart_peer.rs
@@ -1,96 +1,68 @@
-use std::thread;
-
use eyre::Result;
use iroha::{
- client::{self, Client},
+ client::{self},
data_model::prelude::*,
};
-use iroha_config::parameters::actual::Root as Config;
use iroha_test_network::*;
use iroha_test_samples::ALICE_ID;
-use rand::{seq::SliceRandom, thread_rng, Rng};
-use tokio::runtime::Runtime;
+use tokio::{task::spawn_blocking, time::timeout};
-#[test]
-fn restarted_peer_should_have_the_same_asset_amount() -> Result<()> {
- let account_id = ALICE_ID.clone();
- let asset_definition_id = "xor#wonderland".parse::<AssetDefinitionId>().unwrap();
+#[tokio::test]
+async fn restarted_peer_should_restore_its_state() -> Result<()> {
+ let asset_definition_id = "xor#wonderland".parse::<AssetDefinitionId>()?;
let quantity = numeric!(200);
- let mut removed_peer = {
- let n_peers = 4;
-
- let (_rt, network, _) = Network::start_test_with_runtime(n_peers, Some(11_205));
- wait_for_genesis_committed(&network.clients(), 0);
- let pipeline_time = Config::pipeline_time();
- let peer_clients = Network::clients(&network);
+ let network = NetworkBuilder::new().with_peers(4).start().await?;
+ let peers = network.peers();
- let create_asset =
- Register::asset_definition(AssetDefinition::numeric(asset_definition_id.clone()));
- peer_clients
- .choose(&mut thread_rng())
- .unwrap()
- .submit_blocking(create_asset)?;
+ // create state on the first peer
+ let peer_a = &peers[0];
+ let client = peer_a.client();
+ let asset_definition_clone = asset_definition_id.clone();
+ spawn_blocking(move || {
+ client
+ .submit_all_blocking::<InstructionBox>([
+ Register::asset_definition(AssetDefinition::numeric(
+ asset_definition_clone.clone(),
+ ))
+ .into(),
+ Mint::asset_numeric(
+ quantity,
+ AssetId::new(asset_definition_clone, ALICE_ID.clone()),
+ )
+ .into(),
+ ])
+ .unwrap();
+ })
+ .await?;
+ network.ensure_blocks(2).await?;
- let mint_asset = Mint::asset_numeric(
- quantity,
- AssetId::new(asset_definition_id.clone(), account_id.clone()),
- );
- peer_clients
- .choose(&mut thread_rng())
- .unwrap()
- .submit_blocking(mint_asset)?;
+ // shutdown all
+ network.shutdown().await;
- // Wait for observing peer to get the block
- thread::sleep(pipeline_time);
+ // restart another one, **without a genesis** even
+ let peer_b = &peers[1];
+ let config = network.config();
+ assert_ne!(peer_a, peer_b);
+ timeout(network.peer_startup_timeout(), async move {
+ peer_b.start(config, None).await;
+ peer_b.once_block(2).await;
+ })
+ .await?;
- let assets = peer_clients
- .choose(&mut thread_rng())
- .unwrap()
+ // ensure it has the state
+ let client = peer_b.client();
+ let asset = spawn_blocking(move || {
+ client
.query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id.clone()))
- .execute_all()?;
- let asset = assets
- .into_iter()
- .find(|asset| *asset.id().definition() == asset_definition_id)
- .expect("Asset not found");
- assert_eq!(AssetValue::Numeric(quantity), *asset.value());
-
- let mut all_peers: Vec<_> = core::iter::once(network.first_peer)
- .chain(network.peers.into_values())
- .collect();
- let removed_peer_idx = rand::thread_rng().gen_range(0..all_peers.len());
- let mut removed_peer = all_peers.swap_remove(removed_peer_idx);
- removed_peer.terminate();
- removed_peer
- };
- // All peers have been stopped here
-
- // Restart just one peer and check if it updates itself from the blockstore
- {
- let rt = Runtime::test();
- rt.block_on(
- PeerBuilder::new()
- .with_dir(removed_peer.temp_dir.as_ref().unwrap().clone())
- .start_with_peer(&mut removed_peer),
- );
- let removed_peer_client = Client::test(&removed_peer.api_address);
- wait_for_genesis_committed(&vec![removed_peer_client.clone()], 0);
-
- removed_peer_client.poll(|client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id.clone()))
- .execute_all()?;
- iroha_logger::error!(?assets);
-
- let account_asset = assets
- .into_iter()
- .find(|asset| *asset.id().definition() == asset_definition_id)
- .expect("Asset not found");
+ .filter_with(|asset| asset.id.account.eq(ALICE_ID.clone()))
+ .execute_all()
+ })
+ .await??
+ .into_iter()
+ .find(|asset| *asset.id().definition() == asset_definition_id)
+ .expect("Asset not found");
+ assert_eq!(AssetValue::Numeric(quantity), *asset.value());
- Ok(AssetValue::Numeric(quantity) == *account_asset.value())
- })?
- }
Ok(())
}
diff --git a/crates/iroha/tests/integration/extra_functional/unregister_peer.rs b/crates/iroha/tests/integration/extra_functional/unregister_peer.rs
index d5e485c7d45..8593b49fa06 100644
--- a/crates/iroha/tests/integration/extra_functional/unregister_peer.rs
+++ b/crates/iroha/tests/integration/extra_functional/unregister_peer.rs
@@ -1,142 +1,126 @@
-use std::thread;
+use std::time::Duration;
+use assert_matches::assert_matches;
use eyre::Result;
use iroha::{
client,
+ client::Client,
data_model::{parameter::BlockParameter, prelude::*},
};
-use iroha_config::parameters::actual::Root as Config;
-use iroha_test_network::*;
+use iroha_test_network::{NetworkBuilder, NetworkPeer};
use iroha_test_samples::gen_account_in;
use nonzero_ext::nonzero;
+use tokio::{task::spawn_blocking, time::sleep};
+
+#[tokio::test]
+async fn network_stable_after_add_and_after_remove_peer() -> Result<()> {
+ const PIPELINE_TIME: Duration = Duration::from_millis(300);
-// Note the test is marked as `unstable`, not the network.
-#[ignore = "ignore, more in #2851"]
-#[test]
-fn unstable_network_stable_after_add_and_after_remove_peer() -> Result<()> {
// Given a network
- let (rt, network, genesis_client, pipeline_time, account_id, asset_definition_id) = init()?;
- wait_for_genesis_committed(&network.clients(), 0);
+ let mut network = NetworkBuilder::new()
+ .with_pipeline_time(PIPELINE_TIME)
+ .with_peers(4)
+ .with_genesis_instruction(SetParameter::new(Parameter::Block(
+ BlockParameter::MaxTransactions(nonzero!(1_u64)),
+ )))
+ .start()
+ .await?;
+ let client = network.client();
+
+ let (account, _account_keypair) = gen_account_in("domain");
+ let asset_def: AssetDefinitionId = "xor#domain".parse()?;
+ {
+ let client = client.clone();
+ let account = account.clone();
+ let asset_def = asset_def.clone();
+ spawn_blocking(move || {
+ client.submit_all_blocking::<InstructionBox>([
+ Register::domain(Domain::new("domain".parse()?)).into(),
+ Register::account(Account::new(account)).into(),
+ Register::asset_definition(AssetDefinition::numeric(asset_def)).into(),
+ ])
+ })
+ .await??; // blocks=2
+ }
// When assets are minted
- mint(
- &asset_definition_id,
- &account_id,
- &genesis_client,
- pipeline_time,
- numeric!(100),
- )?;
+ mint(&client, &asset_def, &account, numeric!(100)).await?;
+ network.ensure_blocks(3).await?;
// and a new peer is registered
- let (peer, peer_client) = rt.block_on(network.add_peer());
+ let new_peer = NetworkPeer::generate();
+ let new_peer_id = new_peer.id();
+ let new_peer_client = new_peer.client();
+ network.add_peer(&new_peer);
+ new_peer.start(network.config(), None).await;
+ {
+ let client = client.clone();
+ let id = new_peer_id.clone();
+ spawn_blocking(move || client.submit_blocking(Register::peer(Peer::new(id)))).await??;
+ }
+ network.ensure_blocks(4).await?;
// Then the new peer should already have the mint result.
- check_assets(
- &peer_client,
- &account_id,
- &asset_definition_id,
- numeric!(100),
+ assert_eq!(
+ find_asset(&new_peer_client, &account, &asset_def).await?,
+ numeric!(100)
);
- // Also, when a peer is unregistered
- let remove_peer = Unregister::peer(peer.id.clone());
- genesis_client.submit(remove_peer)?;
- thread::sleep(pipeline_time * 2);
- // We can mint without error.
- mint(
- &asset_definition_id,
- &account_id,
- &genesis_client,
- pipeline_time,
- numeric!(200),
- )?;
+
+ // When a peer is unregistered
+ {
+ let client = client.clone();
+ spawn_blocking(move || client.submit_blocking(Unregister::peer(new_peer_id))).await??;
+ // blocks=6
+ }
+ network.remove_peer(&new_peer);
+ // We can mint without an error.
+ mint(&client, &asset_def, &account, numeric!(200)).await?;
// Assets are increased on the main network.
- check_assets(
- &genesis_client,
- &account_id,
- &asset_definition_id,
- numeric!(300),
+ network.ensure_blocks(6).await?;
+ assert_eq!(
+ find_asset(&client, &account, &asset_def).await?,
+ numeric!(300)
);
// But not on the unregistered peer's network.
- check_assets(
- &peer_client,
- &account_id,
- &asset_definition_id,
- numeric!(100),
+ sleep(PIPELINE_TIME * 5).await;
+ assert_eq!(
+ find_asset(&new_peer_client, &account, &asset_def).await?,
+ numeric!(100)
);
+
Ok(())
}
-fn check_assets(
- iroha: &client::Client,
- account_id: &AccountId,
- asset_definition_id: &AssetDefinitionId,
- quantity: Numeric,
-) {
- iroha
- .poll_with_period(Config::block_sync_gossip_time(), 15, |client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id.clone()))
- .execute_all()?;
+async fn find_asset(
+ client: &Client,
+ account: &AccountId,
+ asset_definition: &AssetDefinitionId,
+) -> Result<Numeric> {
+ let account_id = account.clone();
+ let client = client.clone();
+ let asset = spawn_blocking(move || {
+ client
+ .query(client::asset::all())
+ .filter_with(|asset| asset.id.account.eq(account_id.clone()))
+ .execute_all()
+ })
+ .await??
+ .into_iter()
+ .find(|asset| asset.id().definition() == asset_definition)
+ .expect("asset should be there");
- Ok(assets.iter().any(|asset| {
- asset.id().definition() == asset_definition_id
- && *asset.value() == AssetValue::Numeric(quantity)
- }))
- })
- .expect("Test case failure");
+ assert_matches!(asset.value(), AssetValue::Numeric(quantity) => Ok(*quantity))
}
-fn mint(
+async fn mint(
+ client: &Client,
asset_definition_id: &AssetDefinitionId,
account_id: &AccountId,
- client: &client::Client,
- pipeline_time: std::time::Duration,
quantity: Numeric,
-) -> Result<Numeric, color_eyre::Report> {
+) -> Result<()> {
let mint_asset = Mint::asset_numeric(
quantity,
AssetId::new(asset_definition_id.clone(), account_id.clone()),
);
- client.submit(mint_asset)?;
- thread::sleep(pipeline_time * 5);
- iroha_logger::info!("Mint");
- Ok(quantity)
-}
-
-fn init() -> Result<(
- tokio::runtime::Runtime,
- iroha_test_network::Network,
- iroha::client::Client,
- std::time::Duration,
- AccountId,
- AssetDefinitionId,
-)> {
- let (rt, network, client) = Network::start_test_with_runtime(4, Some(10_925));
- let pipeline_time = Config::pipeline_time();
- iroha_logger::info!("Started");
-
- let set_max_txns_in_block = SetParameter::new(Parameter::Block(
- BlockParameter::MaxTransactions(nonzero!(1_u64)),
- ));
-
- let create_domain = Register::domain(Domain::new("domain".parse()?));
- let (account_id, _account_keypair) = gen_account_in("domain");
- let create_account = Register::account(Account::new(account_id.clone()));
- let asset_definition_id: AssetDefinitionId = "xor#domain".parse()?;
- let create_asset =
- Register::asset_definition(AssetDefinition::numeric(asset_definition_id.clone()));
- client.submit_all_blocking::<InstructionBox>([
- set_max_txns_in_block.into(),
- create_domain.into(),
- create_account.into(),
- create_asset.into(),
- ])?;
- iroha_logger::info!("Init");
- Ok((
- rt,
- network,
- client,
- pipeline_time,
- account_id,
- asset_definition_id,
- ))
+ let client = client.clone();
+ spawn_blocking(move || client.submit_blocking(mint_asset)).await??;
+ Ok(())
}
diff --git a/crates/iroha/tests/integration/extra_functional/unstable_network.rs b/crates/iroha/tests/integration/extra_functional/unstable_network.rs
deleted file mode 100644
index 31dc816084a..00000000000
--- a/crates/iroha/tests/integration/extra_functional/unstable_network.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-use std::thread;
-
-use iroha::{
- client,
- data_model::{
- parameter::{BlockParameter, Parameter},
- prelude::*,
- },
-};
-use iroha_config::parameters::actual::Root as Config;
-use iroha_test_network::*;
-use iroha_test_samples::ALICE_ID;
-use nonzero_ext::nonzero;
-use rand::seq::SliceRandom;
-
-#[test]
-fn unstable_network_5_peers_1_fault() {
- let n_peers = 4;
- let n_transactions = 20;
- unstable_network(n_peers, 1, n_transactions, false, 10_805);
-}
-
-#[test]
-fn soft_fork() {
- let n_peers = 4;
- let n_transactions = 20;
- unstable_network(n_peers, 0, n_transactions, true, 10_830);
-}
-
-#[test]
-fn unstable_network_8_peers_1_fault() {
- let n_peers = 7;
- let n_transactions = 20;
- unstable_network(n_peers, 1, n_transactions, false, 10_850);
-}
-
-#[test]
-#[ignore = "This test does not guarantee to have positive outcome given a fixed time."]
-fn unstable_network_9_peers_2_faults() {
- unstable_network(7, 2, 5, false, 10_890);
-}
-
-fn unstable_network(
- n_peers: u32,
- n_offline_peers: u32,
- n_transactions: usize,
- force_soft_fork: bool,
- port: u16,
-) {
- if let Err(error) = iroha_logger::install_panic_hook() {
- eprintln!("Installing panic hook failed: {error}");
- }
-
- // Given
- let mut configuration = Config::test();
- #[cfg(debug_assertions)]
- {
- configuration.sumeragi.debug_force_soft_fork = force_soft_fork;
- }
- let (_rt, network, iroha) = NetworkBuilder::new(n_peers + n_offline_peers, Some(port))
- .with_config(configuration)
- // Note: it is strange that we have `n_offline_peers` but don't set it as offline
- .with_offline_peers(0)
- .create_with_runtime();
- wait_for_genesis_committed(&network.clients(), n_offline_peers);
- iroha
- .submit_blocking(SetParameter::new(Parameter::Block(
- BlockParameter::MaxTransactions(nonzero!(5_u64)),
- )))
- .unwrap();
-
- let pipeline_time = Config::pipeline_time();
-
- let account_id = ALICE_ID.clone();
- let asset_definition_id: AssetDefinitionId = "camomile#wonderland".parse().expect("Valid");
- let register_asset =
- Register::asset_definition(AssetDefinition::numeric(asset_definition_id.clone()));
- iroha
- .submit_blocking(register_asset)
- .expect("Failed to register asset");
- // Initially there are 0 camomile
- let mut account_has_quantity = Numeric::ZERO;
-
- let mut rng = rand::thread_rng();
- let freezers = network.get_freeze_status_handles();
-
- //When
- for _i in 0..n_transactions {
- // Make random peers faulty.
- for f in freezers.choose_multiple(&mut rng, n_offline_peers as usize) {
- f.freeze();
- }
-
- let quantity = Numeric::ONE;
- let mint_asset = Mint::asset_numeric(
- quantity,
- AssetId::new(asset_definition_id.clone(), account_id.clone()),
- );
- iroha.submit(mint_asset).expect("Failed to create asset.");
- account_has_quantity = account_has_quantity.checked_add(quantity).unwrap();
- thread::sleep(pipeline_time);
-
- iroha
- .poll_with_period(Config::pipeline_time(), 4, |client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id.clone()))
- .execute_all()?;
-
- Ok(assets.iter().any(|asset| {
- *asset.id().definition() == asset_definition_id
- && *asset.value() == AssetValue::Numeric(account_has_quantity)
- }))
- })
- .expect("Test case failure.");
-
- // Return all peers to normal function.
- for f in &freezers {
- f.unfreeze();
- }
- }
-}
diff --git a/crates/iroha/tests/integration/multisig.rs b/crates/iroha/tests/integration/multisig.rs
index 1a531107dc2..b2ea62a9dcb 100644
--- a/crates/iroha/tests/integration/multisig.rs
+++ b/crates/iroha/tests/integration/multisig.rs
@@ -19,19 +19,16 @@ use iroha_test_samples::{gen_account_in, load_sample_wasm, ALICE_ID};
use nonzero_ext::nonzero;
#[test]
-#[expect(clippy::too_many_lines)]
fn mutlisig() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_400).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
-
- test_client.submit_all_blocking([
- SetParameter::new(Parameter::SmartContract(SmartContractParameter::Fuel(
- nonzero!(100_000_000_u64),
- ))),
- SetParameter::new(Parameter::Executor(SmartContractParameter::Fuel(nonzero!(
- 100_000_000_u64
- )))),
- ])?;
+ let (network, _rt) = NetworkBuilder::new()
+ .with_genesis_instruction(SetParameter::new(Parameter::SmartContract(
+ SmartContractParameter::Fuel(nonzero!(100_000_000_u64)),
+ )))
+ .with_genesis_instruction(SetParameter::new(Parameter::Executor(
+ SmartContractParameter::Fuel(nonzero!(100_000_000_u64)),
+ )))
+ .start_blocking()?;
+ let test_client = network.client();
let account_id = ALICE_ID.clone();
let multisig_register_trigger_id = "multisig_register".parse::<TriggerId>()?;
diff --git a/crates/iroha/tests/integration/non_mintable.rs b/crates/iroha/tests/integration/non_mintable.rs
index cd9954eefca..15e446e118d 100644
--- a/crates/iroha/tests/integration/non_mintable.rs
+++ b/crates/iroha/tests/integration/non_mintable.rs
@@ -8,8 +8,8 @@ use iroha_test_samples::ALICE_ID;
#[test]
fn non_mintable_asset_can_be_minted_once_but_not_twice() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_625).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
// Given
let account_id = ALICE_ID.clone();
@@ -31,41 +31,28 @@ fn non_mintable_asset_can_be_minted_once_but_not_twice() -> Result<()> {
let tx = test_client.build_transaction(instructions, metadata);
// We can register and mint the non-mintable token
- test_client.submit_transaction(&tx)?;
- test_client.poll(|client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id.clone()))
- .execute_all()?;
- Ok(assets.iter().any(|asset| {
+ test_client.submit_transaction_blocking(&tx)?;
+ assert!(test_client
+ .query(client::asset::all())
+ .filter_with(|asset| asset.id.account.eq(account_id.clone()))
+ .execute_all()?
+ .iter()
+ .any(|asset| {
*asset.id().definition() == asset_definition_id
&& *asset.value() == AssetValue::Numeric(numeric!(200))
- }))
- })?;
+ }));
// We can submit the request to mint again.
- test_client.submit_all([mint])?;
-
// However, this will fail
- assert!(test_client
- .poll(|client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id.clone()))
- .execute_all()?;
- Ok(assets.iter().any(|asset| {
- *asset.id().definition() == asset_definition_id
- && *asset.value() == AssetValue::Numeric(numeric!(400))
- }))
- })
- .is_err());
+ assert!(test_client.submit_all_blocking([mint]).is_err());
+
Ok(())
}
#[test]
fn non_mintable_asset_cannot_be_minted_if_registered_with_non_zero_value() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_610).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
// Given
let account_id = ALICE_ID.clone();
@@ -80,18 +67,19 @@ fn non_mintable_asset_cannot_be_minted_if_registered_with_non_zero_value() -> Re
let register_asset = Register::asset(Asset::new(asset_id.clone(), 1_u32));
// We can register the non-mintable token
- test_client
- .submit_all::<InstructionBox>([create_asset.into(), register_asset.clone().into()])?;
- test_client.poll(|client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id.clone()))
- .execute_all()?;
- Ok(assets.iter().any(|asset| {
+ test_client.submit_all_blocking::<InstructionBox>([
+ create_asset.into(),
+ register_asset.clone().into(),
+ ])?;
+ assert!(test_client
+ .query(client::asset::all())
+ .filter_with(|asset| asset.id.account.eq(account_id.clone()))
+ .execute_all()?
+ .iter()
+ .any(|asset| {
*asset.id().definition() == asset_definition_id
&& *asset.value() == AssetValue::Numeric(numeric!(1))
- }))
- })?;
+ }));
// But only once
assert!(test_client.submit_blocking(register_asset).is_err());
@@ -105,8 +93,8 @@ fn non_mintable_asset_cannot_be_minted_if_registered_with_non_zero_value() -> Re
#[test]
fn non_mintable_asset_can_be_minted_if_registered_with_zero_value() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_630).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
// Given
let account_id = ALICE_ID.clone();
@@ -122,21 +110,20 @@ fn non_mintable_asset_can_be_minted_if_registered_with_zero_value() -> Result<()
let mint = Mint::asset_numeric(1u32, asset_id);
// We can register the non-mintable token wih zero value and then mint it
- test_client.submit_all::<InstructionBox>([
+ test_client.submit_all_blocking::<InstructionBox>([
create_asset.into(),
register_asset.into(),
mint.into(),
])?;
- test_client.poll(|client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(account_id.clone()))
- .execute_all()?;
-
- Ok(assets.iter().any(|asset| {
+ assert!(test_client
+ .query(client::asset::all())
+ .filter_with(|asset| asset.id.account.eq(account_id.clone()))
+ .execute_all()?
+ .iter()
+ .any(|asset| {
*asset.id().definition() == asset_definition_id
&& *asset.value() == AssetValue::Numeric(numeric!(1))
- }))
- })?;
+ }));
+
Ok(())
}
diff --git a/crates/iroha/tests/integration/pagination.rs b/crates/iroha/tests/integration/pagination.rs
index 1c0e81ae97e..72eb240afd8 100644
--- a/crates/iroha/tests/integration/pagination.rs
+++ b/crates/iroha/tests/integration/pagination.rs
@@ -8,8 +8,8 @@ use nonzero_ext::nonzero;
#[test]
fn limits_should_work() -> Result<()> {
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(10_690).start_with_runtime();
- wait_for_genesis_committed(&vec![client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let client = network.client();
register_assets(&client)?;
@@ -26,8 +26,8 @@ fn limits_should_work() -> Result<()> {
#[test]
fn reported_length_should_be_accurate() -> Result<()> {
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(11_200).start_with_runtime();
- wait_for_genesis_committed(&vec![client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let client = network.client();
register_assets(&client)?;
@@ -60,8 +60,8 @@ fn fetch_size_should_work() -> Result<()> {
QueryWithFilter, QueryWithParams,
};
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(11_120).start_with_runtime();
- wait_for_genesis_committed(&vec![client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let client = network.client();
register_assets(&client)?;
diff --git a/crates/iroha/tests/integration/permissions.rs b/crates/iroha/tests/integration/permissions.rs
index a9ec6759f99..85b3b0568db 100644
--- a/crates/iroha/tests/integration/permissions.rs
+++ b/crates/iroha/tests/integration/permissions.rs
@@ -1,4 +1,4 @@
-use std::{thread, time::Duration};
+use std::time::Duration;
use eyre::Result;
use iroha::{
@@ -13,51 +13,39 @@ use iroha_executor_data_model::permission::{
asset::{CanModifyAssetMetadata, CanTransferAsset},
domain::CanModifyDomainMetadata,
};
-use iroha_genesis::GenesisBlock;
-use iroha_test_network::{PeerBuilder, *};
+use iroha_test_network::*;
use iroha_test_samples::{gen_account_in, ALICE_ID, BOB_ID};
+use tokio::{join, time::timeout};
-#[test]
-fn genesis_transactions_are_validated_by_executor() {
+// FIXME
+#[tokio::test]
+#[ignore]
+async fn genesis_transactions_are_validated_by_executor() {
// `wonderland` domain is owned by Alice,
- // so default executor will deny genesis account to register asset definition.
+ // so the default executor will deny a genesis account to register asset definition.
let asset_definition_id = "xor#wonderland".parse().expect("Valid");
let invalid_instruction =
Register::asset_definition(AssetDefinition::numeric(asset_definition_id));
- let genesis = GenesisBlock::test_with_instructions([invalid_instruction], vec![]);
-
- let (_rt, _peer, test_client) = <PeerBuilder>::new()
- .with_genesis(genesis)
- .with_port(11_115)
- .start_with_runtime();
-
- check_no_blocks(&test_client);
-}
-
-fn check_no_blocks(test_client: &Client) {
- const POLL_PERIOD: Duration = Duration::from_millis(1000);
- const MAX_RETRIES: u32 = 3;
-
- // Checking that peer contains no blocks multiple times
- // See also `wait_for_genesis_committed()`
- for _ in 0..MAX_RETRIES {
- match test_client.get_status() {
- Ok(status) => {
- assert!(status.blocks == 0);
- thread::sleep(POLL_PERIOD);
- }
- Err(error) => {
- // Connection failed meaning that Iroha panicked on invalid genesis.
- // Not a very good way to check it, but it's the best we can do in the current situation.
-
- iroha_logger::info!(
- ?error,
- "Failed to get status, Iroha probably panicked on invalid genesis, test passed"
- );
- break;
- }
- }
- }
+ let network = NetworkBuilder::new()
+ .with_genesis_instruction(invalid_instruction)
+ .build();
+ let peer = network.peer();
+
+ timeout(Duration::from_secs(3), async {
+ join!(
+ // Peer should start...
+ peer.start(network.config(), Some(network.genesis())),
+ peer.once(|event| matches!(event, PeerLifecycleEvent::ServerStarted)),
+ // ...but it should shortly exit with an error
+ peer.once(|event| match event {
+ // TODO: handle "Invalid genesis" more granular
+ PeerLifecycleEvent::Terminated { status } => !status.success(),
+ _ => false,
+ })
+ )
+ })
+ .await
+ .expect("peer should panic within timeout");
}
fn get_assets(iroha: &Client, id: &AccountId) -> Vec<Asset> {
@@ -73,8 +61,8 @@ fn get_assets(iroha: &Client, id: &AccountId) -> Vec<Asset> {
fn permissions_disallow_asset_transfer() {
let chain_id = ChainId::from("00000000-0000-0000-0000-000000000000");
- let (_rt, _peer, iroha) = <PeerBuilder>::new().with_port(10_725).start_with_runtime();
- wait_for_genesis_committed(&[iroha.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let iroha = network.client();
// Given
let alice_id = ALICE_ID.clone();
@@ -128,7 +116,8 @@ fn permissions_disallow_asset_transfer() {
fn permissions_disallow_asset_burn() {
let chain_id = ChainId::from("00000000-0000-0000-0000-000000000000");
- let (_rt, _peer, iroha) = <PeerBuilder>::new().with_port(10_735).start_with_runtime();
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let iroha = network.client();
let alice_id = ALICE_ID.clone();
let bob_id = BOB_ID.clone();
@@ -179,8 +168,8 @@ fn permissions_disallow_asset_burn() {
#[test]
#[ignore = "ignore, more in #2851"]
fn account_can_query_only_its_own_domain() -> Result<()> {
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(10_740).start_with_runtime();
- wait_for_genesis_committed(&[client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let client = network.client();
// Given
let domain_id: DomainId = "wonderland".parse()?;
@@ -209,7 +198,8 @@ fn account_can_query_only_its_own_domain() -> Result<()> {
fn permissions_differ_not_only_by_names() {
let chain_id = ChainId::from("00000000-0000-0000-0000-000000000000");
- let (_rt, _not_drop, client) = <PeerBuilder>::new().with_port(10_745).start_with_runtime();
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let client = network.client();
let alice_id = ALICE_ID.clone();
let (mouse_id, mouse_keypair) = gen_account_in("outfit");
@@ -297,12 +287,12 @@ fn permissions_differ_not_only_by_names() {
}
#[test]
-#[allow(deprecated)]
+// #[allow(deprecated)]
fn stored_vs_granted_permission_payload() -> Result<()> {
let chain_id = ChainId::from("00000000-0000-0000-0000-000000000000");
- let (_rt, _peer, iroha) = <PeerBuilder>::new().with_port(10_730).start_with_runtime();
- wait_for_genesis_committed(&[iroha.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let iroha = network.client();
// Given
let alice_id = ALICE_ID.clone();
@@ -351,10 +341,10 @@ fn stored_vs_granted_permission_payload() -> Result<()> {
}
#[test]
-#[allow(deprecated)]
+// #[allow(deprecated)]
fn permissions_are_unified() {
- let (_rt, _peer, iroha) = <PeerBuilder>::new().with_port(11_230).start_with_runtime();
- wait_for_genesis_committed(&[iroha.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let iroha = network.client();
// Given
let alice_id = ALICE_ID.clone();
@@ -380,8 +370,8 @@ fn permissions_are_unified() {
#[test]
fn associated_permissions_removed_on_unregister() {
- let (_rt, _peer, iroha) = <PeerBuilder>::new().with_port(11_240).start_with_runtime();
- wait_for_genesis_committed(&[iroha.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let iroha = network.client();
let bob_id = BOB_ID.clone();
let kingdom_id: DomainId = "kingdom".parse().expect("Valid");
@@ -432,8 +422,8 @@ fn associated_permissions_removed_on_unregister() {
#[test]
fn associated_permissions_removed_from_role_on_unregister() {
- let (_rt, _peer, iroha) = <PeerBuilder>::new().with_port(11_255).start_with_runtime();
- wait_for_genesis_committed(&[iroha.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let iroha = network.client();
let role_id: RoleId = "role".parse().expect("Valid");
let kingdom_id: DomainId = "kingdom".parse().expect("Valid");
diff --git a/crates/iroha/tests/integration/queries/account.rs b/crates/iroha/tests/integration/queries/account.rs
index 83b63d17e05..cb9327ecc9d 100644
--- a/crates/iroha/tests/integration/queries/account.rs
+++ b/crates/iroha/tests/integration/queries/account.rs
@@ -7,8 +7,8 @@ use iroha_test_samples::{gen_account_in, ALICE_ID};
#[test]
fn find_accounts_with_asset() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_760).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let test_client = network.client();
// Registering new asset definition
let definition_id = "test_coin#wonderland"
diff --git a/crates/iroha/tests/integration/queries/asset.rs b/crates/iroha/tests/integration/queries/asset.rs
index b7f66833047..a249df880cb 100644
--- a/crates/iroha/tests/integration/queries/asset.rs
+++ b/crates/iroha/tests/integration/queries/asset.rs
@@ -11,8 +11,8 @@ use iroha_test_samples::{gen_account_in, ALICE_ID};
#[test]
#[allow(clippy::too_many_lines)]
fn find_asset_total_quantity() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_765).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let test_client = network.client();
// Register new domain
let domain_id: DomainId = "looking_glass".parse()?;
diff --git a/crates/iroha/tests/integration/queries/mod.rs b/crates/iroha/tests/integration/queries/mod.rs
index bf07f4d29c3..c73d0bb2e9b 100644
--- a/crates/iroha/tests/integration/queries/mod.rs
+++ b/crates/iroha/tests/integration/queries/mod.rs
@@ -14,9 +14,11 @@ mod role;
mod smart_contract;
#[test]
+// FIXME
+#[ignore = "started to fail after #5086?"]
fn too_big_fetch_size_is_not_allowed() {
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(11_130).start_with_runtime();
- wait_for_genesis_committed(&[client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let client = network.client();
let err = client
.query(client::asset::all())
diff --git a/crates/iroha/tests/integration/queries/query_errors.rs b/crates/iroha/tests/integration/queries/query_errors.rs
index 69d7586c9b1..a7af9fd2260 100644
--- a/crates/iroha/tests/integration/queries/query_errors.rs
+++ b/crates/iroha/tests/integration/queries/query_errors.rs
@@ -2,14 +2,13 @@ use iroha::{
client,
data_model::{prelude::QueryBuilderExt, query::builder::SingleQueryError},
};
+use iroha_test_network::NetworkBuilder;
use iroha_test_samples::gen_account_in;
#[test]
fn non_existent_account_is_specific_error() {
- let (_rt, _peer, client) = <iroha_test_network::PeerBuilder>::new()
- .with_port(10_670)
- .start_with_runtime();
- // we cannot wait for genesis committment
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let client = network.client();
let err = client
.query(client::account::all())
diff --git a/crates/iroha/tests/integration/queries/role.rs b/crates/iroha/tests/integration/queries/role.rs
index 6eecb164f77..dde318bbc5a 100644
--- a/crates/iroha/tests/integration/queries/role.rs
+++ b/crates/iroha/tests/integration/queries/role.rs
@@ -21,8 +21,8 @@ fn create_role_ids() -> [RoleId; 5] {
#[test]
fn find_roles() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_525).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let test_client = network.client();
let role_ids = create_role_ids();
@@ -53,8 +53,8 @@ fn find_roles() -> Result<()> {
#[test]
fn find_role_ids() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_530).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let test_client = network.client();
let role_ids = create_role_ids();
@@ -79,8 +79,8 @@ fn find_role_ids() -> Result<()> {
#[test]
fn find_role_by_id() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_535).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let test_client = network.client();
let role_id: RoleId = "root".parse().expect("Valid");
let new_role = Role::new(role_id.clone(), ALICE_ID.clone());
@@ -102,8 +102,8 @@ fn find_role_by_id() -> Result<()> {
#[test]
fn find_unregistered_role_by_id() {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_540).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let test_client = network.client();
let role_id: RoleId = "root".parse().expect("Valid");
@@ -122,8 +122,8 @@ fn find_unregistered_role_by_id() {
#[test]
fn find_roles_by_account_id() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_545).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let test_client = network.client();
let role_ids = create_role_ids();
let alice_id = ALICE_ID.clone();
diff --git a/crates/iroha/tests/integration/queries/smart_contract.rs b/crates/iroha/tests/integration/queries/smart_contract.rs
index f3435977f3a..80501605fb6 100644
--- a/crates/iroha/tests/integration/queries/smart_contract.rs
+++ b/crates/iroha/tests/integration/queries/smart_contract.rs
@@ -8,8 +8,8 @@ use iroha_test_samples::load_sample_wasm;
#[test]
fn live_query_is_dropped_after_smart_contract_end() -> Result<()> {
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(11_140).start_with_runtime();
- wait_for_genesis_committed(&[client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let client = network.client();
let transaction = client.build_transaction(
load_sample_wasm("query_assets_and_save_cursor"),
@@ -38,8 +38,8 @@ fn live_query_is_dropped_after_smart_contract_end() -> Result<()> {
#[test]
fn smart_contract_can_filter_queries() -> Result<()> {
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(11_260).start_with_runtime();
- wait_for_genesis_committed(&[client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let client = network.client();
let transaction = client.build_transaction(
load_sample_wasm("smart_contract_can_filter_queries"),
diff --git a/crates/iroha/tests/integration/roles.rs b/crates/iroha/tests/integration/roles.rs
index 7a7a6ddf763..9e5fb6119d5 100644
--- a/crates/iroha/tests/integration/roles.rs
+++ b/crates/iroha/tests/integration/roles.rs
@@ -11,8 +11,8 @@ use serde_json::json;
#[test]
fn register_empty_role() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_695).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let role_id = "root".parse().expect("Valid");
let register_role = Register::role(Role::new(role_id, ALICE_ID.clone()));
@@ -33,10 +33,8 @@ fn register_empty_role() -> Result<()> {
/// @s8sato added: This test represents #2081 case.
#[test]
fn register_and_grant_role_for_metadata_access() -> Result<()> {
- let chain_id = ChainId::from("00000000-0000-0000-0000-000000000000");
-
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_700).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let alice_id = ALICE_ID.clone();
let (mouse_id, mouse_keypair) = gen_account_in("wonderland");
@@ -56,7 +54,7 @@ fn register_and_grant_role_for_metadata_access() -> Result<()> {
// Mouse grants role to Alice
let grant_role = Grant::account_role(role_id.clone(), alice_id.clone());
- let grant_role_tx = TransactionBuilder::new(chain_id, mouse_id.clone())
+ let grant_role_tx = TransactionBuilder::new(network.chain_id(), mouse_id.clone())
.with_instructions([grant_role])
.sign(mouse_keypair.private_key());
test_client.submit_transaction_blocking(&grant_role_tx)?;
@@ -80,8 +78,8 @@ fn register_and_grant_role_for_metadata_access() -> Result<()> {
#[test]
fn unregistered_role_removed_from_account() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_705).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let role_id: RoleId = "root".parse().expect("Valid");
let alice_id = ALICE_ID.clone();
@@ -123,8 +121,8 @@ fn unregistered_role_removed_from_account() -> Result<()> {
#[test]
fn role_with_invalid_permissions_is_not_accepted() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_025).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let role_id = "ACCESS_TO_ACCOUNT_METADATA".parse()?;
let role = Role::new(role_id, ALICE_ID.clone()).add_permission(CanControlDomainLives);
@@ -150,8 +148,8 @@ fn role_with_invalid_permissions_is_not_accepted() -> Result<()> {
// so that they don't get deduplicated eagerly but rather in the executor
// This way, if the executor compares permissions just as JSON strings, the test will fail
fn role_permissions_are_deduplicated() {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_235).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let test_client = network.client();
let allow_alice_to_transfer_rose_1 = Permission::new(
"CanTransferAsset".parse().unwrap(),
@@ -189,10 +187,8 @@ fn role_permissions_are_deduplicated() {
#[test]
fn grant_revoke_role_permissions() -> Result<()> {
- let chain_id = ChainId::from("00000000-0000-0000-0000-000000000000");
-
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_245).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let alice_id = ALICE_ID.clone();
let (mouse_id, mouse_keypair) = gen_account_in("wonderland");
@@ -214,7 +210,7 @@ fn grant_revoke_role_permissions() -> Result<()> {
// Mouse grants role to Alice
let grant_role = Grant::account_role(role_id.clone(), alice_id.clone());
- let grant_role_tx = TransactionBuilder::new(chain_id.clone(), mouse_id.clone())
+ let grant_role_tx = TransactionBuilder::new(network.chain_id(), mouse_id.clone())
.with_instructions([grant_role])
.sign(mouse_keypair.private_key());
test_client.submit_transaction_blocking(&grant_role_tx)?;
@@ -246,7 +242,7 @@ fn grant_revoke_role_permissions() -> Result<()> {
.expect_err("shouldn't be able to modify metadata");
// Alice can modify Mouse's metadata after permission is granted to role
- let grant_role_permission_tx = TransactionBuilder::new(chain_id.clone(), mouse_id.clone())
+ let grant_role_permission_tx = TransactionBuilder::new(network.chain_id(), mouse_id.clone())
.with_instructions([grant_role_permission])
.sign(mouse_keypair.private_key());
test_client.submit_transaction_blocking(&grant_role_permission_tx)?;
@@ -258,7 +254,7 @@ fn grant_revoke_role_permissions() -> Result<()> {
test_client.submit_blocking(set_key_value.clone())?;
// Alice can't modify Mouse's metadata after permission is removed from role
- let revoke_role_permission_tx = TransactionBuilder::new(chain_id.clone(), mouse_id)
+ let revoke_role_permission_tx = TransactionBuilder::new(network.chain_id(), mouse_id)
.with_instructions([revoke_role_permission])
.sign(mouse_keypair.private_key());
test_client.submit_transaction_blocking(&revoke_role_permission_tx)?;
diff --git a/crates/iroha/tests/integration/set_parameter.rs b/crates/iroha/tests/integration/set_parameter.rs
index 78821fd9464..0a9f5b1e447 100644
--- a/crates/iroha/tests/integration/set_parameter.rs
+++ b/crates/iroha/tests/integration/set_parameter.rs
@@ -12,8 +12,10 @@ use iroha_test_network::*;
#[test]
fn can_change_parameter_value() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_135).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new()
+ .with_default_pipeline_time()
+ .start_blocking()?;
+ let test_client = network.client();
let old_params: Parameters = test_client.query_single(client::parameter::all())?;
assert_eq!(
diff --git a/crates/iroha/tests/integration/sorting.rs b/crates/iroha/tests/integration/sorting.rs
index 729ab76a77f..3bf941afcd5 100644
--- a/crates/iroha/tests/integration/sorting.rs
+++ b/crates/iroha/tests/integration/sorting.rs
@@ -33,8 +33,8 @@ fn correct_pagination_assets_after_creating_new_one() {
let sorting = Sorting::by_metadata_key(sort_by_metadata_key.clone());
let account_id = ALICE_ID.clone();
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_635).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let test_client = network.client();
let mut tester_assets = vec![];
let mut register_asset_definitions = vec![];
@@ -120,8 +120,8 @@ fn correct_pagination_assets_after_creating_new_one() {
#[test]
#[allow(clippy::too_many_lines)]
fn correct_sorting_of_entities() {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_640).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let test_client = network.client();
let sort_by_metadata_key = "test_sort".parse::<Name>().expect("Valid");
@@ -294,8 +294,8 @@ fn correct_sorting_of_entities() {
fn sort_only_elements_which_have_sorting_key() -> Result<()> {
const TEST_DOMAIN: &str = "neverland";
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_680).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let test_client = network.client();
let domain_id: DomainId = TEST_DOMAIN.parse().unwrap();
test_client
diff --git a/crates/iroha/tests/integration/status_response.rs b/crates/iroha/tests/integration/status_response.rs
index 17b6c9dd734..41e4982cff3 100644
--- a/crates/iroha/tests/integration/status_response.rs
+++ b/crates/iroha/tests/integration/status_response.rs
@@ -1,8 +1,8 @@
use eyre::Result;
-use iroha::{data_model::prelude::*, samples::get_status_json};
+use iroha::{client, data_model::prelude::*};
use iroha_telemetry::metrics::Status;
use iroha_test_network::*;
-use iroha_test_samples::gen_account_in;
+use tokio::task::spawn_blocking;
fn status_eq_excluding_uptime_and_queue(lhs: &Status, rhs: &Status) -> bool {
lhs.peers == rhs.peers
@@ -12,43 +12,43 @@ fn status_eq_excluding_uptime_and_queue(lhs: &Status, rhs: &Status) -> bool {
&& lhs.view_changes == rhs.view_changes
}
-#[test]
-fn json_and_scale_statuses_equality() -> Result<()> {
- let (_rt, network, client) = Network::start_test_with_runtime(2, Some(11_280));
- wait_for_genesis_committed(&network.clients(), 0);
+async fn check(client: &client::Client, blocks: u64) -> Result<()> {
+ let status_json = reqwest::get(client.torii_url.join("/status").unwrap())
+ .await?
+ .json()
+ .await?;
- let json_status_zero = get_status_json(&client).unwrap();
+ let status_scale = {
+ let client = client.clone();
+ spawn_blocking(move || client.get_status()).await??
+ };
- let scale_status_zero_decoded = client.get_status().unwrap();
+ assert!(status_eq_excluding_uptime_and_queue(
+ &status_json,
+ &status_scale
+ ));
+ assert_eq!(status_json.blocks, blocks);
- assert!(
- status_eq_excluding_uptime_and_queue(&json_status_zero, &scale_status_zero_decoded),
- "get_status() result is not equal to decoded get_status_scale_encoded()"
- );
+ Ok(())
+}
- let coins = ["xor", "btc", "eth", "doge"];
+#[tokio::test]
+async fn json_and_scale_statuses_equality() -> Result<()> {
+ let network = NetworkBuilder::new().start().await?;
+ let client = network.client();
- let (account_id, _account_keypair) = gen_account_in("domain");
+ check(&client, 1).await?;
- for coin in coins {
- let asset_definition_id = format!("{coin}#wonderland").parse::<AssetDefinitionId>()?;
- let create_asset =
- Register::asset_definition(AssetDefinition::numeric(asset_definition_id.clone()));
- let mint_asset = Mint::asset_numeric(
- 1234u32,
- AssetId::new(asset_definition_id, account_id.clone()),
- );
- client.submit_all::<InstructionBox>([create_asset.into(), mint_asset.into()])?;
+ {
+ let client = client.clone();
+ spawn_blocking(move || {
+ client.submit_blocking(Register::domain(Domain::new("looking_glass".parse()?)))
+ })
}
+ .await??;
+ network.ensure_blocks(2).await?;
- let json_status_coins = get_status_json(&client).unwrap();
-
- let scale_status_coins_decoded = client.get_status().unwrap();
-
- assert!(
- status_eq_excluding_uptime_and_queue(&json_status_coins, &scale_status_coins_decoded),
- "get_status() result is not equal to decoded get_status_scale_encoded()"
- );
+ check(&client, 2).await?;
Ok(())
}
diff --git a/crates/iroha/tests/integration/transfer_asset.rs b/crates/iroha/tests/integration/transfer_asset.rs
index 20ba04a331a..aed42d95995 100644
--- a/crates/iroha/tests/integration/transfer_asset.rs
+++ b/crates/iroha/tests/integration/transfer_asset.rs
@@ -21,14 +21,14 @@ fn simulate_transfer_numeric() {
AssetDefinition::numeric,
Mint::asset_numeric,
Transfer::asset_numeric,
- 10_710,
)
}
#[test]
fn simulate_transfer_store_asset() {
- let (_rt, _peer, iroha) = <PeerBuilder>::new().with_port(11_145).start_with_runtime();
- wait_for_genesis_committed(&[iroha.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let iroha = network.client();
+
let (alice_id, mouse_id) = generate_two_ids();
let create_mouse = create_mouse(mouse_id.clone());
let asset_definition_id: AssetDefinitionId = "camomile#wonderland".parse().unwrap();
@@ -55,19 +55,17 @@ fn simulate_transfer_store_asset() {
);
iroha
- .submit(transfer_asset)
+ .submit_blocking(transfer_asset)
.expect("Failed to transfer asset.");
- iroha
- .poll(|client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(mouse_id.clone()))
- .execute_all()?;
- Ok(assets.iter().any(|asset| {
- *asset.id().definition() == asset_definition_id && *asset.id().account() == mouse_id
- }))
- })
- .expect("Test case failure.");
+ assert!(iroha
+ .query(client::asset::all())
+ .filter_with(|asset| asset.id.account.eq(mouse_id.clone()))
+ .execute_all()
+ .unwrap()
+ .into_iter()
+ .any(|asset| {
+ *asset.id().definition() == asset_definition_id && *asset.id().account() == mouse_id
+ }));
}
fn simulate_transfer<T>(
@@ -76,16 +74,13 @@ fn simulate_transfer<T>(
asset_definition_ctr: impl FnOnce(AssetDefinitionId) -> <AssetDefinition as Registered>::With,
mint_ctr: impl FnOnce(T, AssetId) -> Mint<T, Asset>,
transfer_ctr: impl FnOnce(AssetId, T, AccountId) -> Transfer<Asset, T, Account>,
- port_number: u16,
) where
T: std::fmt::Debug + Clone + Into<AssetValue>,
Mint<T, Asset>: Instruction,
Transfer<Asset, T, Account>: Instruction,
{
- let (_rt, _peer, iroha) = <PeerBuilder>::new()
- .with_port(port_number)
- .start_with_runtime();
- wait_for_genesis_committed(&[iroha.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let iroha = network.client();
let (alice_id, mouse_id) = generate_two_ids();
let create_mouse = create_mouse(mouse_id.clone());
@@ -114,22 +109,19 @@ fn simulate_transfer<T>(
mouse_id.clone(),
);
iroha
- .submit(transfer_asset)
+ .submit_blocking(transfer_asset)
.expect("Failed to transfer asset.");
- iroha
- .poll(|client| {
- let assets = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.account.eq(mouse_id.clone()))
- .execute_all()?;
-
- Ok(assets.iter().any(|asset| {
- *asset.id().definition() == asset_definition_id
- && *asset.value() == amount_to_transfer.clone().into()
- && *asset.id().account() == mouse_id
- }))
- })
- .expect("Test case failure.");
+ assert!(iroha
+ .query(client::asset::all())
+ .filter_with(|asset| asset.id.account.eq(mouse_id.clone()))
+ .execute_all()
+ .unwrap()
+ .into_iter()
+ .any(|asset| {
+ *asset.id().definition() == asset_definition_id
+ && *asset.value() == amount_to_transfer.clone().into()
+ && *asset.id().account() == mouse_id
+ }));
}
fn generate_two_ids() -> (AccountId, AccountId) {
diff --git a/crates/iroha/tests/integration/transfer_domain.rs b/crates/iroha/tests/integration/transfer_domain.rs
index 8854b6a627b..5253fedfccc 100644
--- a/crates/iroha/tests/integration/transfer_domain.rs
+++ b/crates/iroha/tests/integration/transfer_domain.rs
@@ -1,7 +1,6 @@
use eyre::Result;
use iroha::{
client,
- client::Client,
crypto::KeyPair,
data_model::{prelude::*, transaction::error::TransactionRejectionReason},
};
@@ -12,18 +11,14 @@ use iroha_executor_data_model::permission::{
domain::CanUnregisterDomain,
trigger::CanUnregisterTrigger,
};
-use iroha_genesis::GenesisBlock;
use iroha_primitives::json::JsonString;
-use iroha_test_network::{Peer as TestPeer, *};
+use iroha_test_network::*;
use iroha_test_samples::{gen_account_in, ALICE_ID, BOB_ID, SAMPLE_GENESIS_ACCOUNT_ID};
-use tokio::runtime::Runtime;
#[test]
fn domain_owner_domain_permissions() -> Result<()> {
- let chain_id = ChainId::from("00000000-0000-0000-0000-000000000000");
-
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_080).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let kingdom_id: DomainId = "kingdom".parse()?;
let (bob_id, bob_keypair) = gen_account_in("kingdom");
@@ -38,7 +33,7 @@ fn domain_owner_domain_permissions() -> Result<()> {
test_client.submit_blocking(Register::account(bob))?;
// Asset definitions can't be registered by "bob@kingdom" by default
- let transaction = TransactionBuilder::new(chain_id.clone(), bob_id.clone())
+ let transaction = TransactionBuilder::new(network.chain_id(), bob_id.clone())
.with_instructions([Register::asset_definition(coin.clone())])
.sign(bob_keypair.private_key());
let err = test_client
@@ -66,7 +61,7 @@ fn domain_owner_domain_permissions() -> Result<()> {
permission.clone(),
bob_id.clone(),
))?;
- let transaction = TransactionBuilder::new(chain_id, bob_id.clone())
+ let transaction = TransactionBuilder::new(network.chain_id(), bob_id.clone())
.with_instructions([Register::asset_definition(coin)])
.sign(bob_keypair.private_key());
test_client.submit_transaction_blocking(&transaction)?;
@@ -96,8 +91,8 @@ fn domain_owner_domain_permissions() -> Result<()> {
#[test]
fn domain_owner_account_permissions() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_075).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let kingdom_id: DomainId = "kingdom".parse()?;
let (mad_hatter_id, _mad_hatter_keypair) = gen_account_in("kingdom");
@@ -138,10 +133,9 @@ fn domain_owner_account_permissions() -> Result<()> {
#[test]
fn domain_owner_asset_definition_permissions() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_085).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
- let chain_id = ChainId::from("00000000-0000-0000-0000-000000000000");
let kingdom_id: DomainId = "kingdom".parse()?;
let (bob_id, bob_keypair) = gen_account_in("kingdom");
let (rabbit_id, _rabbit_keypair) = gen_account_in("kingdom");
@@ -163,7 +157,7 @@ fn domain_owner_asset_definition_permissions() -> Result<()> {
// register asset definitions by "bob@kingdom" so he is owner of it
let coin = AssetDefinition::numeric(coin_id.clone());
- let transaction = TransactionBuilder::new(chain_id, bob_id.clone())
+ let transaction = TransactionBuilder::new(network.chain_id(), bob_id.clone())
.with_instructions([Register::asset_definition(coin)])
.sign(bob_keypair.private_key());
test_client.submit_transaction_blocking(&transaction)?;
@@ -203,10 +197,8 @@ fn domain_owner_asset_definition_permissions() -> Result<()> {
#[test]
fn domain_owner_asset_permissions() -> Result<()> {
- let chain_id = ChainId::from("00000000-0000-0000-0000-000000000000");
-
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_090).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let alice_id = ALICE_ID.clone();
let kingdom_id: DomainId = "kingdom".parse()?;
@@ -228,7 +220,7 @@ fn domain_owner_asset_permissions() -> Result<()> {
// register asset definitions by "bob@kingdom" so he is owner of it
let coin = AssetDefinition::numeric(coin_id.clone());
let store = AssetDefinition::store(store_id.clone());
- let transaction = TransactionBuilder::new(chain_id, bob_id.clone())
+ let transaction = TransactionBuilder::new(network.chain_id(), bob_id.clone())
.with_instructions([
Register::asset_definition(coin),
Register::asset_definition(store),
@@ -269,8 +261,8 @@ fn domain_owner_asset_permissions() -> Result<()> {
#[test]
fn domain_owner_trigger_permissions() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_095).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let alice_id = ALICE_ID.clone();
let kingdom_id: DomainId = "kingdom".parse()?;
@@ -325,8 +317,8 @@ fn domain_owner_trigger_permissions() -> Result<()> {
#[test]
fn domain_owner_transfer() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_100).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let alice_id = ALICE_ID.clone();
let kingdom_id: DomainId = "kingdom".parse()?;
@@ -365,31 +357,29 @@ fn domain_owner_transfer() -> Result<()> {
#[test]
fn not_allowed_to_transfer_other_user_domain() -> Result<()> {
- let mut peer = TestPeer::new().expect("Failed to create peer");
- let topology = vec![peer.id.clone()];
-
let users_domain: DomainId = "users".parse()?;
let foo_domain: DomainId = "foo".parse()?;
-
let user1 = AccountId::new(users_domain.clone(), KeyPair::random().into_parts().0);
let user2 = AccountId::new(users_domain.clone(), KeyPair::random().into_parts().0);
let genesis_account = SAMPLE_GENESIS_ACCOUNT_ID.clone();
- let instructions: [InstructionBox; 6] = [
- Register::domain(Domain::new(users_domain.clone())).into(),
- Register::account(Account::new(user1.clone())).into(),
- Register::account(Account::new(user2.clone())).into(),
- Register::domain(Domain::new(foo_domain.clone())).into(),
- Transfer::domain(genesis_account.clone(), foo_domain.clone(), user1.clone()).into(),
- Transfer::domain(genesis_account.clone(), users_domain.clone(), user1.clone()).into(),
- ];
- let genesis = GenesisBlock::test_with_instructions(instructions, topology);
-
- let rt = Runtime::test();
- let builder = PeerBuilder::new().with_genesis(genesis).with_port(11_110);
- rt.block_on(builder.start_with_peer(&mut peer));
- let client = Client::test(&peer.api_address);
- wait_for_genesis_committed(&[client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new()
+ .with_genesis_instruction(Register::domain(Domain::new(users_domain.clone())))
+ .with_genesis_instruction(Register::account(Account::new(user1.clone())))
+ .with_genesis_instruction(Register::account(Account::new(user2.clone())))
+ .with_genesis_instruction(Register::domain(Domain::new(foo_domain.clone())))
+ .with_genesis_instruction(Transfer::domain(
+ genesis_account.clone(),
+ foo_domain.clone(),
+ user1.clone(),
+ ))
+ .with_genesis_instruction(Transfer::domain(
+ genesis_account.clone(),
+ users_domain.clone(),
+ user1.clone(),
+ ))
+ .start_blocking()?;
+ let client = network.client();
let domain = client
.query(client::domain::all())
diff --git a/crates/iroha/tests/integration/triggers/by_call_trigger.rs b/crates/iroha/tests/integration/triggers/by_call_trigger.rs
index a2a9c38376b..ae3c00a6002 100644
--- a/crates/iroha/tests/integration/triggers/by_call_trigger.rs
+++ b/crates/iroha/tests/integration/triggers/by_call_trigger.rs
@@ -3,29 +3,28 @@ use std::{sync::mpsc, thread, time::Duration};
use executor_custom_data_model::mint_rose_args::MintRoseArgs;
use eyre::{eyre, Result, WrapErr};
use iroha::{
- client::{self, Client},
+ client::{self},
crypto::KeyPair,
data_model::{prelude::*, query::error::FindError, transaction::Executable},
};
use iroha_data_model::query::{builder::SingleQueryError, trigger::FindTriggers};
use iroha_executor_data_model::permission::trigger::CanRegisterTrigger;
-use iroha_genesis::GenesisBlock;
-use iroha_logger::info;
-use iroha_test_network::{Peer as TestPeer, *};
+use iroha_test_network::*;
use iroha_test_samples::{load_sample_wasm, ALICE_ID};
-use tokio::runtime::Runtime;
+
+use crate::integration::triggers::get_asset_value;
const TRIGGER_NAME: &str = "mint_rose";
#[test]
fn call_execute_trigger() -> Result<()> {
- let (_rt, _peer, mut test_client) = <PeerBuilder>::new().with_port(10_005).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let asset_definition_id = "rose#wonderland".parse()?;
let account_id = ALICE_ID.clone();
let asset_id = AssetId::new(asset_definition_id, account_id);
- let prev_value = get_asset_value(&mut test_client, asset_id.clone());
+ let prev_value = get_asset_value(&test_client, asset_id.clone());
let instruction = Mint::asset_numeric(1u32, asset_id.clone());
let register_trigger = build_register_trigger_isi(asset_id.account(), vec![instruction.into()]);
@@ -35,7 +34,7 @@ fn call_execute_trigger() -> Result<()> {
let call_trigger = ExecuteTrigger::new(trigger_id);
test_client.submit_blocking(call_trigger)?;
- let new_value = get_asset_value(&mut test_client, asset_id);
+ let new_value = get_asset_value(&test_client, asset_id);
assert_eq!(new_value, prev_value.checked_add(Numeric::ONE).unwrap());
Ok(())
@@ -43,8 +42,8 @@ fn call_execute_trigger() -> Result<()> {
#[test]
fn execute_trigger_should_produce_event() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_010).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let asset_definition_id = "rose#wonderland".parse()?;
let account_id = ALICE_ID.clone();
@@ -79,15 +78,15 @@ fn execute_trigger_should_produce_event() -> Result<()> {
#[test]
fn infinite_recursion_should_produce_one_call_per_block() -> Result<()> {
- let (_rt, _peer, mut test_client) = <PeerBuilder>::new().with_port(10_015).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let asset_definition_id = "rose#wonderland".parse()?;
let account_id = ALICE_ID.clone();
let asset_id = AssetId::new(asset_definition_id, account_id);
let trigger_id = TRIGGER_NAME.parse()?;
let call_trigger = ExecuteTrigger::new(trigger_id);
- let prev_value = get_asset_value(&mut test_client, asset_id.clone());
+ let prev_value = get_asset_value(&test_client, asset_id.clone());
let instructions = vec![
Mint::asset_numeric(1u32, asset_id.clone()).into(),
@@ -98,7 +97,7 @@ fn infinite_recursion_should_produce_one_call_per_block() -> Result<()> {
test_client.submit_blocking(call_trigger)?;
- let new_value = get_asset_value(&mut test_client, asset_id);
+ let new_value = get_asset_value(&test_client, asset_id);
assert_eq!(new_value, prev_value.checked_add(Numeric::ONE).unwrap());
Ok(())
@@ -106,8 +105,8 @@ fn infinite_recursion_should_produce_one_call_per_block() -> Result<()> {
#[test]
fn trigger_failure_should_not_cancel_other_triggers_execution() -> Result<()> {
- let (_rt, _peer, mut test_client) = <PeerBuilder>::new().with_port(10_020).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let asset_definition_id = "rose#wonderland".parse()?;
let account_id = ALICE_ID.clone();
@@ -147,13 +146,13 @@ fn trigger_failure_should_not_cancel_other_triggers_execution() -> Result<()> {
test_client.submit_blocking(register_trigger)?;
// Saving current asset value
- let prev_asset_value = get_asset_value(&mut test_client, asset_id.clone());
+ let prev_asset_value = get_asset_value(&test_client, asset_id.clone());
// Executing bad trigger
test_client.submit_blocking(ExecuteTrigger::new(bad_trigger_id))?;
// Checking results
- let new_asset_value = get_asset_value(&mut test_client, asset_id);
+ let new_asset_value = get_asset_value(&test_client, asset_id);
assert_eq!(
new_asset_value,
prev_asset_value.checked_add(Numeric::ONE).unwrap()
@@ -163,8 +162,8 @@ fn trigger_failure_should_not_cancel_other_triggers_execution() -> Result<()> {
#[test]
fn trigger_should_not_be_executed_with_zero_repeats_count() -> Result<()> {
- let (_rt, _peer, mut test_client) = <PeerBuilder>::new().with_port(10_025).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let asset_definition_id = "rose#wonderland".parse()?;
let account_id = ALICE_ID.clone();
@@ -186,7 +185,7 @@ fn trigger_should_not_be_executed_with_zero_repeats_count() -> Result<()> {
test_client.submit_blocking(register_trigger)?;
// Saving current asset value
- let prev_asset_value = get_asset_value(&mut test_client, asset_id.clone());
+ let prev_asset_value = get_asset_value(&test_client, asset_id.clone());
// Executing trigger first time
let execute_trigger = ExecuteTrigger::new(trigger_id.clone());
@@ -217,7 +216,7 @@ fn trigger_should_not_be_executed_with_zero_repeats_count() -> Result<()> {
);
// Checking results
- let new_asset_value = get_asset_value(&mut test_client, asset_id);
+ let new_asset_value = get_asset_value(&test_client, asset_id);
assert_eq!(
new_asset_value,
prev_asset_value.checked_add(Numeric::ONE).unwrap()
@@ -228,8 +227,8 @@ fn trigger_should_not_be_executed_with_zero_repeats_count() -> Result<()> {
#[test]
fn trigger_should_be_able_to_modify_its_own_repeats_count() -> Result<()> {
- let (_rt, _peer, mut test_client) = <PeerBuilder>::new().with_port(10_030).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let asset_definition_id = "rose#wonderland".parse()?;
let account_id = ALICE_ID.clone();
@@ -254,7 +253,7 @@ fn trigger_should_be_able_to_modify_its_own_repeats_count() -> Result<()> {
test_client.submit_blocking(register_trigger)?;
// Saving current asset value
- let prev_asset_value = get_asset_value(&mut test_client, asset_id.clone());
+ let prev_asset_value = get_asset_value(&test_client, asset_id.clone());
// Executing trigger first time
let execute_trigger = ExecuteTrigger::new(trigger_id);
@@ -264,7 +263,7 @@ fn trigger_should_be_able_to_modify_its_own_repeats_count() -> Result<()> {
test_client.submit_blocking(execute_trigger)?;
// Checking results
- let new_asset_value = get_asset_value(&mut test_client, asset_id);
+ let new_asset_value = get_asset_value(&test_client, asset_id);
assert_eq!(
new_asset_value,
prev_asset_value.checked_add(numeric!(2)).unwrap()
@@ -275,9 +274,8 @@ fn trigger_should_be_able_to_modify_its_own_repeats_count() -> Result<()> {
#[test]
fn only_account_with_permission_can_register_trigger() -> Result<()> {
- // Building a configuration
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_035).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let domain_id = ALICE_ID.domain().clone();
let alice_account_id = ALICE_ID.clone();
@@ -316,20 +314,20 @@ fn only_account_with_permission_can_register_trigger() -> Result<()> {
.filter_with(|account| account.id.eq(rabbit_account_id.clone()))
.execute_single()
.expect("Account not found");
- info!("Rabbit is found.");
+ println!("Rabbit is found.");
// Trying register the trigger without permissions
let _ = rabbit_client
.submit_blocking(Register::trigger(trigger.clone()))
.expect_err("Trigger should not be registered!");
- info!("Rabbit couldn't register the trigger");
+ println!("Rabbit couldn't register the trigger");
// Give permissions to the rabbit
test_client.submit_blocking(Grant::account_permission(
permission_on_registration,
rabbit_account_id,
))?;
- info!("Rabbit has got the permission");
+ println!("Rabbit has got the permission");
// Trying register the trigger with permissions
rabbit_client
@@ -348,8 +346,8 @@ fn only_account_with_permission_can_register_trigger() -> Result<()> {
#[test]
fn unregister_trigger() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_040).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let account_id = ALICE_ID.clone();
@@ -423,21 +421,14 @@ fn trigger_in_genesis() -> Result<()> {
),
);
- let mut peer = TestPeer::new().expect("Failed to create peer");
- let topology = vec![peer.id.clone()];
-
- // Registering trigger in genesis
- let genesis = GenesisBlock::test_with_instructions([Register::trigger(trigger)], topology);
-
- let rt = Runtime::test();
- let builder = PeerBuilder::new().with_genesis(genesis).with_port(10_045);
- rt.block_on(builder.start_with_peer(&mut peer));
- let mut test_client = Client::test(&peer.api_address);
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new()
+ .with_genesis_instruction(Register::trigger(trigger))
+ .start_blocking()?;
+ let test_client = network.client();
let asset_definition_id = "rose#wonderland".parse()?;
let asset_id = AssetId::new(asset_definition_id, account_id);
- let prev_value = get_asset_value(&mut test_client, asset_id.clone());
+ let prev_value = get_asset_value(&test_client, asset_id.clone());
// Executing trigger
test_client
@@ -451,7 +442,7 @@ fn trigger_in_genesis() -> Result<()> {
test_client.submit_blocking(call_trigger)?;
// Checking result
- let new_value = get_asset_value(&mut test_client, asset_id);
+ let new_value = get_asset_value(&test_client, asset_id);
assert_eq!(new_value, prev_value.checked_add(Numeric::ONE).unwrap());
Ok(())
@@ -459,8 +450,8 @@ fn trigger_in_genesis() -> Result<()> {
#[test]
fn trigger_should_be_able_to_modify_other_trigger() -> Result<()> {
- let (_rt, _peer, mut test_client) = <PeerBuilder>::new().with_port(10_085).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let asset_definition_id = "rose#wonderland".parse()?;
let account_id = ALICE_ID.clone();
@@ -499,7 +490,7 @@ fn trigger_should_be_able_to_modify_other_trigger() -> Result<()> {
test_client.submit_blocking(register_trigger)?;
// Saving current asset value
- let prev_asset_value = get_asset_value(&mut test_client, asset_id.clone());
+ let prev_asset_value = get_asset_value(&test_client, asset_id.clone());
// Executing triggers
let execute_trigger_unregister = ExecuteTrigger::new(trigger_id_unregister);
@@ -511,7 +502,7 @@ fn trigger_should_be_able_to_modify_other_trigger() -> Result<()> {
// Checking results
// First trigger should cancel second one, so value should stay the same
- let new_asset_value = get_asset_value(&mut test_client, asset_id);
+ let new_asset_value = get_asset_value(&test_client, asset_id);
assert_eq!(new_asset_value, prev_asset_value);
Ok(())
@@ -519,8 +510,8 @@ fn trigger_should_be_able_to_modify_other_trigger() -> Result<()> {
#[test]
fn trigger_burn_repetitions() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_070).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let asset_definition_id = "rose#wonderland".parse()?;
let account_id = ALICE_ID.clone();
@@ -555,8 +546,8 @@ fn trigger_burn_repetitions() -> Result<()> {
#[test]
fn unregistering_one_of_two_triggers_with_identical_wasm_should_not_cause_original_wasm_loss(
) -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_105).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let account_id = ALICE_ID.clone();
let first_trigger_id = "mint_rose_1".parse::<TriggerId>()?;
@@ -595,20 +586,6 @@ fn unregistering_one_of_two_triggers_with_identical_wasm_should_not_cause_origin
Ok(())
}
-fn get_asset_value(client: &mut Client, asset_id: AssetId) -> Numeric {
- let asset = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.eq(asset_id))
- .execute_single()
- .unwrap();
-
- let AssetValue::Numeric(val) = *asset.value() else {
- panic!("Unexpected asset value");
- };
-
- val
-}
-
fn build_register_trigger_isi(
account_id: &AccountId,
trigger_instructions: Vec<InstructionBox>,
@@ -630,13 +607,13 @@ fn build_register_trigger_isi(
#[test]
fn call_execute_trigger_with_args() -> Result<()> {
- let (_rt, _peer, mut test_client) = <PeerBuilder>::new().with_port(11_265).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let asset_definition_id = "rose#wonderland".parse()?;
let account_id = ALICE_ID.clone();
let asset_id = AssetId::new(asset_definition_id, account_id.clone());
- let prev_value = get_asset_value(&mut test_client, asset_id.clone());
+ let prev_value = get_asset_value(&test_client, asset_id.clone());
let trigger_id = TRIGGER_NAME.parse::<TriggerId>()?;
let trigger = Trigger::new(
@@ -657,7 +634,7 @@ fn call_execute_trigger_with_args() -> Result<()> {
let call_trigger = ExecuteTrigger::new(trigger_id).with_args(&args);
test_client.submit_blocking(call_trigger)?;
- let new_value = get_asset_value(&mut test_client, asset_id);
+ let new_value = get_asset_value(&test_client, asset_id);
assert_eq!(new_value, prev_value.checked_add(numeric!(42)).unwrap());
Ok(())
diff --git a/crates/iroha/tests/integration/triggers/data_trigger.rs b/crates/iroha/tests/integration/triggers/data_trigger.rs
index 2970fe57f9b..b882356b21c 100644
--- a/crates/iroha/tests/integration/triggers/data_trigger.rs
+++ b/crates/iroha/tests/integration/triggers/data_trigger.rs
@@ -5,8 +5,8 @@ use iroha_test_samples::{gen_account_in, ALICE_ID};
#[test]
fn must_execute_both_triggers() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_650).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let account_id = ALICE_ID.clone();
let asset_definition_id = "rose#wonderland".parse()?;
diff --git a/crates/iroha/tests/integration/triggers/event_trigger.rs b/crates/iroha/tests/integration/triggers/event_trigger.rs
index b0e67f982bf..001e18acb78 100644
--- a/crates/iroha/tests/integration/triggers/event_trigger.rs
+++ b/crates/iroha/tests/integration/triggers/event_trigger.rs
@@ -1,20 +1,19 @@
use eyre::Result;
-use iroha::{
- client::{self, Client},
- data_model::prelude::*,
-};
+use iroha::data_model::prelude::*;
use iroha_test_network::*;
use iroha_test_samples::ALICE_ID;
+use crate::integration::triggers::get_asset_value;
+
#[test]
fn test_mint_asset_when_new_asset_definition_created() -> Result<()> {
- let (_rt, _peer, mut test_client) = <PeerBuilder>::new().with_port(10_770).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let asset_definition_id = "rose#wonderland".parse()?;
let account_id = ALICE_ID.clone();
let asset_id = AssetId::new(asset_definition_id, account_id.clone());
- let prev_value = get_asset_value(&mut test_client, asset_id.clone());
+ let prev_value = get_asset_value(&test_client, asset_id.clone());
let instruction = Mint::asset_numeric(1u32, asset_id.clone());
let register_trigger = Register::trigger(Trigger::new(
@@ -33,22 +32,8 @@ fn test_mint_asset_when_new_asset_definition_created() -> Result<()> {
Register::asset_definition(AssetDefinition::numeric(tea_definition_id));
test_client.submit_blocking(register_tea_definition)?;
- let new_value = get_asset_value(&mut test_client, asset_id);
+ let new_value = get_asset_value(&test_client, asset_id);
assert_eq!(new_value, prev_value.checked_add(Numeric::ONE).unwrap());
Ok(())
}
-
-fn get_asset_value(client: &mut Client, asset_id: AssetId) -> Numeric {
- let asset = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.eq(asset_id))
- .execute_single()
- .unwrap();
-
- let AssetValue::Numeric(val) = *asset.value() else {
- panic!("Unexpected asset value");
- };
-
- val
-}
diff --git a/crates/iroha/tests/integration/triggers/mod.rs b/crates/iroha/tests/integration/triggers/mod.rs
index f0d2c08b2d6..74c374352cc 100644
--- a/crates/iroha/tests/integration/triggers/mod.rs
+++ b/crates/iroha/tests/integration/triggers/mod.rs
@@ -1,6 +1,24 @@
+use assert_matches::assert_matches;
+use iroha::{client, client::Client};
+use iroha_data_model::{
+ asset::{AssetId, AssetValue},
+ prelude::{Numeric, QueryBuilderExt},
+};
+
mod by_call_trigger;
mod data_trigger;
mod event_trigger;
mod orphans;
+// FIXME: rewrite all in async and with shorter timings
mod time_trigger;
mod trigger_rollback;
+
+fn get_asset_value(client: &Client, asset_id: AssetId) -> Numeric {
+ let asset = client
+ .query(client::asset::all())
+ .filter_with(|asset| asset.id.eq(asset_id))
+ .execute_single()
+ .unwrap();
+
+ assert_matches!(*asset.value(), AssetValue::Numeric(val) => val)
+}
diff --git a/crates/iroha/tests/integration/triggers/orphans.rs b/crates/iroha/tests/integration/triggers/orphans.rs
index 41dfc874f3d..9b7cb6a9781 100644
--- a/crates/iroha/tests/integration/triggers/orphans.rs
+++ b/crates/iroha/tests/integration/triggers/orphans.rs
@@ -1,10 +1,9 @@
use iroha::{client::Client, data_model::prelude::*};
use iroha_data_model::query::trigger::FindTriggers;
-use iroha_test_network::{wait_for_genesis_committed, Peer, PeerBuilder};
+use iroha_test_network::*;
use iroha_test_samples::gen_account_in;
-use tokio::runtime::Runtime;
-fn find_trigger(iroha: &Client, trigger_id: TriggerId) -> Option<TriggerId> {
+fn find_trigger(iroha: &Client, trigger_id: &TriggerId) -> Option<TriggerId> {
iroha
.query(FindTriggers::new())
.filter_with(|trigger| trigger.id.eq(trigger_id.clone()))
@@ -13,12 +12,7 @@ fn find_trigger(iroha: &Client, trigger_id: TriggerId) -> Option<TriggerId> {
.map(|trigger| trigger.id)
}
-fn set_up_trigger(
- port: u16,
-) -> eyre::Result<(Runtime, Peer, Client, DomainId, AccountId, TriggerId)> {
- let (rt, peer, iroha) = <PeerBuilder>::new().with_port(port).start_with_runtime();
- wait_for_genesis_committed(&[iroha.clone()], 0);
-
+fn set_up_trigger(iroha: &Client) -> eyre::Result<(DomainId, AccountId, TriggerId)> {
let failand: DomainId = "failand".parse()?;
let create_failand = Register::domain(Domain::new(failand.clone()));
@@ -41,36 +35,33 @@ fn set_up_trigger(
create_the_one_who_fails.into(),
register_fail_on_account_events.into(),
])?;
- Ok((
- rt,
- peer,
- iroha,
- failand,
- the_one_who_fails,
- fail_on_account_events,
- ))
+ Ok((failand, the_one_who_fails, fail_on_account_events))
}
#[test]
fn trigger_must_be_removed_on_action_authority_account_removal() -> eyre::Result<()> {
- let (_rt, _peer, iroha, _, the_one_who_fails, fail_on_account_events) = set_up_trigger(10_565)?;
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let iroha = network.client();
+ let (_, the_one_who_fails, fail_on_account_events) = set_up_trigger(&iroha)?;
assert_eq!(
- find_trigger(&iroha, fail_on_account_events.clone()),
+ find_trigger(&iroha, &fail_on_account_events),
Some(fail_on_account_events.clone())
);
iroha.submit_blocking(Unregister::account(the_one_who_fails.clone()))?;
- assert_eq!(find_trigger(&iroha, fail_on_account_events.clone()), None);
+ assert_eq!(find_trigger(&iroha, &fail_on_account_events), None);
Ok(())
}
#[test]
fn trigger_must_be_removed_on_action_authority_domain_removal() -> eyre::Result<()> {
- let (_rt, _peer, iroha, failand, _, fail_on_account_events) = set_up_trigger(10_505)?;
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let iroha = network.client();
+ let (failand, _, fail_on_account_events) = set_up_trigger(&iroha)?;
assert_eq!(
- find_trigger(&iroha, fail_on_account_events.clone()),
+ find_trigger(&iroha, &fail_on_account_events),
Some(fail_on_account_events.clone())
);
iroha.submit_blocking(Unregister::domain(failand.clone()))?;
- assert_eq!(find_trigger(&iroha, fail_on_account_events.clone()), None);
+ assert_eq!(find_trigger(&iroha, &fail_on_account_events), None);
Ok(())
}
diff --git a/crates/iroha/tests/integration/triggers/time_trigger.rs b/crates/iroha/tests/integration/triggers/time_trigger.rs
index c70778f176d..20d1fe07bc3 100644
--- a/crates/iroha/tests/integration/triggers/time_trigger.rs
+++ b/crates/iroha/tests/integration/triggers/time_trigger.rs
@@ -6,7 +6,6 @@ use iroha::{
data_model::{
asset::AssetId,
events::pipeline::{BlockEventFilter, BlockStatus},
- parameter::SumeragiParameters,
prelude::*,
Level,
},
@@ -14,14 +13,9 @@ use iroha::{
use iroha_test_network::*;
use iroha_test_samples::{gen_account_in, load_sample_wasm, ALICE_ID};
-/// Default estimation of consensus duration.
-pub fn pipeline_time() -> Duration {
- let default_parameters = SumeragiParameters::default();
+use crate::integration::triggers::get_asset_value;
- default_parameters.pipeline_time(0, 0)
-}
-
-fn curr_time() -> core::time::Duration {
+fn curr_time() -> Duration {
use std::time::SystemTime;
SystemTime::now()
@@ -31,10 +25,12 @@ fn curr_time() -> core::time::Duration {
#[test]
fn mint_asset_after_3_sec() -> Result<()> {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(10_665).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new()
+ .with_default_pipeline_time()
+ .start_blocking()?;
+ let test_client = network.client();
// Sleep to certainly bypass time interval analyzed by genesis
- std::thread::sleep(pipeline_time());
+ std::thread::sleep(network.consensus_estimation());
let asset_definition_id = "rose#wonderland"
.parse::<AssetDefinitionId>()
@@ -47,8 +43,12 @@ fn mint_asset_after_3_sec() -> Result<()> {
})?;
let start_time = curr_time();
- // Create trigger with schedule which is in the future to the new block but within block estimation time
- let schedule = TimeSchedule::starting_at(start_time + Duration::from_secs(3));
+ const GAP: Duration = Duration::from_secs(3);
+ assert!(
+ GAP < network.consensus_estimation(),
+ "Schedule should be in the future but within block estimation"
+ );
+ let schedule = TimeSchedule::starting_at(start_time + GAP);
let instruction = Mint::asset_numeric(1_u32, asset_id.clone());
let register_trigger = Register::trigger(Trigger::new(
"mint_rose".parse().expect("Valid"),
@@ -69,7 +69,7 @@ fn mint_asset_after_3_sec() -> Result<()> {
assert_eq!(init_quantity, after_registration_quantity);
// Sleep long enough that trigger start is in the past
- std::thread::sleep(pipeline_time());
+ std::thread::sleep(network.consensus_estimation());
test_client.submit_blocking(Log::new(Level::DEBUG, "Just to create block".to_string()))?;
let after_wait_quantity = test_client.query_single(FindAssetQuantityById {
@@ -88,14 +88,14 @@ fn mint_asset_after_3_sec() -> Result<()> {
fn pre_commit_trigger_should_be_executed() -> Result<()> {
const CHECKS_COUNT: usize = 5;
- let (_rt, _peer, mut test_client) = <PeerBuilder>::new().with_port(10_600).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let test_client = network.client();
let asset_definition_id = "rose#wonderland".parse().expect("Valid");
let account_id = ALICE_ID.clone();
let asset_id = AssetId::new(asset_definition_id, account_id.clone());
- let mut prev_value = get_asset_value(&mut test_client, asset_id.clone());
+ let mut prev_value = get_asset_value(&test_client, asset_id.clone());
// Start listening BEFORE submitting any transaction not to miss any block committed event
let event_listener = get_block_committed_event_listener(&test_client)?;
@@ -113,7 +113,7 @@ fn pre_commit_trigger_should_be_executed() -> Result<()> {
test_client.submit(register_trigger)?;
for _ in event_listener.take(CHECKS_COUNT) {
- let new_value = get_asset_value(&mut test_client, asset_id.clone());
+ let new_value = get_asset_value(&test_client, asset_id.clone());
assert_eq!(new_value, prev_value.checked_add(Numeric::ONE).unwrap());
prev_value = new_value;
@@ -134,8 +134,10 @@ fn mint_nft_for_every_user_every_1_sec() -> Result<()> {
const TRIGGER_PERIOD: Duration = Duration::from_millis(1000);
const EXPECTED_COUNT: u64 = 4;
- let (_rt, _peer, mut test_client) = <PeerBuilder>::new().with_port(10_780).start_with_runtime();
- wait_for_genesis_committed(&vec![test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new()
+ .with_default_pipeline_time()
+ .start_blocking()?;
+ let test_client = network.client();
let alice_id = ALICE_ID.clone();
@@ -181,7 +183,7 @@ fn mint_nft_for_every_user_every_1_sec() -> Result<()> {
// Time trigger will be executed on block commits, so we have to produce some transactions
submit_sample_isi_on_every_block_commit(
event_listener,
- &mut test_client,
+ &test_client,
&alice_id,
TRIGGER_PERIOD,
usize::try_from(EXPECTED_COUNT)?,
@@ -222,25 +224,10 @@ fn get_block_committed_event_listener(
client.listen_for_events([block_filter])
}
-/// Get asset numeric value
-fn get_asset_value(client: &mut Client, asset_id: AssetId) -> Numeric {
- let asset = client
- .query(client::asset::all())
- .filter_with(|asset| asset.id.eq(asset_id))
- .execute_single()
- .unwrap();
-
- let AssetValue::Numeric(val) = *asset.value() else {
- panic!("Unexpected asset value");
- };
-
- val
-}
-
/// Submit some sample ISIs to create new blocks
fn submit_sample_isi_on_every_block_commit(
block_committed_event_listener: impl Iterator<Item = Result<EventBox>>,
- test_client: &mut Client,
+ test_client: &Client,
account_id: &AccountId,
timeout: Duration,
times: usize,
diff --git a/crates/iroha/tests/integration/triggers/trigger_rollback.rs b/crates/iroha/tests/integration/triggers/trigger_rollback.rs
index 33215299914..9d807c326e3 100644
--- a/crates/iroha/tests/integration/triggers/trigger_rollback.rs
+++ b/crates/iroha/tests/integration/triggers/trigger_rollback.rs
@@ -8,8 +8,8 @@ use iroha_test_samples::ALICE_ID;
#[test]
fn failed_trigger_revert() -> Result<()> {
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(11_150).start_with_runtime();
- wait_for_genesis_committed(&[client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let client = network.client();
//When
let trigger_id = "trigger".parse::<TriggerId>()?;
diff --git a/crates/iroha/tests/integration/tx_chain_id.rs b/crates/iroha/tests/integration/tx_chain_id.rs
index 974211e668b..c885ed2bec6 100644
--- a/crates/iroha/tests/integration/tx_chain_id.rs
+++ b/crates/iroha/tests/integration/tx_chain_id.rs
@@ -5,8 +5,8 @@ use iroha_test_samples::gen_account_in;
#[test]
fn send_tx_with_different_chain_id() {
- let (_rt, _peer, test_client) = <PeerBuilder>::new().with_port(11_250).start_with_runtime();
- wait_for_genesis_committed(&[test_client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let test_client = network.client();
// Given
let (sender_id, sender_keypair) = gen_account_in("wonderland");
let (receiver_id, _receiver_keypair) = gen_account_in("wonderland");
@@ -31,8 +31,9 @@ fn send_tx_with_different_chain_id() {
register_asset.into(),
])
.unwrap();
- let chain_id_0 = ChainId::from("00000000-0000-0000-0000-000000000000"); // Value configured by default
+ let chain_id_0 = network.chain_id();
let chain_id_1 = ChainId::from("1");
+ assert_ne!(chain_id_0, chain_id_1);
let transfer_instruction = Transfer::asset_numeric(
AssetId::new("test_asset#wonderland".parse().unwrap(), sender_id.clone()),
@@ -49,6 +50,7 @@ fn send_tx_with_different_chain_id() {
.submit_transaction_blocking(&asset_transfer_tx_0)
.unwrap();
let _err = test_client
- .submit_transaction_blocking(&asset_transfer_tx_1)
+ // no need for "blocking" - it must be rejected synchronously
+ .submit_transaction(&asset_transfer_tx_1)
.unwrap_err();
}
diff --git a/crates/iroha/tests/integration/tx_history.rs b/crates/iroha/tests/integration/tx_history.rs
index 1b20be0054f..adcafebcf4d 100644
--- a/crates/iroha/tests/integration/tx_history.rs
+++ b/crates/iroha/tests/integration/tx_history.rs
@@ -1,22 +1,16 @@
-use std::thread;
-
use eyre::Result;
use iroha::{
client::transaction,
data_model::{prelude::*, query::parameters::Pagination},
};
-use iroha_config::parameters::actual::Root as Config;
use iroha_test_network::*;
use iroha_test_samples::ALICE_ID;
use nonzero_ext::nonzero;
-#[ignore = "ignore, more in #2851"]
#[test]
-fn client_has_rejected_and_acepted_txs_should_return_tx_history() -> Result<()> {
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(10_715).start_with_runtime();
- wait_for_genesis_committed(&vec![client.clone()], 0);
-
- let pipeline_time = Config::pipeline_time();
+fn client_has_rejected_and_accepted_txs_should_return_tx_history() -> Result<()> {
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let client = network.client();
// Given
let account_id = ALICE_ID.clone();
@@ -44,9 +38,8 @@ fn client_has_rejected_and_acepted_txs_should_return_tx_history() -> Result<()>
};
let instructions: Vec<InstructionBox> = vec![mint_asset.clone().into()];
let transaction = client.build_transaction(instructions, Metadata::default());
- client.submit_transaction(&transaction)?;
+ let _ = client.submit_transaction_blocking(&transaction);
}
- thread::sleep(pipeline_time * 5);
let transactions = client
.query(transaction::all())
diff --git a/crates/iroha/tests/integration/tx_rollback.rs b/crates/iroha/tests/integration/tx_rollback.rs
index b69828974d4..4c11cf5531e 100644
--- a/crates/iroha/tests/integration/tx_rollback.rs
+++ b/crates/iroha/tests/integration/tx_rollback.rs
@@ -5,8 +5,8 @@ use iroha_test_samples::ALICE_ID;
#[test]
fn client_sends_transaction_with_invalid_instruction_should_not_see_any_changes() -> Result<()> {
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(10_720).start_with_runtime();
- wait_for_genesis_committed(&[client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let client = network.client();
//When
let account_id = ALICE_ID.clone();
diff --git a/crates/iroha/tests/integration/upgrade.rs b/crates/iroha/tests/integration/upgrade.rs
index 7a2a4c81ad6..cadffa048e4 100644
--- a/crates/iroha/tests/integration/upgrade.rs
+++ b/crates/iroha/tests/integration/upgrade.rs
@@ -28,8 +28,8 @@ fn executor_upgrade_should_work() -> Result<()> {
.parse::<iroha::crypto::PrivateKey>()
.unwrap();
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(10_795).start_with_runtime();
- wait_for_genesis_committed(&vec![client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let client = network.client();
// Register `admin` domain and account
let admin_domain = Domain::new(admin_id.domain().clone());
@@ -68,8 +68,8 @@ fn executor_upgrade_should_work() -> Result<()> {
#[test]
fn executor_upgrade_should_run_migration() -> Result<()> {
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(10_990).start_with_runtime();
- wait_for_genesis_committed(&vec![client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let client = network.client();
// Check that `CanUnregisterDomain` exists
assert!(client
@@ -121,8 +121,8 @@ fn executor_upgrade_should_run_migration() -> Result<()> {
#[test]
fn executor_upgrade_should_revoke_removed_permissions() -> Result<()> {
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(11_030).start_with_runtime();
- wait_for_genesis_committed(&vec![client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let client = network.client();
// Permission which will be removed by executor
let can_unregister_domain = CanUnregisterDomain {
@@ -205,8 +205,8 @@ fn executor_upgrade_should_revoke_removed_permissions() -> Result<()> {
fn executor_custom_instructions_simple() -> Result<()> {
use executor_custom_data_model::simple_isi::MintAssetForAllAccounts;
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(11_270).start_with_runtime();
- wait_for_genesis_committed(&vec![client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let client = network.client();
upgrade_executor(&client, "executor_custom_instructions_simple")?;
@@ -244,8 +244,8 @@ fn executor_custom_instructions_complex() -> Result<()> {
ConditionalExpr, CoreExpr, EvaluatesTo, Expression, Greater,
};
- let (_rt, _peer, client) = PeerBuilder::new().with_port(11_275).start_with_runtime();
- wait_for_genesis_committed(&vec![client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let client = network.client();
let executor_fuel_limit = SetParameter::new(Parameter::Executor(SmartContractParameter::Fuel(
nonzero!(1_000_000_000_u64),
@@ -300,8 +300,8 @@ fn executor_custom_instructions_complex() -> Result<()> {
#[test]
fn migration_fail_should_not_cause_any_effects() {
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(10_980).start_with_runtime();
- wait_for_genesis_committed(&vec![client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let client = network.client();
let assert_domain_does_not_exist = |client: &Client, domain_id: &DomainId| {
assert!(
@@ -333,8 +333,8 @@ fn migration_fail_should_not_cause_any_effects() {
#[test]
fn migration_should_cause_upgrade_event() {
- let (rt, _peer, client) = <PeerBuilder>::new().with_port(10_995).start_with_runtime();
- wait_for_genesis_committed(&vec![client.clone()], 0);
+ let (network, rt) = NetworkBuilder::new().start_blocking().unwrap();
+ let client = network.client();
let events_client = client.clone();
let task = rt.spawn(async move {
@@ -367,14 +367,14 @@ fn migration_should_cause_upgrade_event() {
fn define_custom_parameter() -> Result<()> {
use executor_custom_data_model::parameters::DomainLimits;
- let (_rt, _peer, client) = <PeerBuilder>::new().with_port(11_325).start_with_runtime();
- wait_for_genesis_committed(&vec![client.clone()], 0);
+ let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+ let client = network.client();
let long_domain_name = "0".repeat(2_usize.pow(5)).parse::<DomainId>()?;
let create_domain = Register::domain(Domain::new(long_domain_name));
client.submit_blocking(create_domain)?;
- upgrade_executor(&client, "executor_with_custom_parameter").unwrap();
+ upgrade_executor(&client, "executor_with_custom_parameter")?;
let too_long_domain_name = "1".repeat(2_usize.pow(5)).parse::<DomainId>()?;
let create_domain = Register::domain(Domain::new(too_long_domain_name));
diff --git a/crates/iroha_config_base/src/toml.rs b/crates/iroha_config_base/src/toml.rs
index 8338632e198..2b7ab4adb1a 100644
--- a/crates/iroha_config_base/src/toml.rs
+++ b/crates/iroha_config_base/src/toml.rs
@@ -286,6 +286,19 @@ impl<'a> From<&'a mut Table> for Writer<'a> {
}
}
+/// Extension trait to implement writing with [`Writer`] directly into [`Table`] in a chained manner.
+pub trait WriteExt: Sized {
+ /// See [`Writer::write`].
+ fn write<P: WritePath, T: Serialize>(self, path: P, value: T) -> Self;
+}
+
+impl WriteExt for Table {
+ fn write<P: WritePath, T: Serialize>(mut self, path: P, value: T) -> Self {
+ Writer::new(&mut self).write(path, value);
+ self
+ }
+}
+
#[cfg(test)]
mod tests {
use expect_test::expect;
diff --git a/crates/iroha_core/Cargo.toml b/crates/iroha_core/Cargo.toml
index ed9ab45731c..22820a3eddd 100644
--- a/crates/iroha_core/Cargo.toml
+++ b/crates/iroha_core/Cargo.toml
@@ -18,8 +18,6 @@ categories.workspace = true
workspace = true
[features]
-default = ["telemetry"]
-
# Support lightweight telemetry, including diagnostics
telemetry = []
# Support Prometheus metrics. See https://prometheus.io/.
diff --git a/crates/iroha_core/src/sumeragi/main_loop.rs b/crates/iroha_core/src/sumeragi/main_loop.rs
index d77bd70eeb8..06b05cf711e 100644
--- a/crates/iroha_core/src/sumeragi/main_loop.rs
+++ b/crates/iroha_core/src/sumeragi/main_loop.rs
@@ -41,6 +41,7 @@ pub struct Sumeragi {
/// subsystem.
pub transaction_cache: Vec<TransactionGuard>,
/// Metrics for reporting number of view changes in current round
+ #[cfg(feature = "telemetry")]
pub view_changes_metric: iroha_telemetry::metrics::ViewChangesGauge,
/// Was there a commit in previous round?
@@ -123,60 +124,58 @@ impl Sumeragi {
&self,
latest_block: HashOf<BlockHeader>,
view_change_proof_chain: &mut ProofChain,
- ) -> (Option<BlockMessage>, bool) {
+ ) -> Result<(Option<BlockMessage>, bool), ReceiveNetworkPacketError> {
const MAX_CONTROL_MSG_IN_A_ROW: usize = 25;
let mut should_sleep = true;
for _ in 0..MAX_CONTROL_MSG_IN_A_ROW {
- if let Ok(msg) = self
- .control_message_receiver
- .try_recv()
- .map_err(|recv_error| {
- assert!(
- recv_error != mpsc::TryRecvError::Disconnected,
- "INTERNAL ERROR: Sumeragi control message pump disconnected"
- )
- })
- {
- should_sleep = false;
- if let Err(error) = view_change_proof_chain.insert_proof(
- msg.view_change_proof,
- &self.topology,
- latest_block,
- ) {
- trace!(%error, "Failed to add proof into view change proof chain")
+ match self.control_message_receiver.try_recv() {
+ Ok(msg) => {
+ should_sleep = false;
+ if let Err(error) = view_change_proof_chain.insert_proof(
+ msg.view_change_proof,
+ &self.topology,
+ latest_block,
+ ) {
+ trace!(%error, "Failed to add proof into view change proof chain")
+ }
+ }
+ Err(mpsc::TryRecvError::Disconnected) => {
+ return Err(ReceiveNetworkPacketError::ChannelDisconnected)
+ }
+ Err(err) => {
+ trace!(%err, "Failed to receive control message");
+ break;
}
- } else {
- break;
}
}
let block_msg =
- self.receive_block_message_network_packet(latest_block, view_change_proof_chain);
+ self.receive_block_message_network_packet(latest_block, view_change_proof_chain)?;
should_sleep &= block_msg.is_none();
- (block_msg, should_sleep)
+ Ok((block_msg, should_sleep))
}
fn receive_block_message_network_packet(
&self,
latest_block: HashOf<BlockHeader>,
view_change_proof_chain: &ProofChain,
- ) -> Option<BlockMessage> {
+ ) -> Result<Option<BlockMessage>, ReceiveNetworkPacketError> {
let current_view_change_index =
view_change_proof_chain.verify_with_state(&self.topology, latest_block);
loop {
- let block_msg = self
- .message_receiver
- .try_recv()
- .map_err(|recv_error| {
- assert!(
- recv_error != mpsc::TryRecvError::Disconnected,
- "INTERNAL ERROR: Sumeragi message pump disconnected"
- )
- })
- .ok()?;
+ let block_msg = match self.message_receiver.try_recv() {
+ Ok(msg) => msg,
+ Err(mpsc::TryRecvError::Disconnected) => {
+ return Err(ReceiveNetworkPacketError::ChannelDisconnected)
+ }
+ Err(err) => {
+ trace!(%err, "Failed to receive message");
+ return Ok(None);
+ }
+ };
match &block_msg {
BlockMessage::BlockCreated(bc) => {
@@ -196,7 +195,7 @@ impl Sumeragi {
| BlockMessage::BlockCommitted(_)
| BlockMessage::BlockSyncUpdate(_) => {}
}
- return Some(block_msg);
+ return Ok(Some(block_msg));
}
}
@@ -938,6 +937,17 @@ impl Sumeragi {
}
}
+/// A simple error to handle network packet receiving failures
+#[derive(Copy, Clone)]
+pub enum ReceiveNetworkPacketError {
+ /// Some message pump is disconnected.
+ ///
+ /// It means either that Iroha is being shut down, or that something is terribly wrong.
+ ///
+ /// In any case, Sumeragi should terminate immediately.
+ ChannelDisconnected,
+}
+
#[allow(clippy::too_many_arguments)]
fn reset_state(
peer_id: &PeerId,
@@ -1100,17 +1110,26 @@ pub(crate) fn run(
&mut last_view_change_time,
&mut view_change_time,
);
+ #[cfg(feature = "telemetry")]
sumeragi
.view_changes_metric
.set(sumeragi.topology.view_change_index() as u64);
if let Some(message) = {
- let (msg, sleep) = sumeragi.receive_network_packet(
+ let (msg, sleep) = match sumeragi.receive_network_packet(
state_view
.latest_block_hash()
.expect("INTERNAL BUG: No latest block"),
&mut view_change_proof_chain,
- );
+ ) {
+ Ok(x) => x,
+ Err(ReceiveNetworkPacketError::ChannelDisconnected) => {
+ if shutdown_signal.is_sent() {
+ break;
+ }
+ panic!("INTERNAL BUG: Sumeragi message pumps are disconnected while there is no shutdown signal yet.")
+ }
+ };
should_sleep = sleep;
msg
} {
@@ -1220,6 +1239,7 @@ pub(crate) fn run(
&mut last_view_change_time,
&mut view_change_time,
);
+ #[cfg(feature = "telemetry")]
sumeragi
.view_changes_metric
.set(sumeragi.topology.view_change_index() as u64);
diff --git a/crates/iroha_core/src/sumeragi/mod.rs b/crates/iroha_core/src/sumeragi/mod.rs
index 568ba67da4b..baa8f13ef02 100644
--- a/crates/iroha_core/src/sumeragi/mod.rs
+++ b/crates/iroha_core/src/sumeragi/mod.rs
@@ -35,6 +35,7 @@ use crate::{kura::Kura, prelude::*, queue::Queue, EventsSender, IrohaNetwork, Ne
pub struct SumeragiHandle {
peer_id: PeerId,
/// Counter for amount of dropped messages by sumeragi
+ #[cfg(feature = "telemetry")]
dropped_messages_metric: iroha_telemetry::metrics::DroppedMessagesCounter,
// Should be dropped after `_thread_handle` to prevent sumeargi thread from panicking
control_message_sender: mpsc::SyncSender<ControlFlowMessage>,
@@ -46,6 +47,7 @@ impl SumeragiHandle {
pub fn incoming_control_flow_message(&self, msg: ControlFlowMessage) {
trace!(ty = "ViewChangeProofChain", "Incoming message");
if let Err(error) = self.control_message_sender.try_send(msg) {
+ #[cfg(feature = "telemetry")]
self.dropped_messages_metric.inc();
error!(
@@ -72,6 +74,7 @@ impl SumeragiHandle {
trace!(ty, %block, "Incoming message");
if let Err(error) = self.message_sender.try_send(msg) {
+ #[cfg(feature = "telemetry")]
self.dropped_messages_metric.inc();
error!(
@@ -147,7 +150,8 @@ impl SumeragiStartArgs {
network,
genesis_network,
block_count: BlockCount(block_count),
- sumeragi_metrics:
+ #[cfg(feature = "telemetry")]
+ sumeragi_metrics:
SumeragiMetrics {
view_changes,
dropped_messages,
@@ -222,6 +226,7 @@ impl SumeragiStartArgs {
debug_force_soft_fork,
topology,
transaction_cache: Vec::new(),
+ #[cfg(feature = "telemetry")]
view_changes_metric: view_changes,
was_commit: false,
round_start_time: Instant::now(),
@@ -240,6 +245,7 @@ impl SumeragiStartArgs {
(
SumeragiHandle {
peer_id,
+ #[cfg(feature = "telemetry")]
dropped_messages_metric: dropped_messages,
control_message_sender,
message_sender,
@@ -297,6 +303,7 @@ pub struct SumeragiStartArgs {
pub network: IrohaNetwork,
pub genesis_network: GenesisWithPubKey,
pub block_count: BlockCount,
+ #[cfg(feature = "telemetry")]
pub sumeragi_metrics: SumeragiMetrics,
}
diff --git a/crates/iroha_crypto/src/lib.rs b/crates/iroha_crypto/src/lib.rs
index 6c15aa8ad2e..b4bd0d763b7 100755
--- a/crates/iroha_crypto/src/lib.rs
+++ b/crates/iroha_crypto/src/lib.rs
@@ -774,6 +774,11 @@ impl PrivateKey {
pub fn to_bytes(&self) -> (Algorithm, Vec<u8>) {
(self.algorithm(), self.payload())
}
+
+ /// Wrap itself into [`ExposedPrivateKey`].
+ pub fn expose(self) -> ExposedPrivateKey {
+ ExposedPrivateKey(self)
+ }
}
impl FromStr for PrivateKey {
diff --git a/crates/iroha_p2p/src/network.rs b/crates/iroha_p2p/src/network.rs
index fedded056b9..666e35d7226 100644
--- a/crates/iroha_p2p/src/network.rs
+++ b/crates/iroha_p2p/src/network.rs
@@ -10,7 +10,7 @@ use futures::{stream::FuturesUnordered, StreamExt};
use iroha_config::parameters::actual::Network as Config;
use iroha_crypto::{KeyPair, PublicKey};
use iroha_data_model::prelude::PeerId;
-use iroha_futures::supervisor::{Child, OnShutdown};
+use iroha_futures::supervisor::{Child, OnShutdown, ShutdownSignal};
use iroha_logger::prelude::*;
use iroha_primitives::addr::SocketAddr;
use parity_scale_codec::Encode as _;
@@ -69,13 +69,14 @@ impl<T: Pload, K: Kex + Sync, E: Enc + Sync> NetworkBaseHandle<T, K, E> {
///
/// # Errors
/// - If binding to address fail
- #[log(skip(key_pair))]
+ #[log(skip(key_pair, shutdown_signal))]
pub async fn start(
key_pair: KeyPair,
Config {
address: listen_addr,
idle_timeout,
}: Config,
+ shutdown_signal: ShutdownSignal,
) -> Result<(Self, Child), Error> {
// TODO: enhance the error by reporting the origin of `listen_addr`
let listener = TcpListener::bind(listen_addr.value().to_socket_addrs()?.as_slice()).await?;
@@ -109,7 +110,10 @@ impl<T: Pload, K: Kex + Sync, E: Enc + Sync> NetworkBaseHandle<T, K, E> {
_key_exchange: core::marker::PhantomData::<K>,
_encryptor: core::marker::PhantomData::<E>,
};
- let child = Child::new(tokio::task::spawn(network.run()), OnShutdown::Abort);
+ let child = Child::new(
+ tokio::task::spawn(network.run(shutdown_signal)),
+ OnShutdown::Wait(Duration::from_secs(5)),
+ );
Ok((
Self {
subscribe_to_peers_messages_sender,
@@ -216,8 +220,8 @@ struct NetworkBase<T: Pload, K: Kex, E: Enc> {
impl<T: Pload, K: Kex, E: Enc> NetworkBase<T, K, E> {
/// [`Self`] task.
- #[log(skip(self), fields(listen_addr=%self.listen_addr, public_key=%self.key_pair.public_key()))]
- async fn run(mut self) {
+ #[log(skip(self, shutdown_signal), fields(listen_addr=%self.listen_addr, public_key=%self.key_pair.public_key()))]
+ async fn run(mut self, shutdown_signal: ShutdownSignal) {
// TODO: probably should be configuration parameter
let mut update_topology_interval = tokio::time::interval(Duration::from_millis(100));
loop {
@@ -251,7 +255,7 @@ impl<T: Pload, K: Kex, E: Enc> NetworkBase<T, K, E> {
// they will be exhaust at some point given opportunity for incoming message to being processed
network_message = self.network_message_receiver.recv() => {
let Some(network_message) = network_message else {
- iroha_logger::info!("All handles to network actor are dropped. Shutting down...");
+ iroha_logger::debug!("All handles to network actor are dropped. Shutting down...");
break;
};
let network_message_receiver_len = self.network_message_receiver.len();
@@ -280,7 +284,14 @@ impl<T: Pload, K: Kex, E: Enc> NetworkBase<T, K, E> {
Some(peer_message) = self.peer_message_receiver.recv() => {
self.peer_message(peer_message).await;
}
- else => break,
+ () = shutdown_signal.receive() => {
+ iroha_logger::debug!("Shutting down due to signal");
+ break
+ }
+ else => {
+ iroha_logger::debug!("All receivers are dropped, shutting down");
+ break
+ },
}
tokio::task::yield_now().await;
}
diff --git a/crates/iroha_p2p/src/peer.rs b/crates/iroha_p2p/src/peer.rs
index 8175db62fd6..b95dfd8f61a 100644
--- a/crates/iroha_p2p/src/peer.rs
+++ b/crates/iroha_p2p/src/peer.rs
@@ -128,11 +128,11 @@ mod run {
let peer = match tokio::time::timeout(idle_timeout, peer.handshake()).await {
Ok(Ok(ready)) => ready,
Ok(Err(error)) => {
- iroha_logger::error!(%error, "Failure during handshake.");
+ iroha_logger::warn!(?error, "Failure during handshake.");
return;
},
Err(_) => {
- iroha_logger::error!(timeout=?idle_timeout, "Other peer has been idle during handshake");
+ iroha_logger::warn!(timeout=?idle_timeout, "Other peer has been idle during handshake");
return;
}
};
diff --git a/crates/iroha_p2p/tests/integration/p2p.rs b/crates/iroha_p2p/tests/integration/p2p.rs
index 39ef5615506..cd33e3843ea 100644
--- a/crates/iroha_p2p/tests/integration/p2p.rs
+++ b/crates/iroha_p2p/tests/integration/p2p.rs
@@ -12,6 +12,7 @@ use iroha_config::parameters::actual::Network as Config;
use iroha_config_base::WithOrigin;
use iroha_crypto::KeyPair;
use iroha_data_model::prelude::PeerId;
+use iroha_futures::supervisor::ShutdownSignal;
use iroha_logger::{prelude::*, test_logger};
use iroha_p2p::{network::message::*, NetworkHandle};
use iroha_primitives::addr::socket_addr;
@@ -45,7 +46,9 @@ async fn network_create() {
address: WithOrigin::inline(address.clone()),
idle_timeout,
};
- let (network, _) = NetworkHandle::start(key_pair, config).await.unwrap();
+ let (network, _) = NetworkHandle::start(key_pair, config, ShutdownSignal::new())
+ .await
+ .unwrap();
tokio::time::sleep(delay).await;
info!("Connecting to peer...");
@@ -156,7 +159,9 @@ async fn two_networks() {
address: WithOrigin::inline(address1.clone()),
idle_timeout,
};
- let (mut network1, _) = NetworkHandle::start(key_pair1, config1).await.unwrap();
+ let (mut network1, _) = NetworkHandle::start(key_pair1, config1, ShutdownSignal::new())
+ .await
+ .unwrap();
info!("Starting second network...");
let address2 = socket_addr!(127.0.0.1:12_010);
@@ -164,7 +169,9 @@ async fn two_networks() {
address: WithOrigin::inline(address2.clone()),
idle_timeout,
};
- let (network2, _) = NetworkHandle::start(key_pair2, config2).await.unwrap();
+ let (network2, _) = NetworkHandle::start(key_pair2, config2, ShutdownSignal::new())
+ .await
+ .unwrap();
let mut messages2 = WaitForN::new(1);
let actor2 = TestActor::start(messages2.clone());
@@ -239,6 +246,7 @@ async fn multiple_networks() {
.expect("Failed to convert to u32");
let mut msgs = WaitForN::new(expected_msgs);
let barrier = Arc::new(Barrier::new(peers.len()));
+
peers
.iter()
.zip(key_pairs)
@@ -249,6 +257,7 @@ async fn multiple_networks() {
peers.clone(),
msgs.clone(),
Arc::clone(&barrier),
+ ShutdownSignal::new(),
)
})
.collect::<FuturesUnordered<_>>()
@@ -290,6 +299,7 @@ async fn start_network(
peers: Vec<PeerId>,
messages: WaitForN,
barrier: Arc<Barrier>,
+ shutdown_signal: ShutdownSignal,
) -> (PeerId, NetworkHandle<TestMessage>) {
info!(peer_addr = %peer.address, "Starting network");
@@ -302,7 +312,9 @@ async fn start_network(
address: WithOrigin::inline(address),
idle_timeout,
};
- let (mut network, _) = NetworkHandle::start(key_pair, config).await.unwrap();
+ let (mut network, _) = NetworkHandle::start(key_pair, config, shutdown_signal)
+ .await
+ .unwrap();
network.subscribe_to_peers_messages(actor);
let _ = barrier.wait().await;
diff --git a/crates/iroha_test_network/Cargo.toml b/crates/iroha_test_network/Cargo.toml
index b321d1df94a..9510da71959 100644
--- a/crates/iroha_test_network/Cargo.toml
+++ b/crates/iroha_test_network/Cargo.toml
@@ -8,7 +8,6 @@ authors.workspace = true
license.workspace = true
[dependencies]
-irohad.workspace = true
iroha_core.workspace = true
iroha.workspace = true
@@ -20,14 +19,22 @@ iroha_primitives.workspace = true
iroha_logger.workspace = true
iroha_genesis.workspace = true
iroha_futures.workspace = true
-iroha_wasm_builder.workspace = true
iroha_test_samples.workspace = true
+iroha_telemetry.workspace = true
-eyre.workspace = true
+color-eyre.workspace = true
+thiserror.workspace = true
rand.workspace = true
tempfile.workspace = true
unique_port = "0.2.1"
serde_json.workspace = true
parity-scale-codec = { version = "3.6.12", default-features = false }
-tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros"] }
+tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros", "process", "sync", "io-util"] }
futures = { workspace = true, features = ["std", "async-await"] }
+toml = { workspace = true }
+backoff = { version = "0.4.0", features = ["futures", "tokio"] }
+fslock = "0.2.1"
+serde = { workspace = true, features = ["derive"] }
+derive_more = { workspace = true }
+which = "6.0.3"
+nix = { version = "0.29.0", features = ["signal"] }
diff --git a/crates/iroha_test_network/src/config.rs b/crates/iroha_test_network/src/config.rs
new file mode 100644
index 00000000000..30a94ca6ac1
--- /dev/null
+++ b/crates/iroha_test_network/src/config.rs
@@ -0,0 +1,94 @@
+//! Sample configuration builders
+
+use std::path::Path;
+
+use iroha_config::base::toml::WriteExt;
+use iroha_data_model::{
+ asset::AssetDefinitionId,
+ isi::{Grant, Instruction},
+ peer::PeerId,
+ ChainId,
+};
+use iroha_executor_data_model::permission::{
+ asset::CanMintAssetsWithDefinition, domain::CanUnregisterDomain, executor::CanUpgradeExecutor,
+ peer::CanManagePeers, role::CanManageRoles,
+};
+use iroha_genesis::{GenesisBlock, RawGenesisTransaction};
+use iroha_primitives::unique_vec::UniqueVec;
+use iroha_test_samples::{ALICE_ID, SAMPLE_GENESIS_ACCOUNT_KEYPAIR};
+use toml::Table;
+
+pub fn chain_id() -> ChainId {
+ ChainId::from("00000000-0000-0000-0000-000000000000")
+}
+
+pub fn base_iroha_config() -> Table {
+ Table::new()
+ .write("chain", chain_id())
+ .write(
+ ["genesis", "public_key"],
+ SAMPLE_GENESIS_ACCOUNT_KEYPAIR.public_key(),
+ )
+ // There is no need in persistence in tests.
+ .write(["snapshot", "mode"], "disabled")
+ .write(["kura", "store_dir"], "./storage")
+ .write(["network", "block_gossip_size"], 1)
+ .write(["logger", "level"], "DEBUG")
+}
+
+pub fn genesis<T: Instruction>(
+ extra_isi: impl IntoIterator<Item = T>,
+ topology: UniqueVec<PeerId>,
+) -> GenesisBlock {
+ // TODO: Fix this somehow. Probably we need to make `kagami` a library (#3253).
+ let mut genesis = match RawGenesisTransaction::from_path(
+ Path::new(env!("CARGO_MANIFEST_DIR")).join("../../defaults/genesis.json"),
+ ) {
+ Ok(x) => x,
+ Err(err) => {
+ eprintln!(
+ "ERROR: cannot load genesis from `defaults/genesis.json`\n \
+ If `executor.wasm` is not found, make sure to run `scripts/build_wasm_samples.sh` first\n \
+ Full error: {err}"
+ );
+ panic!("cannot proceed without genesis, see the error above");
+ }
+ };
+
+ let rose_definition_id = "rose#wonderland".parse::<AssetDefinitionId>().unwrap();
+ let grant_modify_rose_permission = Grant::account_permission(
+ CanMintAssetsWithDefinition {
+ asset_definition: rose_definition_id.clone(),
+ },
+ ALICE_ID.clone(),
+ );
+ let grant_manage_peers_permission = Grant::account_permission(CanManagePeers, ALICE_ID.clone());
+ let grant_manage_roles_permission = Grant::account_permission(CanManageRoles, ALICE_ID.clone());
+ let grant_unregister_wonderland_domain = Grant::account_permission(
+ CanUnregisterDomain {
+ domain: "wonderland".parse().unwrap(),
+ },
+ ALICE_ID.clone(),
+ );
+ let grant_upgrade_executor_permission =
+ Grant::account_permission(CanUpgradeExecutor, ALICE_ID.clone());
+ for isi in [
+ grant_modify_rose_permission,
+ grant_manage_peers_permission,
+ grant_manage_roles_permission,
+ grant_unregister_wonderland_domain,
+ grant_upgrade_executor_permission,
+ ] {
+ genesis.append_instruction(isi);
+ }
+
+ for isi in extra_isi.into_iter() {
+ genesis.append_instruction(isi);
+ }
+
+ let genesis_key_pair = SAMPLE_GENESIS_ACCOUNT_KEYPAIR.clone();
+ genesis
+ .with_topology(topology.into())
+ .build_and_sign(&genesis_key_pair)
+ .expect("genesis should load fine")
+}
diff --git a/crates/iroha_test_network/src/fslock_ports.rs b/crates/iroha_test_network/src/fslock_ports.rs
new file mode 100644
index 00000000000..2e861769dfd
--- /dev/null
+++ b/crates/iroha_test_network/src/fslock_ports.rs
@@ -0,0 +1,116 @@
+//! [`fslock`]-based socket ports locking for test network peers,
+//! supporting inter-process and intra-process test execution scenarios.
+
+use std::{
+ collections::BTreeSet,
+ fs::OpenOptions,
+ io::{Read, Write},
+};
+
+use color_eyre::{
+ eyre::{eyre, Context},
+ Result,
+};
+use derive_more::{Deref, Display};
+use serde::{Deserialize, Serialize};
+
+const DATA_FILE: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/.iroha_test_network_run.json");
+const LOCK_FILE: &str = concat!(
+ env!("CARGO_MANIFEST_DIR"),
+ "/.iroha_test_network_run.json.lock"
+);
+
+#[derive(Serialize, Deserialize, Default)]
+struct LockContent {
+ ports_in_use: BTreeSet<u16>,
+}
+
+impl LockContent {
+ fn read() -> Result<Self> {
+ let value = if std::fs::exists(DATA_FILE)? {
+ OpenOptions::new()
+ .read(true)
+ .open(DATA_FILE)
+ .wrap_err("failed to open file")
+ .and_then(|mut file| {
+ let mut content = String::new();
+ file.read_to_string(&mut content)
+ .wrap_err("failed to read file")?;
+ serde_json::from_str(&content).wrap_err("failed to parse lock file contents")
+ })
+ .wrap_err_with(|| {
+ eyre!(
+ "Failed to read lock file at {}. Remove it manually to proceed.",
+ DATA_FILE
+ )
+ })
+ .unwrap()
+ } else {
+ Default::default()
+ };
+ Ok(value)
+ }
+
+ fn write(&self) -> Result<()> {
+ if std::fs::exists(DATA_FILE)? {
+ std::fs::remove_file(DATA_FILE)?;
+ }
+ if self.ports_in_use.is_empty() {
+ return Ok(());
+ };
+ let mut file = OpenOptions::new()
+ .create(true)
+ .truncate(true)
+ .write(true)
+ .open(DATA_FILE)?;
+ file.write_all(serde_json::to_string(&self).unwrap().as_bytes())?;
+ Ok(())
+ }
+}
+
+/// Releases the port on [`Drop`].
+#[derive(Debug, Deref, Display)]
+pub struct AllocatedPort(u16);
+
+impl AllocatedPort {
+ pub fn new() -> Self {
+ let mut lock = fslock::LockFile::open(LOCK_FILE).expect("path is valid");
+ lock.lock().expect("this handle doesn't own the file yet");
+
+ let mut value = LockContent::read().expect("should be able to read the data");
+
+ let mut i = 0;
+ let port = loop {
+ let port = unique_port::get_unique_free_port().unwrap();
+ if !value.ports_in_use.contains(&port) {
+ break port;
+ }
+ i += 1;
+ if i == 1000 {
+ panic!("cannot find a free port")
+ }
+ };
+
+ value.ports_in_use.insert(port);
+
+ value.write().expect("should be able to write the data");
+ lock.unlock().expect("this handle still holds the lock");
+
+ // eprintln!("[unique port] allocated {port}");
+
+ Self(port)
+ }
+}
+
+impl Drop for AllocatedPort {
+ fn drop(&mut self) {
+ let mut lock = fslock::LockFile::open(LOCK_FILE).expect("path is valid");
+ lock.lock().expect("doesn't hold it yet");
+ let mut value = LockContent::read().expect("should read fine");
+ value.ports_in_use.remove(&self.0);
+ value.write().expect("should save the result filne");
+ lock.unlock().expect("still holds it");
+
+ // eprintln!("[unique port] released {}", self.0);
+ }
+}
diff --git a/crates/iroha_test_network/src/lib.rs b/crates/iroha_test_network/src/lib.rs
index 5e4c6780243..580606a2a9a 100644
--- a/crates/iroha_test_network/src/lib.rs
+++ b/crates/iroha_test_network/src/lib.rs
@@ -1,852 +1,918 @@
-//! Module for starting peers and networks. Used only for tests
+//! Puppeteer for `irohad`, to create test networks
+
+mod config;
+mod fslock_ports;
+
use core::{fmt::Debug, time::Duration};
-use std::{collections::BTreeMap, ops::Deref, path::Path, sync::Arc, thread};
+use std::{
+ ops::Deref,
+ path::{Path, PathBuf},
+ process::{ExitStatus, Stdio},
+ sync::{
+ atomic::{AtomicBool, AtomicUsize, Ordering},
+ Arc, OnceLock,
+ },
+};
-use eyre::Result;
+use backoff::ExponentialBackoffBuilder;
+use color_eyre::eyre::{eyre, Context, Result};
+use fslock_ports::AllocatedPort;
use futures::{prelude::*, stream::FuturesUnordered};
-use iroha::{
- client::Client,
- config::Config as ClientConfig,
- data_model::{isi::Instruction, peer::Peer as DataModelPeer, prelude::*},
+use iroha::{client::Client, data_model::prelude::*};
+use iroha_config::base::{
+ read::ConfigReader,
+ toml::{TomlSource, WriteExt as _, Writer as TomlWriter},
};
-use iroha_config::parameters::actual::{Root as Config, Sumeragi, TrustedPeers};
pub use iroha_core::state::StateReadOnly;
-use iroha_crypto::{ExposedPrivateKey, KeyPair};
-use iroha_data_model::{asset::AssetDefinitionId, isi::InstructionBox, ChainId};
-use iroha_executor_data_model::permission::{
- asset::CanMintAssetsWithDefinition, domain::CanUnregisterDomain, executor::CanUpgradeExecutor,
- peer::CanManagePeers, role::CanManageRoles,
-};
-use iroha_futures::supervisor::ShutdownSignal;
-use iroha_genesis::{GenesisBlock, RawGenesisTransaction};
-use iroha_logger::{warn, InstrumentFutures};
-use iroha_primitives::{
- addr::{socket_addr, SocketAddr},
- unique_vec::UniqueVec,
+use iroha_crypto::{ExposedPrivateKey, KeyPair, PrivateKey};
+use iroha_data_model::{
+ events::pipeline::BlockEventFilter,
+ isi::InstructionBox,
+ parameter::{SumeragiParameter, SumeragiParameters},
+ ChainId,
};
+use iroha_genesis::GenesisBlock;
+use iroha_primitives::{addr::socket_addr, unique_vec::UniqueVec};
+use iroha_telemetry::metrics::Status;
use iroha_test_samples::{ALICE_ID, ALICE_KEYPAIR, PEER_KEYPAIR, SAMPLE_GENESIS_ACCOUNT_KEYPAIR};
-use irohad::Iroha;
-use rand::{prelude::SliceRandom, thread_rng};
+use parity_scale_codec::Encode;
+use rand::{prelude::IteratorRandom, thread_rng};
use tempfile::TempDir;
use tokio::{
+ fs::File,
+ io::{AsyncBufReadExt, AsyncWriteExt, BufReader},
+ process::Child,
runtime::{self, Runtime},
- time,
+ sync::{broadcast, oneshot, watch, Mutex},
+ task::{spawn_blocking, JoinSet},
+ time::timeout,
};
-pub use unique_port;
-
-/// Network of peers
-pub struct Network {
- /// First peer, guaranteed to be online and submit genesis block.
- pub first_peer: Peer,
- /// Peers excluding the `first_peer`. Use [`Network::peers`] function to get all instead.
- ///
- /// [`BTreeMap`] is used in order to have deterministic order of peers.
- pub peers: BTreeMap<PeerId, Peer>,
+use toml::Table;
+
+const INSTANT_PIPELINE_TIME: Duration = Duration::from_millis(10);
+const DEFAULT_BLOCK_SYNC: Duration = Duration::from_millis(150);
+const PEER_START_TIMEOUT: Duration = Duration::from_secs(30);
+const PEER_SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(5);
+const SYNC_TIMEOUT: Duration = Duration::from_secs(30);
+
+fn iroha_bin() -> impl AsRef<Path> {
+ static PATH: OnceLock<PathBuf> = OnceLock::new();
+
+ PATH.get_or_init(|| match which::which("irohad") {
+ Ok(path) => path,
+ Err(_) => {
+ eprintln!(
+ "ERROR: could not locate `irohad` binary in $PATH\n \
+ It is required to run `iroha_test_network`.\n \
+ The easiest way to satisfy this is to run:\n\n \
+ cargo install ./crates/irohad --locked"
+ );
+ panic!("could not proceed without `irohad`, see the message above");
+ }
+ })
}
-/// Get a standardized blockchain id
-pub fn get_chain_id() -> ChainId {
- ChainId::from("00000000-0000-0000-0000-000000000000")
-}
+const TEMPDIR_PREFIX: &str = "irohad_test_network_";
+const TEMPDIR_IN_ENV: &str = "TEST_NETWORK_TMP_DIR";
-/// Get a key pair of a common signatory in the test network
-pub fn get_key_pair(signatory: Signatory) -> KeyPair {
- match signatory {
- Signatory::Peer => &PEER_KEYPAIR,
- Signatory::Genesis => &SAMPLE_GENESIS_ACCOUNT_KEYPAIR,
- Signatory::Alice => &ALICE_KEYPAIR,
- }
- .deref()
- .clone()
-}
+fn tempdir_in() -> Option<impl AsRef<Path>> {
+ static ENV: OnceLock<Option<PathBuf>> = OnceLock::new();
-/// A common signatory in the test network
-pub enum Signatory {
- Peer,
- Genesis,
- Alice,
+ ENV.get_or_init(|| std::env::var(TEMPDIR_IN_ENV).map(PathBuf::from).ok())
+ .as_ref()
}
-/// Trait used to differentiate a test instance of `genesis`.
-pub trait TestGenesis: Sized {
- /// Construct Iroha genesis
- fn test(topology: Vec<PeerId>) -> Self {
- Self::test_with_instructions::<InstructionBox>([], topology)
- }
+/// Network of peers
+pub struct Network {
+ peers: Vec<NetworkPeer>,
- /// Construct genesis with additional instructions
- fn test_with_instructions<T: Instruction>(
- extra_isi: impl IntoIterator<Item = T>,
- topology: Vec<PeerId>,
- ) -> Self;
-}
+ genesis: GenesisBlock,
+ block_time: Duration,
+ commit_time: Duration,
-impl TestGenesis for GenesisBlock {
- fn test_with_instructions<T: Instruction>(
- extra_isi: impl IntoIterator<Item = T>,
- topology: Vec<PeerId>,
- ) -> Self {
- let cfg = Config::test();
-
- // TODO: Fix this somehow. Probably we need to make `kagami` a library (#3253).
- let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR"));
- let mut genesis =
- RawGenesisTransaction::from_path(manifest_dir.join("../../defaults/genesis.json"))
- .expect("Failed to deserialize genesis block from file");
-
- let rose_definition_id = "rose#wonderland".parse::<AssetDefinitionId>().unwrap();
-
- let grant_modify_rose_permission = Grant::account_permission(
- CanMintAssetsWithDefinition {
- asset_definition: rose_definition_id.clone(),
- },
- ALICE_ID.clone(),
- );
- let grant_manage_peers_permission =
- Grant::account_permission(CanManagePeers, ALICE_ID.clone());
- let grant_manage_roles_permission =
- Grant::account_permission(CanManageRoles, ALICE_ID.clone());
- let grant_unregister_wonderland_domain = Grant::account_permission(
- CanUnregisterDomain {
- domain: "wonderland".parse().unwrap(),
- },
- ALICE_ID.clone(),
- );
- let grant_upgrade_executor_permission =
- Grant::account_permission(CanUpgradeExecutor, ALICE_ID.clone());
- for isi in [
- grant_modify_rose_permission,
- grant_manage_peers_permission,
- grant_manage_roles_permission,
- grant_unregister_wonderland_domain,
- grant_upgrade_executor_permission,
- ] {
- genesis.append_instruction(isi);
- }
+ config: Table,
+}
- for isi in extra_isi.into_iter() {
- genesis.append_instruction(isi);
- }
+impl Network {
+ /// Add a peer to the network.
+ pub fn add_peer(&mut self, peer: &NetworkPeer) {
+ self.peers.push(peer.clone());
+ }
- let genesis_key_pair = SAMPLE_GENESIS_ACCOUNT_KEYPAIR.clone();
- if &cfg.genesis.public_key != genesis_key_pair.public_key() {
- panic!("`Config::test` expected to use SAMPLE_GENESIS_ACCOUNT_KEYPAIR");
- }
- genesis
- .with_topology(topology)
- .build_and_sign(&genesis_key_pair)
- .expect("genesis should load fine")
+ /// Remove a peer from the network.
+ pub fn remove_peer(&mut self, peer: &NetworkPeer) {
+ self.peers.retain(|x| x != peer);
}
-}
-pub struct NetworkBuilder {
- n_peers: u32,
- port: Option<u16>,
- config: Option<Config>,
- /// Number of offline peers.
- /// By default all peers are online.
- offline_peers: Option<u32>,
- /// Number of peers which will submit genesis.
- /// By default only first peer submits genesis.
- genesis_peers: Option<u32>,
-}
+ /// Access network peers
+ pub fn peers(&self) -> &Vec<NetworkPeer> {
+ &self.peers
+ }
-impl NetworkBuilder {
- pub fn new(n_peers: u32, port: Option<u16>) -> Self {
- assert_ne!(n_peers, 0);
- Self {
- n_peers,
- port,
- config: None,
- offline_peers: None,
- genesis_peers: None,
- }
+ /// Get a random peer in the network
+ pub fn peer(&self) -> &NetworkPeer {
+ self.peers
+ .iter()
+ .choose(&mut thread_rng())
+ .expect("there is at least one peer")
}
- #[must_use]
- pub fn with_config(mut self, config: Config) -> Self {
- self.config = Some(config);
+ /// Start all peers, waiting until they are up and have committed genesis (submitted by one of them).
+ ///
+ /// # Panics
+ /// If some peer was already started
+ pub async fn start_all(&self) -> &Self {
+ timeout(
+ PEER_START_TIMEOUT,
+ self.peers
+ .iter()
+ .enumerate()
+ .map(|(i, peer)| async move {
+ peer.start(
+ self.config(),
+ // TODO: make 0 random?
+ (i == 0).then_some(&self.genesis),
+ )
+ .await;
+ peer.once_block(1).await;
+ })
+ .collect::<FuturesUnordered<_>>()
+ .collect::<Vec<_>>(),
+ )
+ .await
+ .expect("expected peers to start within timeout");
self
}
- #[must_use]
- pub fn with_offline_peers(mut self, offline_peers: u32) -> Self {
- assert!(offline_peers < self.n_peers);
- self.offline_peers = Some(offline_peers);
- self
+ /// Pipeline time of the network.
+ ///
+ /// Is relevant only if users haven't submitted [`SumeragiParameter`] changing it.
+ /// Users should do it through a network method (which hasn't been necessary yet).
+ pub fn pipeline_time(&self) -> Duration {
+ self.block_time + self.commit_time
}
- #[must_use]
- pub fn with_genesis_peers(mut self, genesis_peers: u32) -> Self {
- assert!(0 < genesis_peers && genesis_peers <= self.n_peers);
- self.genesis_peers = Some(genesis_peers);
- self
+ pub fn consensus_estimation(&self) -> Duration {
+ self.block_time + self.commit_time / 2
}
- /// Creates new network with options provided.
- pub async fn create(self) -> Network {
- let (builders, mut peers) = self.prepare_peers();
+ pub fn sync_timeout(&self) -> Duration {
+ SYNC_TIMEOUT
+ }
- let peer_infos = self.generate_peer_infos();
- let mut config = self.config.unwrap_or_else(Config::test);
- let topology = peers.iter().map(|peer| peer.id.clone()).collect::<Vec<_>>();
- config.sumeragi.trusted_peers.value_mut().others = UniqueVec::from_iter(topology.clone());
- let genesis_block = GenesisBlock::test(topology);
+ pub fn peer_startup_timeout(&self) -> Duration {
+ PEER_START_TIMEOUT
+ }
- let futures = FuturesUnordered::new();
- for ((builder, peer), peer_info) in builders
- .into_iter()
- .zip(peers.iter_mut())
- .zip(peer_infos.iter())
- {
- match peer_info {
- PeerInfo::Offline => { /* peer offline, do nothing */ }
- PeerInfo::Online { is_genesis } => {
- let future = builder
- .with_config(config.clone())
- .with_into_genesis(is_genesis.then(|| genesis_block.clone()))
- .start_with_peer(peer);
- futures.push(future);
- }
- }
- }
- futures.collect::<()>().await;
- time::sleep(Duration::from_millis(500) * (self.n_peers + 1)).await;
+ /// Get a client for a random peer in the network
+ pub fn client(&self) -> Client {
+ self.peer().client()
+ }
- assert_eq!(peer_infos[0], PeerInfo::Online { is_genesis: true });
- let first_peer = peers.remove(0);
- let other_peers = peers
- .into_iter()
- .map(|peer| (peer.id.clone(), peer))
- .collect::<BTreeMap<_, _>>();
- Network {
- first_peer,
- peers: other_peers,
- }
+ /// Chain ID of the network
+ pub fn chain_id(&self) -> ChainId {
+ config::chain_id()
}
- fn prepare_peers(&self) -> (Vec<PeerBuilder>, Vec<Peer>) {
- let mut builders = (0..self.n_peers)
- .map(|n| {
- let mut builder = PeerBuilder::new();
- if let Some(port) = self.port {
- let offset: u16 = (n * 5)
- .try_into()
- .expect("The `n_peers` is too large to fit into `u16`");
- builder = builder.with_port(port + offset)
- }
- builder
- })
- .collect::<Vec<_>>();
- let peers = builders
- .iter_mut()
- .map(PeerBuilder::build)
- .collect::<Result<Vec<_>>>()
- .expect("Failed to init peers");
- (builders, peers)
- }
-
- fn generate_peer_infos(&self) -> Vec<PeerInfo> {
- let n_peers = self.n_peers as usize;
- let n_offline_peers = self.offline_peers.unwrap_or(0) as usize;
- let n_genesis_peers = self.genesis_peers.unwrap_or(1) as usize;
- assert!(n_genesis_peers + n_offline_peers <= n_peers);
-
- let mut peers = (0..n_peers).collect::<Vec<_>>();
- let mut result = vec![PeerInfo::Online { is_genesis: false }; n_peers];
-
- // First n_genesis_peers will be genesis peers.
- // Last n_offline_peers will be offline peers.
- // First peer must be online and submit genesis so don't shuffle it.
- peers[1..].shuffle(&mut thread_rng());
- for &peer in &peers[0..n_genesis_peers] {
- result[peer] = PeerInfo::Online { is_genesis: true };
- }
- for &peer in peers.iter().rev().take(n_offline_peers) {
- result[peer] = PeerInfo::Offline;
- }
- result
+ /// Base configuration of all peers.
+ ///
+ /// Includes `sumeragi.trusted_peers` parameter, containing all currently present peers.
+ pub fn config(&self) -> Table {
+ self.config
+ .clone()
+ .write(["sumeragi", "trusted_peers"], self.topology())
+ }
+
+ /// Network genesis block.
+ pub fn genesis(&self) -> &GenesisBlock {
+ &self.genesis
}
- /// Creates new network with options provided.
- /// Returns network and client for connecting to it.
- pub async fn create_with_client(self) -> (Network, Client) {
- let network = self.create().await;
- let client = Client::test(&network.first_peer.api_address);
- (network, client)
+ /// Shutdown running peers
+ pub async fn shutdown(&self) -> &Self {
+ self.peers
+ .iter()
+ .filter(|peer| peer.is_running())
+ .map(|peer| peer.shutdown())
+ .collect::<FuturesUnordered<_>>()
+ .collect::<Vec<_>>()
+ .await;
+ self
+ }
+
+ fn topology(&self) -> UniqueVec<PeerId> {
+ self.peers.iter().map(|x| x.id.clone()).collect()
}
- /// Creates new network with options provided in a new async runtime.
- pub fn create_with_runtime(self) -> (Runtime, Network, Client) {
- let rt = Runtime::test();
- let (network, client) = rt.block_on(self.create_with_client());
- (rt, network, client)
+ /// Resolves when all _running_ peers have at least N blocks
+ /// # Errors
+ /// If this doesn't happen within a timeout.
+ pub async fn ensure_blocks(&self, height: u64) -> Result<&Self> {
+ timeout(
+ self.sync_timeout(),
+ self.peers
+ .iter()
+ .filter(|x| x.is_running())
+ .map(|x| x.once_block(height))
+ .collect::<FuturesUnordered<_>>()
+ .collect::<Vec<_>>(),
+ )
+ .await
+ .wrap_err_with(|| {
+ eyre!("Network hasn't reached the height of {height} block(s) within timeout")
+ })?;
+
+ eprintln!("network reached height={height}");
+
+ Ok(self)
}
}
-// Auxiliary enum for `NetworkBuilder::create` implementation
-#[derive(Debug, Clone, Eq, PartialEq)]
-enum PeerInfo {
- Online { is_genesis: bool },
- Offline,
+/// Builder of [`Network`]
+pub struct NetworkBuilder {
+ n_peers: usize,
+ config: Table,
+ pipeline_time: Option<Duration>,
+ extra_isi: Vec<InstructionBox>,
}
-impl Network {
- /// Collect the freeze handles from all non-genesis peers in the network.
- #[cfg(debug_assertions)]
- pub fn get_freeze_status_handles(&self) -> Vec<irohad::FreezeStatus> {
- self.peers
- .values()
- .filter_map(|peer| peer.irohad.as_ref())
- .map(|iroha| iroha.freeze_status())
- .cloned()
- .collect()
+impl Default for NetworkBuilder {
+ fn default() -> Self {
+ Self::new()
}
+}
- /// Starts network with peers with default configuration and
- /// specified options in a new async runtime. Returns its info
- /// and client for connecting to it.
- pub fn start_test_with_runtime(
- n_peers: u32,
- start_port: Option<u16>,
- ) -> (Runtime, Self, Client) {
- NetworkBuilder::new(n_peers, start_port).create_with_runtime()
+/// Test network builder
+impl NetworkBuilder {
+ /// Constructor
+ pub fn new() -> Self {
+ Self {
+ n_peers: 1,
+ config: config::base_iroha_config(),
+ pipeline_time: Some(INSTANT_PIPELINE_TIME),
+ extra_isi: vec![],
+ }
}
- /// Adds peer to network and waits for it to start block
- /// synchronization.
- pub async fn add_peer(&self) -> (Peer, Client) {
- let client = Client::test(&self.first_peer.api_address);
+ /// Set the number of peers in the network.
+ ///
+ /// One by default.
+ pub fn with_peers(mut self, n_peers: usize) -> Self {
+ assert_ne!(n_peers, 0);
+ self.n_peers = n_peers;
+ self
+ }
- let mut config = Config::test();
- config.sumeragi.trusted_peers.value_mut().others =
- UniqueVec::from_iter(self.peers().map(|peer| &peer.id).cloned());
+ /// Set the pipeline time.
+ ///
+ /// Translates into setting of the [`SumeragiParameter::BlockTimeMs`] (1/3) and
+ /// [`SumeragiParameter::CommitTimeMs`] (2/3) in the genesis block.
+ ///
+ /// Reflected in [`Network::pipeline_time`].
+ pub fn with_pipeline_time(mut self, duration: Duration) -> Self {
+ self.pipeline_time = Some(duration);
+ self
+ }
- let peer = PeerBuilder::new().with_config(config).start().await;
+ /// Do not overwrite default pipeline time ([`SumeragiParameters::default`]) in genesis.
+ pub fn with_default_pipeline_time(mut self) -> Self {
+ self.pipeline_time = None;
+ self
+ }
- time::sleep(Config::pipeline_time() + Config::block_sync_gossip_time()).await;
+ /// Add a layer of TOML configuration via [`TomlWriter`].
+ ///
+ /// # Example
+ ///
+ /// ```
+ /// use iroha_test_network::NetworkBuilder;
+ ///
+ /// NetworkBuilder::new().with_config(|t| {
+ /// t.write(["logger", "level"], "DEBUG");
+ /// });
+ /// ```
+ pub fn with_config<F>(mut self, f: F) -> Self
+ where
+ for<'a> F: FnOnce(&'a mut TomlWriter<'a>),
+ {
+ let mut writer = TomlWriter::new(&mut self.config);
+ f(&mut writer);
+ self
+ }
- let add_peer = Register::peer(DataModelPeer::new(peer.id.clone()));
- client.submit(add_peer).expect("Failed to add new peer.");
+ /// Append an instruction to genesis.
+ pub fn with_genesis_instruction(mut self, isi: impl Into<InstructionBox>) -> Self {
+ self.extra_isi.push(isi.into());
+ self
+ }
- let peer_client = Client::test(&peer.api_address);
- (peer, peer_client)
+ /// Build the [`Network`]. Doesn't start it.
+ pub fn build(self) -> Network {
+ let peers: Vec<_> = (0..self.n_peers).map(|_| NetworkPeer::generate()).collect();
+
+ let topology: UniqueVec<_> = peers.iter().map(|peer| peer.id.clone()).collect();
+
+ let block_sync_gossip_period = DEFAULT_BLOCK_SYNC;
+
+ let mut extra_isi = vec![];
+ let block_time;
+ let commit_time;
+ if let Some(duration) = self.pipeline_time {
+ block_time = duration / 3;
+ commit_time = duration / 2;
+ extra_isi.extend([
+ InstructionBox::SetParameter(SetParameter(Parameter::Sumeragi(
+ SumeragiParameter::BlockTimeMs(block_time.as_millis() as u64),
+ ))),
+ InstructionBox::SetParameter(SetParameter(Parameter::Sumeragi(
+ SumeragiParameter::CommitTimeMs(commit_time.as_millis() as u64),
+ ))),
+ ]);
+ } else {
+ block_time = SumeragiParameters::default().block_time();
+ commit_time = SumeragiParameters::default().commit_time();
+ }
+
+ let genesis = config::genesis(
+ [
+ InstructionBox::SetParameter(SetParameter(Parameter::Sumeragi(
+ SumeragiParameter::BlockTimeMs(block_time.as_millis() as u64),
+ ))),
+ InstructionBox::SetParameter(SetParameter(Parameter::Sumeragi(
+ SumeragiParameter::CommitTimeMs(commit_time.as_millis() as u64),
+ ))),
+ ]
+ .into_iter()
+ .chain(self.extra_isi),
+ topology,
+ );
+
+ Network {
+ peers,
+ genesis,
+ block_time,
+ commit_time,
+ config: self.config.write(
+ ["network", "block_gossip_period_ms"],
+ block_sync_gossip_period.as_millis() as u64,
+ ),
+ }
}
- /// Returns all peers.
- pub fn peers(&self) -> impl Iterator<Item = &Peer> + '_ {
- std::iter::once(&self.first_peer).chain(self.peers.values())
+ /// Same as [`Self::build`], but also creates a [`Runtime`].
+ ///
+ /// This method exists for convenience and to preserve compatibility with non-async tests.
+ pub fn build_blocking(self) -> (Network, Runtime) {
+ let rt = runtime::Builder::new_multi_thread()
+ .thread_stack_size(32 * 1024 * 1024)
+ .enable_all()
+ .build()
+ .unwrap();
+ let network = self.build();
+ (network, rt)
}
- /// Get active clients
- pub fn clients(&self) -> Vec<Client> {
- self.peers()
- .map(|peer| Client::test(&peer.api_address))
- .collect()
+ /// Build and start the network.
+ ///
+ /// Resolves when all peers are running and have committed genesis block.
+ /// See [`Network::start_all`].
+ pub async fn start(self) -> Result<Network> {
+ let network = self.build();
+ network.start_all().await;
+ Ok(network)
}
- /// Get peer by its Id.
- pub fn peer_by_id(&self, id: &PeerId) -> Option<&Peer> {
- self.peers.get(id).or(if self.first_peer.id == *id {
- Some(&self.first_peer)
- } else {
- None
- })
+ /// Combination of [`Self::build_blocking`] and [`Self::start`].
+ pub fn start_blocking(self) -> Result<(Network, Runtime)> {
+ let (network, rt) = self.build_blocking();
+ rt.block_on(async { network.start_all().await });
+ Ok((network, rt))
}
}
-/// Wait for peers to have committed genesis block.
+/// A common signatory in the test network.
///
-/// # Panics
-/// When unsuccessful after `MAX_RETRIES`.
-pub fn wait_for_genesis_committed(clients: &[Client], offline_peers: u32) {
- const MAX_RETRIES: u32 = 200;
- wait_for_genesis_committed_with_max_retries(clients, offline_peers, MAX_RETRIES)
-}
-
-/// Wait for peers to have committed genesis block for specified amount of retries.
-/// Each retry once per second.
+/// # Example
///
-/// # Panics
-/// When unsuccessful after `max_retries`.
-pub fn wait_for_genesis_committed_with_max_retries(
- clients: &[Client],
- offline_peers: u32,
- max_retries: u32,
-) {
- const POLL_PERIOD: Duration = Duration::from_millis(5000);
-
- for _ in 0..max_retries {
- let ready_peers = clients
- .iter()
- .map(|client| {
- let is_ready = match client.get_status() {
- Ok(status) => status.blocks >= 1,
- Err(error) => {
- warn!("Error retrieving peer status: {:?}", error);
- false
- }
- };
- is_ready as u32
- })
- .sum::<u32>();
+/// ```
+/// use iroha_test_network::Signatory;
+///
+/// let _alice_kp = Signatory::Alice.key_pair();
+/// ```
+pub enum Signatory {
+ Peer,
+ Genesis,
+ Alice,
+}
- let without_genesis_peers = clients.len() as u32 - ready_peers;
- if without_genesis_peers <= offline_peers {
- return;
+impl Signatory {
+ /// Get the associated key pair
+ pub fn key_pair(&self) -> &KeyPair {
+ match self {
+ Signatory::Peer => &PEER_KEYPAIR,
+ Signatory::Genesis => &SAMPLE_GENESIS_ACCOUNT_KEYPAIR,
+ Signatory::Alice => &ALICE_KEYPAIR,
}
- thread::sleep(POLL_PERIOD);
+ .deref()
}
- panic!(
- "Failed to wait for online peers to commit genesis block. Total wait time: {:?}",
- POLL_PERIOD * max_retries
- );
}
-/// Peer structure
-pub struct Peer {
- /// The id of the peer
- pub id: PeerId,
- /// API address
- pub api_address: SocketAddr,
- /// P2P address
- pub p2p_address: SocketAddr,
- /// The key-pair for the peer
- pub key_pair: KeyPair,
- /// Shutdown handle
- shutdown: ShutdownSignal,
- /// Iroha server
- pub irohad: Option<Iroha>,
- /// Temporary directory
- // Note: last field to be dropped after Iroha (struct fields drops in FIFO RFC 1857)
- pub temp_dir: Option<Arc<TempDir>>,
+/// Running Iroha peer.
+///
+/// Aborts peer forcefully when dropped
+#[derive(Debug)]
+struct PeerRun {
+ tasks: JoinSet<()>,
+ shutdown: oneshot::Sender<()>,
}
-impl From<Peer> for Box<iroha_core::tx::Peer> {
- fn from(val: Peer) -> Self {
- Box::new(iroha_data_model::peer::Peer::new(val.id.clone()))
- }
+/// Lifecycle events of a peer
+#[derive(Copy, Clone, Debug)]
+pub enum PeerLifecycleEvent {
+ /// Process spawned
+ Spawned,
+ /// Server started to respond
+ ServerStarted,
+ /// Process terminated
+ Terminated { status: ExitStatus },
+ /// Process was killed
+ Killed,
+ /// Caught a related pipeline event
+ BlockApplied { height: u64 },
}
-impl std::cmp::PartialEq for Peer {
- fn eq(&self, other: &Self) -> bool {
- self.id == other.id
- }
+/// Controls execution of `irohad` child process.
+///
+/// While exists, allocates socket ports and a temporary directory (not cleared automatically).
+///
+/// It can be started and shut down repeatedly.
+/// It stores configuration and logs for each run separately.
+///
+/// When dropped, aborts the child process (if it is running).
+#[derive(Clone, Debug)]
+pub struct NetworkPeer {
+ id: PeerId,
+ key_pair: KeyPair,
+ dir: Arc<TempDir>,
+ run: Arc<Mutex<Option<PeerRun>>>,
+ runs_count: Arc<AtomicUsize>,
+ is_running: Arc<AtomicBool>,
+ events: broadcast::Sender<PeerLifecycleEvent>,
+ block_height: watch::Sender<Option<u64>>,
+ // dropping these the last
+ port_p2p: Arc<AllocatedPort>,
+ port_api: Arc<AllocatedPort>,
}
-impl std::cmp::Eq for Peer {}
+impl NetworkPeer {
+ /// Generate a random peer
+ pub fn generate() -> Self {
+ let key_pair = KeyPair::random();
+ let port_p2p = AllocatedPort::new();
+ let port_api = AllocatedPort::new();
+ let id = PeerId::new(
+ socket_addr!(127.0.0.1:*port_p2p),
+ key_pair.public_key().clone(),
+ );
+ let temp_dir = Arc::new({
+ let mut builder = tempfile::Builder::new();
+ builder.keep(true).prefix(TEMPDIR_PREFIX);
+ match tempdir_in() {
+ Some(path) => builder.tempdir_in(path),
+ None => builder.tempdir(),
+ }
+ .expect("temp dirs must be available in the system")
+ });
-impl Drop for Peer {
- fn drop(&mut self) {
- // TODO: wait for complete shutdown
- self.terminate();
- }
-}
+ let (events, _rx) = broadcast::channel(32);
+ let (block_height, _rx) = watch::channel(None);
-impl Peer {
- /// Returns per peer config with all addresses, keys, and id set up.
- fn get_config(&self, config: Config) -> Config {
- use iroha_config::{
- base::WithOrigin,
- parameters::actual::{Common, Network, Torii},
+ let result = Self {
+ id,
+ key_pair,
+ dir: temp_dir,
+ run: Default::default(),
+ runs_count: Default::default(),
+ is_running: Default::default(),
+ events,
+ block_height,
+ port_p2p: Arc::new(port_p2p),
+ port_api: Arc::new(port_api),
};
- let peer_id = PeerId::new(self.p2p_address.clone(), self.key_pair.public_key().clone());
- Config {
- common: Common {
- key_pair: self.key_pair.clone(),
- peer: peer_id.clone(),
- ..config.common
- },
- network: Network {
- address: WithOrigin::inline(self.p2p_address.clone()),
- ..config.network
- },
- torii: Torii {
- address: WithOrigin::inline(self.api_address.clone()),
- ..config.torii
- },
- sumeragi: Sumeragi {
- trusted_peers: WithOrigin::inline(TrustedPeers {
- myself: peer_id,
- others: config.sumeragi.trusted_peers.into_value().others,
- }),
- ..config.sumeragi
- },
- ..config
- }
- }
-
- /// Starts a peer with arguments.
- async fn start(
- &mut self,
- config: Config,
- genesis: Option<GenesisBlock>,
- temp_dir: Arc<TempDir>,
- ) {
- let mut config = self.get_config(config);
- *config.kura.store_dir.value_mut() = temp_dir.path().to_str().unwrap().into();
- let info_span = iroha_logger::info_span!(
- "test-peer",
- p2p_addr = %self.p2p_address,
- api_addr = %self.api_address,
+ eprintln!(
+ "{} generated peer, dir: {}",
+ result.log_prefix(),
+ result.dir.path().display()
);
- let logger = iroha_logger::test_logger();
-
- let (irohad, run_fut) = Iroha::start(config, genesis, logger, self.shutdown.clone())
- .await
- .expect("Iroha should start in test network");
- let _handle = tokio::spawn(
- async move {
- if let Err(error) = run_fut.await {
- iroha_logger::error!(?error, "Peer exited with an error");
- };
- }
- .instrument(info_span),
- );
-
- self.irohad = Some(irohad);
- // Prevent temporary directory deleting
- self.temp_dir = Some(temp_dir);
+ result
}
- /// Terminate the peer
- // FIXME: support _complete_ forceful termination, with waiting for full abort
- pub fn terminate(&mut self) {
- if let Some(_irohad) = self.irohad.take() {
- iroha_logger::info!(
- p2p_addr = %self.p2p_address,
- api_addr = %self.api_address,
- "Terminating peer",
- );
- self.shutdown.send();
- }
+ fn log_prefix(&self) -> String {
+ format!("[PEER p2p: {}, api: {}]", self.port_p2p, self.port_api)
}
- /// Creates peer
+ /// Spawn the child process.
///
- /// # Errors
- /// * If can't get a unique port for
- /// - `p2p_address`
- /// - `api_address`
- /// * If keypair generation fails
- pub fn new() -> Result<Self> {
- let key_pair = KeyPair::random();
- let p2p_address = local_unique_port()?;
- let api_address = local_unique_port()?;
- let id = PeerId::new(p2p_address.clone(), key_pair.public_key().clone());
- let shutdown = ShutdownSignal::new();
- Ok(Self {
- id,
- key_pair,
- p2p_address,
- api_address,
- shutdown,
- irohad: None,
- temp_dir: None,
- })
- }
-}
+ /// Passed configuration must contain network topology in the `sumeragi.trusted_peers` parameter.
+ ///
+ /// This function doesn't wait for peer server to start working, or for it to commit genesis block.
+ /// Iroha could as well terminate immediately with an error, and it is not tracked by this function.
+ /// Use [`Self::events`]/[`Self::once`] to monitor peer's lifecycle.
+ ///
+ /// # Panics
+ /// If peer was not started.
+ pub async fn start(&self, config: Table, genesis: Option<&GenesisBlock>) {
+ let mut run_guard = self.run.lock().await;
+ assert!(run_guard.is_none(), "already running");
+
+ let run_num = self.runs_count.fetch_add(1, Ordering::Relaxed) + 1;
+
+ let log_prefix = self.log_prefix();
+ eprintln!("{log_prefix} starting (run #{run_num})");
+
+ let mut config = config
+ .clone()
+ .write("public_key", self.key_pair.public_key())
+ .write(
+ "private_key",
+ ExposedPrivateKey(self.key_pair.private_key().clone()),
+ )
+ .write(
+ ["network", "address"],
+ format!("127.0.0.1:{}", self.port_p2p),
+ )
+ .write(["torii", "address"], format!("127.0.0.1:{}", self.port_api))
+ .write(["logger", "format"], "json");
+
+ let config_path = self.dir.path().join(format!("run-{run_num}-config.toml"));
+ let genesis_path = self.dir.path().join(format!("run-{run_num}-genesis.scale"));
+
+ if genesis.is_some() {
+ config = config.write(["genesis", "file"], &genesis_path);
+ }
-/// `WithGenesis` structure.
-///
-/// Options for setting up the genesis for `PeerBuilder`.
-#[derive(Default)]
-pub enum WithGenesis {
- /// Use the default genesis.
- #[default]
- Default,
- /// Do not use any genesis.
- None,
- /// Use the given genesis.
- Has(GenesisBlock),
-}
+ tokio::fs::write(
+ &config_path,
+ toml::to_string(&config).expect("TOML config is valid"),
+ )
+ .await
+ .expect("temp directory exists and there was no config file before");
+
+ if let Some(genesis) = genesis {
+ tokio::fs::write(genesis_path, genesis.0.encode())
+ .await
+ .expect("tmp dir is available and genesis was not written before");
+ }
-impl From<Option<GenesisBlock>> for WithGenesis {
- fn from(genesis: Option<GenesisBlock>) -> Self {
- genesis.map_or(Self::None, Self::Has)
- }
-}
+ let mut cmd = tokio::process::Command::new(iroha_bin().as_ref());
+ cmd.stdout(Stdio::piped())
+ .stderr(Stdio::piped())
+ .kill_on_drop(true)
+ .arg("--config")
+ .arg(config_path);
+ cmd.current_dir(self.dir.path());
+ let mut child = cmd.spawn().expect("spawn failure is abnormal");
+ self.is_running.store(true, Ordering::Relaxed);
+ let _ = self.events.send(PeerLifecycleEvent::Spawned);
-/// `PeerBuilder`.
-#[derive(Default)]
-pub struct PeerBuilder {
- config: Option<Config>,
- genesis: WithGenesis,
- temp_dir: Option<Arc<TempDir>>,
- port: Option<u16>,
-}
+ let mut tasks = JoinSet::<()>::new();
-impl PeerBuilder {
- /// Create [`PeerBuilder`].
- pub fn new() -> Self {
- Self::default()
- }
+ {
+ // let mut events_tx = self.events.clone();
+ let output = child.stdout.take().unwrap();
+ let mut file = File::create(self.dir.path().join(format!("run-{run_num}-stdout.log")))
+ .await
+ .unwrap();
+ tasks.spawn(async move {
+ let mut lines = BufReader::new(output).lines();
+ while let Ok(Some(line)) = lines.next_line().await {
+ // let value: serde_json::Value =
+ // serde_json::from_str(&line).expect("each log line is a valid JSON");
+ // handle_peer_log_message(&value, &mut events_tx);
+
+ file.write_all(line.as_bytes())
+ .await
+ .expect("writing logs to file shouldn't fail");
+ file.flush()
+ .await
+ .expect("writing logs to file shouldn't fail");
+ }
+ });
+ }
+ {
+ let output = child.stderr.take().unwrap();
+ let mut file = File::create(self.dir.path().join(format!("run-{run_num}-stderr.log")))
+ .await
+ .unwrap();
+ tasks.spawn(async move {
+ // TODO: handle panic?
+ tokio::io::copy(&mut BufReader::new(output), &mut file)
+ .await
+ .expect("writing logs to file shouldn't fail");
+ });
+ }
- /// Set the optional port on which to start the peer.
- /// As there are also API and telemetry ports being
- /// initialized when building a peer, subsequent peers
- /// need to be specified in at least increments of 3.
- #[must_use]
- pub fn with_port(mut self, port: u16) -> Self {
- self.port = Some(port);
- self
- }
+ let (shutdown_tx, shutdown_rx) = oneshot::channel::<()>();
+ let peer_exit = PeerExit {
+ child,
+ log_prefix: log_prefix.clone(),
+ is_running: self.is_running.clone(),
+ events: self.events.clone(),
+ block_height: self.block_height.clone(),
+ };
+ tasks.spawn(async move {
+ if let Err(err) = peer_exit.monitor(shutdown_rx).await {
+ eprintln!("something went very bad during peer exit monitoring: {err}");
+ panic!()
+ }
+ });
- /// Set the optional genesis.
- #[must_use]
- pub fn with_into_genesis(mut self, genesis: impl Into<WithGenesis>) -> Self {
- self.genesis = genesis.into();
- self
- }
+ {
+ let log_prefix = log_prefix.clone();
+ let client = self.client();
+ let events_tx = self.events.clone();
+ let block_height_tx = self.block_height.clone();
+ tasks.spawn(async move {
+ let status_client = client.clone();
+ let status = backoff::future::retry(
+ ExponentialBackoffBuilder::new()
+ .with_initial_interval(Duration::from_millis(50))
+ .with_max_interval(Duration::from_secs(1))
+ .with_max_elapsed_time(None)
+ .build(),
+ move || {
+ let client = status_client.clone();
+ async move {
+ let status = spawn_blocking(move || client.get_status())
+ .await
+ .expect("should not panic")?;
+ Ok(status)
+ }
+ },
+ )
+ .await
+ .expect("there is no max elapsed time");
+ let _ = events_tx.send(PeerLifecycleEvent::ServerStarted);
+ let _ = block_height_tx.send(Some(status.blocks));
+ eprintln!("{log_prefix} server started, {status:?}");
+
+ let mut events = client
+ .listen_for_events_async([
+ EventFilterBox::from(BlockEventFilter::default()),
+ // TransactionEventFilter::default().into(),
+ ])
+ .await
+ .unwrap_or_else(|err| {
+ eprintln!("{log_prefix} failed to subscribe on events: {err}");
+ panic!("cannot proceed")
+ });
+
+ while let Some(Ok(event)) = events.next().await {
+ if let EventBox::Pipeline(PipelineEventBox::Block(block)) = event {
+ // FIXME: should we wait for `Applied` event instead?
+ if *block.status() == BlockStatus::Applied {
+ let height = block.header().height().get();
+ eprintln!("{log_prefix} BlockStatus::Applied height={height}",);
+ let _ = events_tx.send(PeerLifecycleEvent::BlockApplied { height });
+ block_height_tx.send_modify(|x| *x = Some(height));
+ }
+ }
+ }
+ eprintln!("{log_prefix} events stream is closed");
+ });
+ }
- /// Set the genesis.
- #[must_use]
- pub fn with_genesis(mut self, genesis: GenesisBlock) -> Self {
- self.genesis = WithGenesis::Has(genesis);
- self
+ *run_guard = Some(PeerRun {
+ tasks,
+ shutdown: shutdown_tx,
+ });
}
- /// Set Iroha configuration
- #[must_use]
- pub fn with_config(mut self, config: Config) -> Self {
- self.config = Some(config);
- self
+ /// Forcefully kills the running peer
+ ///
+ /// # Panics
+ /// If peer was not started.
+ pub async fn shutdown(&self) {
+ let mut guard = self.run.lock().await;
+ let Some(run) = (*guard).take() else {
+ panic!("peer is not running, nothing to shut down");
+ };
+ if self.is_running() {
+ let _ = run.shutdown.send(());
+ timeout(PEER_SHUTDOWN_TIMEOUT, run.tasks.join_all())
+ .await
+ .expect("run-related tasks should exit within timeout");
+ assert!(!self.is_running());
+ }
}
- /// Set the directory to be used as a stub.
- #[must_use]
- pub fn with_dir(mut self, temp_dir: Arc<TempDir>) -> Self {
- self.temp_dir.replace(temp_dir);
- self
+ /// Subscribe on peer lifecycle events.
+ pub fn events(&self) -> broadcast::Receiver<PeerLifecycleEvent> {
+ self.events.subscribe()
}
- /// Build the test [`Peer`] struct, currently
- /// only setting endpoint addresses if a
- /// starting port was provided. Does not
- /// consume [`Self`] as other methods could need
- /// to create a peer beforehand, but takes out
- /// the value from [`self.port`] to prevent accidental
- /// port collision.
+ /// Wait _once_ an event matches a predicate.
///
- /// # Errors
- /// - Same as [`Peer::new()`]
- pub fn build(&mut self) -> Result<Peer> {
- let mut peer = Peer::new()?;
- if let Some(port) = self.port.take() {
- peer.p2p_address = socket_addr!(127.0.0 .1: port);
- peer.api_address = socket_addr!(127.0.0 .1: port + 1);
- // prevent field desync
- peer.id.address = peer.p2p_address.clone();
+ /// ```
+ /// use iroha_test_network::{Network, NetworkBuilder, PeerLifecycleEvent};
+ ///
+ /// #[tokio::main]
+ /// async fn mail() {
+ /// let network = NetworkBuilder::new().build();
+ /// let peer = network.peer();
+ ///
+ /// tokio::join!(
+ /// peer.start(network.config(), None),
+ /// peer.once(|event| matches!(event, PeerLifecycleEvent::ServerStarted))
+ /// );
+ /// }
+ /// ```
+ ///
+ /// It is a narrowed version of [`Self::events`].
+ pub async fn once<F>(&self, f: F)
+ where
+ F: Fn(PeerLifecycleEvent) -> bool,
+ {
+ let mut rx = self.events();
+ loop {
+ tokio::select! {
+ Ok(event) = rx.recv() => {
+ if f(event) { break }
+ }
+ }
}
- Ok(peer)
}
- /// Accept a peer and starts it.
- pub async fn start_with_peer(self, peer: &mut Peer) {
- let config = self.config.unwrap_or_else(Config::test);
- let genesis = match self.genesis {
- WithGenesis::Default => {
- let topology = vec![peer.id.clone()];
- Some(GenesisBlock::test(topology))
- }
- WithGenesis::None => None,
- WithGenesis::Has(genesis) => Some(genesis),
- };
- let temp_dir = self
- .temp_dir
- .unwrap_or_else(|| Arc::new(TempDir::new().expect("Failed to create temp dir.")));
+ /// Wait until peer's block height reaches N.
+ ///
+ /// Resolves immediately if peer is already running _and_ its current block height is greater or equal to N.
+ pub async fn once_block(&self, n: u64) {
+ let mut recv = self.block_height.subscribe();
- peer.start(config, genesis, temp_dir).await;
- }
+ if recv.borrow().map(|x| x >= n).unwrap_or(false) {
+ return;
+ }
- /// Create and start a peer with preapplied arguments.
- pub async fn start(mut self) -> Peer {
- let mut peer = self.build().expect("Failed to build a peer.");
- self.start_with_peer(&mut peer).await;
- peer
- }
+ loop {
+ recv.changed()
+ .await
+ .expect("could fail only if the peer is dropped");
- /// Create and start a peer, create a client and connect it to the peer and return both.
- pub async fn start_with_client(self) -> (Peer, Client) {
- let peer = self.start().await;
- let client = Client::test(&peer.api_address);
- time::sleep(<Config as TestConfig>::pipeline_time()).await;
+ if recv.borrow_and_update().map(|x| x >= n).unwrap_or(false) {
+ break;
+ }
+ }
+ }
- (peer, client)
+ /// Generated [`PeerId`]
+ pub fn id(&self) -> PeerId {
+ self.id.clone()
}
- /// Create a peer with a client, create a runtime, and synchronously start the peer on the runtime.
- pub fn start_with_runtime(self) -> PeerWithRuntimeAndClient {
- let rt = Runtime::test();
- let (peer, client) = rt.block_on(self.start_with_client());
- (rt, peer, client)
+ /// Check whether the peer is running
+ pub fn is_running(&self) -> bool {
+ self.is_running.load(Ordering::Relaxed)
}
-}
-type PeerWithRuntimeAndClient = (Runtime, Peer, Client);
+ /// Create a client to interact with this peer
+ pub fn client_for(&self, account_id: &AccountId, account_private_key: PrivateKey) -> Client {
+ let config = ConfigReader::new()
+ .with_toml_source(TomlSource::inline(
+ Table::new()
+ .write("chain", config::chain_id())
+ .write(["account", "domain"], account_id.domain())
+ .write(["account", "public_key"], account_id.signatory())
+ .write(["account", "private_key"], account_private_key.expose())
+ .write("torii_url", format!("http://127.0.0.1:{}", self.port_api)),
+ ))
+ .read_and_complete::<iroha::config::UserConfig>()
+ .expect("peer client config should be valid")
+ .parse()
+ .expect("peer client config should be valid");
-fn local_unique_port() -> Result<SocketAddr> {
- Ok(socket_addr!(127.0.0.1: unique_port::get_unique_free_port().map_err(eyre::Error::msg)?))
-}
+ Client::new(config)
+ }
-/// Runtime used for testing.
-pub trait TestRuntime {
- /// Create test runtime
- fn test() -> Self;
-}
+ /// Client for Alice. ([`Self::client_for`] + [`Signatory::Alice`])
+ pub fn client(&self) -> Client {
+ self.client_for(&ALICE_ID, ALICE_KEYPAIR.private_key().clone())
+ }
-/// Peer configuration mocking trait.
-pub trait TestConfig {
- /// Creates test configuration
- fn test() -> Self;
- /// Returns default pipeline time.
- fn pipeline_time() -> Duration;
- /// Returns default time between block sync requests
- fn block_sync_gossip_time() -> Duration;
-}
+ pub async fn status(&self) -> Result<Status> {
+ let client = self.client();
+ spawn_blocking(move || client.get_status())
+ .await
+ .expect("should not panic")
+ }
-/// Client configuration mocking trait.
-pub trait TestClientConfig {
- /// Creates test client configuration
- fn test(api_address: &SocketAddr) -> Self;
+ pub fn blocks(&self) -> watch::Receiver<Option<u64>> {
+ self.block_height.subscribe()
+ }
}
-/// Client mocking trait
-pub trait TestClient: Sized {
- /// Create test client from api url
- fn test(api_url: &SocketAddr) -> Self;
-
- /// Create test client from api url and keypair
- fn test_with_key(api_url: &SocketAddr, keys: KeyPair) -> Self;
-
- /// Create test client from api url, keypair, and account id
- fn test_with_account(api_url: &SocketAddr, keys: KeyPair, account_id: &AccountId) -> Self;
-
- /// Loop for events with filter and handler function
- fn for_each_event(self, event_filter: impl Into<EventFilterBox>, f: impl Fn(Result<EventBox>));
-
- /// Polls request till predicate `f` is satisfied, with default period and max attempts.
- ///
- /// # Errors
- /// If predicate is not satisfied after maximum retries.
- fn poll(&self, f: impl FnOnce(&Self) -> Result<bool> + Clone) -> eyre::Result<()>;
-
- /// Polls request till predicate `f` is satisfied with `period` and `max_attempts` supplied.
- ///
- /// # Errors
- /// If predicate is not satisfied after maximum retries.
- fn poll_with_period(
- &self,
- period: Duration,
- max_attempts: u32,
- f: impl FnOnce(&Self) -> Result<bool> + Clone,
- ) -> eyre::Result<()>;
+/// Compare by ID
+impl PartialEq for NetworkPeer {
+ fn eq(&self, other: &Self) -> bool {
+ self.id.eq(&other.id)
+ }
}
-impl TestRuntime for Runtime {
- fn test() -> Self {
- runtime::Builder::new_multi_thread()
- .thread_stack_size(32 * 1024 * 1024)
- .enable_all()
- .build()
- .unwrap()
+// fn handle_peer_log_message(log: &serde_json::Value, tx: &broadcast::Sender<PeerLifecycleEvent>) {
+// let is_info = log
+// .get("level")
+// .map(|level| level.as_str().map(|value| value == "INFO"))
+// .flatten()
+// .unwrap_or(false);
+//
+// let message = log
+// .get("fields")
+// .map(|fields| fields.get("message"))
+// .flatten()
+// .map(|v| v.as_str())
+// .flatten();
+//
+// if is_info && message.map(|x| x == "Block committed").unwrap_or(false) {
+// let height: u64 = log
+// .get("fields")
+// .expect("exists")
+// .get("new_height")
+// .expect("should exist for this message")
+// .as_str()
+// .expect("it is a string")
+// .parse()
+// .expect("it is a valid integer");
+//
+// let _ = tx.send(PeerLifecycleEvent::LogBlockCommitted { height });
+// }
+// }
+
+impl From<NetworkPeer> for Box<Peer> {
+ fn from(val: NetworkPeer) -> Self {
+ Box::new(Peer::new(val.id.clone()))
}
}
-impl TestConfig for Config {
- fn test() -> Self {
- use iroha_config::base::toml::TomlSource;
+struct PeerExit {
+ child: Child,
+ log_prefix: String,
+ is_running: Arc<AtomicBool>,
+ events: broadcast::Sender<PeerLifecycleEvent>,
+ block_height: watch::Sender<Option<u64>>,
+}
- let mut raw = irohad::samples::get_config_toml(
- <_>::default(),
- get_chain_id(),
- get_key_pair(Signatory::Peer),
- get_key_pair(Signatory::Genesis).public_key(),
- );
+impl PeerExit {
+ async fn monitor(mut self, shutdown: oneshot::Receiver<()>) -> Result<()> {
+ let status = tokio::select! {
+ status = self.child.wait() => status?,
+ _ = shutdown => self.shutdown_or_kill().await?,
+ };
- let (public_key, private_key) = KeyPair::random().into_parts();
- iroha_config::base::toml::Writer::new(&mut raw)
- .write("public_key", public_key)
- .write("private_key", ExposedPrivateKey(private_key));
+ eprintln!("{} {status}", self.log_prefix);
+ let _ = self.events.send(PeerLifecycleEvent::Terminated { status });
+ self.is_running.store(false, Ordering::Relaxed);
+ self.block_height.send_modify(|x| *x = None);
- Config::from_toml_source(TomlSource::inline(raw))
- .expect("Test Iroha config failed to build. This is likely to be a bug.")
+ Ok(())
}
- fn pipeline_time() -> Duration {
- let defaults = iroha_data_model::parameter::SumeragiParameters::default();
- defaults.block_time() + defaults.commit_time()
- }
+ async fn shutdown_or_kill(&mut self) -> Result<ExitStatus> {
+ use nix::{sys::signal, unistd::Pid};
+ const TIMEOUT: Duration = Duration::from_secs(5);
- fn block_sync_gossip_time() -> Duration {
- Self::test().block_sync.gossip_period
- }
-}
+ eprintln!("{} sending SIGTERM", self.log_prefix);
+ signal::kill(
+ Pid::from_raw(self.child.id().ok_or(eyre!("race condition"))? as i32),
+ signal::Signal::SIGTERM,
+ )
+ .wrap_err("failed to send SIGTERM")?;
-// Increased timeout to prevent flaky tests
-const TRANSACTION_STATUS_TIMEOUT: Duration = Duration::from_secs(150);
-
-impl TestClientConfig for ClientConfig {
- fn test(api_address: &SocketAddr) -> Self {
- let mut config = iroha::samples::get_client_config(
- get_chain_id(),
- get_key_pair(Signatory::Alice),
- format!("http://{api_address}")
- .parse()
- .expect("should be valid url"),
+ if let Ok(status) = timeout(TIMEOUT, self.child.wait()).await {
+ eprintln!("{} exited gracefully", self.log_prefix);
+ return status.wrap_err("wait failure");
+ };
+ eprintln!(
+ "{} process didn't terminate after {TIMEOUT:?}, killing",
+ self.log_prefix
);
- config.transaction_status_timeout = TRANSACTION_STATUS_TIMEOUT;
- config
+ timeout(TIMEOUT, async move {
+ self.child.kill().await.expect("not a recoverable failure");
+ self.child.wait().await
+ })
+ .await
+ .wrap_err("didn't terminate after SIGKILL")?
+ .wrap_err("wait failure")
}
}
-impl TestClient for Client {
- fn test(api_addr: &SocketAddr) -> Self {
- Client::new(ClientConfig::test(api_addr))
- }
-
- fn test_with_key(api_addr: &SocketAddr, keys: KeyPair) -> Self {
- let mut config = ClientConfig::test(api_addr);
- config.key_pair = keys;
- Client::new(config)
- }
-
- fn test_with_account(api_addr: &SocketAddr, keys: KeyPair, account_id: &AccountId) -> Self {
- let mut config = ClientConfig::test(api_addr);
- config.account = account_id.clone();
- config.key_pair = keys;
- Client::new(config)
- }
-
- fn for_each_event(self, event_filter: impl Into<EventFilterBox>, f: impl Fn(Result<EventBox>)) {
- for event_result in self
- .listen_for_events([event_filter])
- .expect("Failed to create event iterator.")
- {
- f(event_result)
- }
- }
-
- fn poll_with_period(
- &self,
- period: Duration,
- max_attempts: u32,
- f: impl FnOnce(&Self) -> Result<bool> + Clone,
- ) -> eyre::Result<()> {
- for _ in 0..max_attempts {
- if f.clone()(self)? {
- return Ok(());
- };
- thread::sleep(period);
- }
- Err(eyre::eyre!(
- "Failed to wait for query request completion that would satisfy specified closure"
- ))
- }
+#[cfg(test)]
+mod tests {
+ use super::*;
- fn poll(&self, f: impl FnOnce(&Self) -> Result<bool> + Clone) -> eyre::Result<()> {
- self.poll_with_period(Config::pipeline_time() / 2, 10, f)
+ #[tokio::test]
+ async fn can_start_networks() {
+ NetworkBuilder::new().with_peers(4).start().await.unwrap();
+ NetworkBuilder::new().start().await.unwrap();
}
}
diff --git a/crates/iroha_torii/src/lib.rs b/crates/iroha_torii/src/lib.rs
index 136fedeeecb..f63da3ff4df 100644
--- a/crates/iroha_torii/src/lib.rs
+++ b/crates/iroha_torii/src/lib.rs
@@ -39,10 +39,7 @@ use tower_http::{
timeout::TimeoutLayer,
trace::{DefaultMakeSpan, TraceLayer},
};
-use utils::{
- extractors::{ExtractAccept, ScaleVersioned},
- Scale,
-};
+use utils::{extractors::ScaleVersioned, Scale};
#[macro_use]
pub(crate) mod utils;
@@ -115,7 +112,7 @@ impl Torii {
&format!("{}/*tail", uri::STATUS),
get({
let metrics_reporter = self.metrics_reporter.clone();
- move |accept: Option<ExtractAccept>, axum::extract::Path(tail): axum::extract::Path<String>| {
+ move |accept: Option<utils::extractors::ExtractAccept>, axum::extract::Path(tail): axum::extract::Path<String>| {
core::future::ready(routing::handle_status(
&metrics_reporter,
accept.map(|extract| extract.0),
@@ -128,7 +125,7 @@ impl Torii {
uri::STATUS,
get({
let metrics_reporter = self.metrics_reporter.clone();
- move |accept: Option<ExtractAccept>| {
+ move |accept: Option<utils::extractors::ExtractAccept>| {
core::future::ready(routing::handle_status(&metrics_reporter, accept.map(|extract| extract.0), None))
}
}),
diff --git a/crates/iroha_torii/src/utils.rs b/crates/iroha_torii/src/utils.rs
index f5afe132bbc..bf861b8ec58 100644
--- a/crates/iroha_torii/src/utils.rs
+++ b/crates/iroha_torii/src/utils.rs
@@ -64,6 +64,7 @@ pub mod extractors {
}
/// Extractor of Accept header
+ #[allow(unused)] // unused without `telemetry` feature
pub struct ExtractAccept(pub HeaderValue);
#[async_trait]
diff --git a/crates/iroha_wasm_builder/src/lib.rs b/crates/iroha_wasm_builder/src/lib.rs
index 0311a05b95a..bd0f2dd32d7 100644
--- a/crates/iroha_wasm_builder/src/lib.rs
+++ b/crates/iroha_wasm_builder/src/lib.rs
@@ -361,6 +361,7 @@ impl Output {
}
// TODO: Remove cargo invocation (#2152)
+#[allow(unreachable_code, unused)]
fn cargo_command() -> Command {
const INSTRUMENT_COVERAGE_FLAG: &str = "instrument-coverage";
for var in ["RUSTFLAGS", "CARGO_ENCODED_RUSTFLAGS"] {
diff --git a/crates/irohad/src/lib.rs b/crates/irohad/src/lib.rs
deleted file mode 100644
index 7875c67f69f..00000000000
--- a/crates/irohad/src/lib.rs
+++ /dev/null
@@ -1,855 +0,0 @@
-//! Common primitives for a CLI instance of Iroha. If you're
-//! customising it for deployment, use this crate as a reference to
-//! add more complex behaviour, TUI, GUI, monitoring, etc.
-//!
-//! `Iroha` is the main instance of the peer program. `Arguments`
-//! should be constructed externally: (see `main.rs`).
-#[cfg(debug_assertions)]
-use core::sync::atomic::{AtomicBool, Ordering};
-use std::{
- future::Future,
- path::{Path, PathBuf},
- sync::Arc,
- time::Duration,
-};
-
-use clap::Parser;
-use error_stack::{IntoReportCompat, Report, Result, ResultExt};
-use iroha_config::{
- base::{read::ConfigReader, util::Emitter, WithOrigin},
- parameters::{actual::Root as Config, user::Root as UserConfig},
-};
-#[cfg(feature = "telemetry")]
-use iroha_core::metrics::MetricsReporter;
-use iroha_core::{
- block_sync::{BlockSynchronizer, BlockSynchronizerHandle},
- gossiper::{TransactionGossiper, TransactionGossiperHandle},
- kiso::KisoHandle,
- kura::Kura,
- query::store::LiveQueryStore,
- queue::Queue,
- smartcontracts::isi::Registrable as _,
- snapshot::{try_read_snapshot, SnapshotMaker, TryReadError as TryReadSnapshotError},
- state::{State, StateReadOnly, World},
- sumeragi::{GenesisWithPubKey, SumeragiHandle, SumeragiMetrics, SumeragiStartArgs},
- IrohaNetwork,
-};
-use iroha_data_model::{block::SignedBlock, prelude::*};
-use iroha_futures::supervisor::{Child, OnShutdown, ShutdownSignal, Supervisor};
-use iroha_genesis::GenesisBlock;
-use iroha_logger::{actor::LoggerHandle, InitConfig as LoggerInitConfig};
-use iroha_primitives::addr::SocketAddr;
-use iroha_torii::Torii;
-use iroha_version::scale::DecodeVersioned;
-use thiserror::Error;
-use tokio::{
- sync::{broadcast, mpsc},
- task,
-};
-
-// FIXME: move from CLI
-pub mod samples;
-
-const EVENTS_BUFFER_CAPACITY: usize = 10_000;
-
-/// [Orchestrator](https://en.wikipedia.org/wiki/Orchestration_%28computing%29)
-/// of the system. It configures, coordinates and manages transactions
-/// and queries processing, work of consensus and storage.
-pub struct Iroha {
- /// Kura — block storage
- kura: Arc<Kura>,
- /// State of blockchain
- state: Arc<State>,
- /// A boolean value indicating whether or not the peers will receive data from the network.
- /// Used in sumeragi testing.
- #[cfg(debug_assertions)]
- pub freeze_status: FreezeStatus,
-}
-
-/// Error(s) that might occur while starting [`Iroha`]
-#[derive(thiserror::Error, Debug, Copy, Clone)]
-#[allow(missing_docs)]
-pub enum StartError {
- #[error("Unable to start peer-to-peer network")]
- StartP2p,
- #[error("Unable to initialize Kura (block storage)")]
- InitKura,
- #[error("Unable to start dev telemetry service")]
- StartDevTelemetry,
- #[error("Unable to start telemetry service")]
- StartTelemetry,
- #[error("Unable to set up listening for OS signals")]
- ListenOsSignal,
- #[error("Unable to start Torii (Iroha HTTP API Gateway)")]
- StartTorii,
-}
-
-/// Handle for freezing and unfreezing the network
-#[derive(Clone)]
-#[cfg(debug_assertions)]
-pub struct FreezeStatus(Arc<AtomicBool>, PeerId);
-
-#[cfg(debug_assertions)]
-impl FreezeStatus {
- pub(crate) fn new(peer_id: PeerId) -> Self {
- Self(Arc::new(AtomicBool::new(false)), peer_id)
- }
-
- /// Stop listening for messages
- pub fn freeze(&self) {
- iroha_logger::warn!(peer_id=%self.1, "NetworkRelay is frozen");
- self.0.store(true, Ordering::SeqCst);
- }
- /// Start listening for messages
- pub fn unfreeze(&self) {
- iroha_logger::warn!(peer_id=%self.1, "NetworkRelay is unfrozen");
- self.0.store(false, Ordering::SeqCst);
- }
-}
-
-struct NetworkRelay {
- sumeragi: SumeragiHandle,
- block_sync: BlockSynchronizerHandle,
- tx_gossiper: TransactionGossiperHandle,
- network: IrohaNetwork,
- #[cfg(debug_assertions)]
- freeze_status: FreezeStatus,
-}
-
-impl NetworkRelay {
- async fn run(mut self) {
- let (sender, mut receiver) = mpsc::channel(1);
- self.network.subscribe_to_peers_messages(sender);
- // NOTE: Triggered by tokio::select
- #[allow(clippy::redundant_pub_crate)]
- loop {
- tokio::select! {
- // Receive a message from the network
- Some(msg) = receiver.recv() => self.handle_message(msg).await,
- else => {
- iroha_logger::debug!("Exiting the network relay");
- break;
- },
- }
- tokio::task::yield_now().await;
- }
- }
-
- async fn handle_message(&mut self, msg: iroha_core::NetworkMessage) {
- use iroha_core::NetworkMessage::*;
-
- #[cfg(debug_assertions)]
- if self.freeze_status.0.load(Ordering::SeqCst) {
- return;
- }
-
- match msg {
- SumeragiBlock(data) => {
- self.sumeragi.incoming_block_message(*data);
- }
- SumeragiControlFlow(data) => {
- self.sumeragi.incoming_control_flow_message(*data);
- }
- BlockSync(data) => self.block_sync.message(*data).await,
- TransactionGossiper(data) => self.tx_gossiper.gossip(*data).await,
- Health => {}
- }
- }
-}
-
-impl Iroha {
- /// Starts Iroha with all its subsystems.
- ///
- /// Returns iroha itself and a future of system shutdown.
- ///
- /// # Errors
- /// - Reading telemetry configs
- /// - Telemetry setup
- /// - Initialization of [`Sumeragi`] and [`Kura`]
- #[allow(clippy::too_many_lines)]
- #[iroha_logger::log(name = "start", skip_all)] // This is actually easier to understand as a linear sequence of init statements.
- pub async fn start(
- config: Config,
- genesis: Option<GenesisBlock>,
- logger: LoggerHandle,
- shutdown_signal: ShutdownSignal,
- ) -> Result<
- (
- Self,
- impl Future<Output = std::result::Result<(), iroha_futures::supervisor::Error>>,
- ),
- StartError,
- > {
- let mut supervisor = Supervisor::new();
-
- let (kura, block_count) = Kura::new(&config.kura).change_context(StartError::InitKura)?;
- let child = Kura::start(kura.clone(), supervisor.shutdown_signal());
- supervisor.monitor(child);
-
- let world = World::with(
- [genesis_domain(config.genesis.public_key.clone())],
- [genesis_account(config.genesis.public_key.clone())],
- [],
- );
-
- let (live_query_store, child) =
- LiveQueryStore::from_config(config.live_query_store, supervisor.shutdown_signal())
- .start();
- supervisor.monitor(child);
-
- let state = match try_read_snapshot(
- config.snapshot.store_dir.resolve_relative_path(),
- &kura,
- || live_query_store.clone(),
- block_count,
- ) {
- Ok(state) => {
- iroha_logger::info!(
- at_height = state.view().height(),
- "Successfully loaded the state from a snapshot"
- );
- Some(state)
- }
- Err(TryReadSnapshotError::NotFound) => {
- iroha_logger::info!("Didn't find a state snapshot; creating an empty state");
- None
- }
- Err(error) => {
- iroha_logger::warn!(%error, "Failed to load the state from a snapshot; creating an empty state");
- None
- }
- }.unwrap_or_else(|| {
- State::new(
- world,
- Arc::clone(&kura),
- live_query_store.clone(),
- )
- });
- let state = Arc::new(state);
-
- let (events_sender, _) = broadcast::channel(EVENTS_BUFFER_CAPACITY);
- let queue = Arc::new(Queue::from_config(config.queue, events_sender.clone()));
-
- let (network, child) =
- IrohaNetwork::start(config.common.key_pair.clone(), config.network.clone())
- .await
- .change_context(StartError::StartP2p)?;
- supervisor.monitor(child);
-
- #[cfg(feature = "telemetry")]
- start_telemetry(&logger, &config, &mut supervisor).await?;
-
- #[cfg(feature = "telemetry")]
- let metrics_reporter = MetricsReporter::new(
- Arc::clone(&state),
- network.clone(),
- kura.clone(),
- queue.clone(),
- );
-
- let (sumeragi, child) = SumeragiStartArgs {
- sumeragi_config: config.sumeragi.clone(),
- common_config: config.common.clone(),
- events_sender: events_sender.clone(),
- state: state.clone(),
- queue: queue.clone(),
- kura: kura.clone(),
- network: network.clone(),
- genesis_network: GenesisWithPubKey {
- genesis,
- public_key: config.genesis.public_key.clone(),
- },
- block_count,
- sumeragi_metrics: SumeragiMetrics {
- dropped_messages: metrics_reporter.metrics().dropped_messages.clone(),
- view_changes: metrics_reporter.metrics().view_changes.clone(),
- },
- }
- .start(supervisor.shutdown_signal());
- supervisor.monitor(child);
-
- let (block_sync, child) = BlockSynchronizer::from_config(
- &config.block_sync,
- sumeragi.clone(),
- kura.clone(),
- config.common.peer.clone(),
- network.clone(),
- Arc::clone(&state),
- )
- .start(supervisor.shutdown_signal());
- supervisor.monitor(child);
-
- let (tx_gossiper, child) = TransactionGossiper::from_config(
- config.common.chain.clone(),
- config.transaction_gossiper,
- network.clone(),
- Arc::clone(&queue),
- Arc::clone(&state),
- )
- .start(supervisor.shutdown_signal());
- supervisor.monitor(child);
-
- #[cfg(debug_assertions)]
- let freeze_status = FreezeStatus::new(config.common.peer.clone());
- supervisor.monitor(task::spawn(
- NetworkRelay {
- sumeragi,
- block_sync,
- tx_gossiper,
- network,
- #[cfg(debug_assertions)]
- freeze_status: freeze_status.clone(),
- }
- .run(),
- ));
-
- if let Some(snapshot_maker) =
- SnapshotMaker::from_config(&config.snapshot, Arc::clone(&state))
- {
- supervisor.monitor(snapshot_maker.start(supervisor.shutdown_signal()));
- }
-
- let (kiso, child) = KisoHandle::start(config.clone());
- supervisor.monitor(child);
-
- let torii_run = Torii::new(
- config.common.chain.clone(),
- kiso.clone(),
- config.torii,
- queue,
- events_sender,
- live_query_store,
- kura.clone(),
- state.clone(),
- #[cfg(feature = "telemetry")]
- metrics_reporter,
- )
- .start(supervisor.shutdown_signal());
- supervisor.monitor(Child::new(
- tokio::spawn(async move {
- if let Err(err) = torii_run.await {
- iroha_logger::error!(?err, "Torii failed to terminate gracefully");
- // TODO: produce non-zero exit code or something
- } else {
- iroha_logger::debug!("Torii exited normally");
- };
- }),
- OnShutdown::Wait(Duration::from_secs(5)),
- ));
-
- supervisor.monitor(tokio::task::spawn(config_updates_relay(kiso, logger)));
-
- supervisor
- .setup_shutdown_on_os_signals()
- .change_context(StartError::ListenOsSignal)?;
-
- supervisor.shutdown_on_external_signal(shutdown_signal);
-
- Ok((
- Self {
- kura,
- state,
- #[cfg(debug_assertions)]
- freeze_status,
- },
- supervisor.start(),
- ))
- }
-
- #[allow(missing_docs)]
- #[cfg(debug_assertions)]
- pub fn freeze_status(&self) -> &FreezeStatus {
- &self.freeze_status
- }
-
- #[allow(missing_docs)]
- pub fn state(&self) -> &Arc<State> {
- &self.state
- }
-
- #[allow(missing_docs)]
- pub fn kura(&self) -> &Arc<Kura> {
- &self.kura
- }
-}
-
-#[cfg(feature = "telemetry")]
-async fn start_telemetry(
- logger: &LoggerHandle,
- config: &Config,
- supervisor: &mut Supervisor,
-) -> Result<(), StartError> {
- const MSG_SUBSCRIBE: &str = "unable to subscribe to the channel";
- const MSG_START_TASK: &str = "unable to start the task";
-
- #[cfg(feature = "dev-telemetry")]
- {
- if let Some(out_file) = &config.dev_telemetry.out_file {
- let receiver = logger
- .subscribe_on_telemetry(iroha_logger::telemetry::Channel::Future)
- .await
- .change_context(StartError::StartDevTelemetry)
- .attach_printable(MSG_SUBSCRIBE)?;
- let handle =
- iroha_telemetry::dev::start_file_output(out_file.resolve_relative_path(), receiver)
- .await
- .into_report()
- .map_err(|report| report.change_context(StartError::StartDevTelemetry))
- .attach_printable(MSG_START_TASK)?;
- supervisor.monitor(handle);
- }
- }
-
- if let Some(config) = &config.telemetry {
- let receiver = logger
- .subscribe_on_telemetry(iroha_logger::telemetry::Channel::Regular)
- .await
- .change_context(StartError::StartTelemetry)
- .attach_printable(MSG_SUBSCRIBE)?;
- let handle = iroha_telemetry::ws::start(config.clone(), receiver)
- .await
- .into_report()
- .map_err(|report| report.change_context(StartError::StartTelemetry))
- .attach_printable(MSG_START_TASK)?;
- supervisor.monitor(handle);
- iroha_logger::info!("Telemetry started");
- Ok(())
- } else {
- iroha_logger::info!("Telemetry not started due to absent configuration");
- Ok(())
- }
-}
-
-/// Spawns a task which subscribes on updates from the configuration actor
-/// and broadcasts them further to interested actors. This way, neither the config actor nor other ones know
-/// about each other, achieving loose coupling of code and system.
-async fn config_updates_relay(kiso: KisoHandle, logger: LoggerHandle) {
- let mut log_level_update = kiso
- .subscribe_on_log_level()
- .await
- // FIXME: don't like neither the message nor inability to throw Result to the outside
- .expect("Cannot proceed without working subscriptions");
-
- // See https://github.com/tokio-rs/tokio/issues/5616 and
- // https://github.com/rust-lang/rust-clippy/issues/10636
- #[allow(clippy::redundant_pub_crate)]
- loop {
- tokio::select! {
- Ok(()) = log_level_update.changed() => {
- let value = log_level_update.borrow_and_update().clone();
- if let Err(error) = logger.reload_level(value).await {
- iroha_logger::error!("Failed to reload log level: {error}");
- };
- }
- else => {
- iroha_logger::debug!("Exiting config updates relay");
- break;
- }
- };
- }
-}
-
-fn genesis_account(public_key: PublicKey) -> Account {
- let genesis_account_id = AccountId::new(iroha_genesis::GENESIS_DOMAIN_ID.clone(), public_key);
- Account::new(genesis_account_id.clone()).build(&genesis_account_id)
-}
-
-fn genesis_domain(public_key: PublicKey) -> Domain {
- let genesis_account = genesis_account(public_key);
- Domain::new(iroha_genesis::GENESIS_DOMAIN_ID.clone()).build(&genesis_account.id)
-}
-
-/// Error of [`read_config_and_genesis`]
-#[derive(Error, Debug)]
-#[allow(missing_docs)]
-pub enum ConfigError {
- #[error("Error occurred while reading configuration from file(s) and environment")]
- ReadConfig,
- #[error("Error occurred while validating configuration integrity")]
- ParseConfig,
- #[error("Error occurred while reading genesis block")]
- ReadGenesis,
- #[error("The network consists from this one peer only")]
- LonePeer,
- #[cfg(feature = "dev-telemetry")]
- #[error("Telemetry output file path is root or empty")]
- TelemetryOutFileIsRootOrEmpty,
- #[cfg(feature = "dev-telemetry")]
- #[error("Telemetry output file path is a directory")]
- TelemetryOutFileIsDir,
- #[error("Torii and Network addresses are the same, but should be different")]
- SameNetworkAndToriiAddrs,
- #[error("Invalid directory path found")]
- InvalidDirPath,
- #[error("Network error: cannot listen to address `{addr}`")]
- CannotBindAddress { addr: SocketAddr },
-}
-
-/// Read the configuration and then a genesis block if specified.
-///
-/// # Errors
-/// - If failed to read the config
-/// - If failed to load the genesis block
-pub fn read_config_and_genesis(
- args: &Args,
-) -> Result<(Config, LoggerInitConfig, Option<GenesisBlock>), ConfigError> {
- let mut reader = ConfigReader::new();
-
- if let Some(path) = &args.config {
- reader = reader
- .read_toml_with_extends(path)
- .change_context(ConfigError::ReadConfig)?;
- }
-
- let config = reader
- .read_and_complete::<UserConfig>()
- .change_context(ConfigError::ReadConfig)?
- .parse()
- .change_context(ConfigError::ParseConfig)?;
-
- let genesis = if let Some(signed_file) = &config.genesis.file {
- let genesis = read_genesis(&signed_file.resolve_relative_path())
- .attach_printable(signed_file.clone().into_attachment().display_path())?;
- Some(genesis)
- } else {
- None
- };
-
- validate_config(&config)?;
-
- let logger_config = LoggerInitConfig::new(config.logger.clone(), args.terminal_colors);
-
- Ok((config, logger_config, genesis))
-}
-
-fn read_genesis(path: &Path) -> Result<GenesisBlock, ConfigError> {
- let bytes = std::fs::read(path).change_context(ConfigError::ReadGenesis)?;
- let genesis =
- SignedBlock::decode_all_versioned(&bytes).change_context(ConfigError::ReadGenesis)?;
- Ok(GenesisBlock(genesis))
-}
-
-fn validate_config(config: &Config) -> Result<(), ConfigError> {
- let mut emitter = Emitter::new();
-
- // These cause race condition in tests, due to them actually binding TCP listeners
- // Since these validations are primarily for the convenience of the end user,
- // it seems a fine compromise to run it only in release mode
- #[cfg(not(test))]
- {
- validate_try_bind_address(&mut emitter, &config.network.address);
- validate_try_bind_address(&mut emitter, &config.torii.address);
- }
- validate_directory_path(&mut emitter, &config.kura.store_dir);
- // maybe validate only if snapshot mode is enabled
- validate_directory_path(&mut emitter, &config.snapshot.store_dir);
-
- if config.genesis.file.is_none()
- && !config
- .sumeragi
- .trusted_peers
- .value()
- .contains_other_trusted_peers()
- {
- emitter.emit(Report::new(ConfigError::LonePeer).attach_printable("\
- Reason: the network consists from this one peer only (no `sumeragi.trusted_peers` provided).\n\
- Since `genesis.file` is not set, there is no way to receive the genesis block.\n\
- Either provide the genesis by setting `genesis.file` configuration parameter,\n\
- or increase the number of trusted peers in the network using `sumeragi.trusted_peers` configuration parameter.\
- ").attach_printable(config.sumeragi.trusted_peers.clone().into_attachment().display_as_debug()));
- }
-
- if config.network.address.value() == config.torii.address.value() {
- emitter.emit(
- Report::new(ConfigError::SameNetworkAndToriiAddrs)
- .attach_printable(config.network.address.clone().into_attachment())
- .attach_printable(config.torii.address.clone().into_attachment()),
- );
- }
-
- #[cfg(not(feature = "telemetry"))]
- if config.telemetry.is_some() {
- // TODO: use a centralized configuration logging
- // https://github.com/hyperledger/iroha/issues/4300
- eprintln!("`telemetry` config is specified, but ignored, because Iroha is compiled without `telemetry` feature enabled");
- }
-
- #[cfg(not(feature = "dev-telemetry"))]
- if config.dev_telemetry.out_file.is_some() {
- // TODO: use a centralized configuration logging
- // https://github.com/hyperledger/iroha/issues/4300
- eprintln!("`dev_telemetry.out_file` config is specified, but ignored, because Iroha is compiled without `dev-telemetry` feature enabled");
- }
-
- #[cfg(feature = "dev-telemetry")]
- if let Some(path) = &config.dev_telemetry.out_file {
- if path.value().parent().is_none() {
- emitter.emit(
- Report::new(ConfigError::TelemetryOutFileIsRootOrEmpty)
- .attach_printable(path.clone().into_attachment().display_path()),
- );
- }
- if path.value().is_dir() {
- emitter.emit(
- Report::new(ConfigError::TelemetryOutFileIsDir)
- .attach_printable(path.clone().into_attachment().display_path()),
- );
- }
- }
-
- emitter.into_result()?;
-
- Ok(())
-}
-
-fn validate_directory_path(emitter: &mut Emitter<ConfigError>, path: &WithOrigin<PathBuf>) {
- #[derive(Debug, Error)]
- #[error(
- "expected path to be either non-existing or a directory, but it points to an existing file: {path}"
- )]
- struct InvalidDirPathError {
- path: PathBuf,
- }
-
- if path.value().is_file() {
- emitter.emit(
- Report::new(InvalidDirPathError {
- path: path.value().clone(),
- })
- .attach_printable(path.clone().into_attachment().display_path())
- .change_context(ConfigError::InvalidDirPath),
- );
- }
-}
-
-#[cfg(not(test))]
-fn validate_try_bind_address(emitter: &mut Emitter<ConfigError>, value: &WithOrigin<SocketAddr>) {
- use std::net::TcpListener;
-
- if let Err(err) = TcpListener::bind(value.value()) {
- emitter.emit(
- Report::new(err)
- .attach_printable(value.clone().into_attachment())
- .change_context(ConfigError::CannotBindAddress {
- addr: value.value().clone(),
- }),
- )
- }
-}
-
-#[allow(missing_docs)]
-pub fn is_coloring_supported() -> bool {
- supports_color::on(supports_color::Stream::Stdout).is_some()
-}
-
-fn default_terminal_colors_str() -> clap::builder::OsStr {
- is_coloring_supported().to_string().into()
-}
-
-/// Iroha server CLI
-#[derive(Parser, Debug)]
-#[command(
- name = "irohad",
- version = concat!("version=", env!("CARGO_PKG_VERSION"), " git_commit_sha=", env!("VERGEN_GIT_SHA"), " cargo_features=", env!("VERGEN_CARGO_FEATURES")),
- author
-)]
-pub struct Args {
- /// Path to the configuration file
- #[arg(long, short, value_name("PATH"), value_hint(clap::ValueHint::FilePath))]
- pub config: Option<PathBuf>,
- /// Enables trace logs of configuration reading & parsing.
- ///
- /// Might be useful for configuration troubleshooting.
- #[arg(long, env)]
- pub trace_config: bool,
- /// Whether to enable ANSI colored output or not
- ///
- /// By default, Iroha determines whether the terminal supports colors or not.
- ///
- /// In order to disable this flag explicitly, pass `--terminal-colors=false`.
- #[arg(
- long,
- env,
- default_missing_value("true"),
- default_value(default_terminal_colors_str()),
- action(clap::ArgAction::Set),
- require_equals(true),
- num_args(0..=1),
- )]
- pub terminal_colors: bool,
-}
-
-#[cfg(test)]
-mod tests {
- use iroha_genesis::GenesisBuilder;
-
- use super::*;
-
- mod config_integration {
- use assertables::{assert_contains, assert_contains_as_result};
- use iroha_crypto::{ExposedPrivateKey, KeyPair};
- use iroha_primitives::addr::socket_addr;
- use iroha_version::Encode;
- use path_absolutize::Absolutize as _;
-
- use super::*;
-
- fn config_factory(genesis_public_key: &PublicKey) -> toml::Table {
- let (pubkey, privkey) = KeyPair::random().into_parts();
-
- let mut table = toml::Table::new();
- iroha_config::base::toml::Writer::new(&mut table)
- .write("chain", "0")
- .write("public_key", pubkey)
- .write("private_key", ExposedPrivateKey(privkey))
- .write(["network", "address"], socket_addr!(127.0.0.1:1337))
- .write(["torii", "address"], socket_addr!(127.0.0.1:8080))
- .write(["genesis", "public_key"], genesis_public_key);
- table
- }
-
- fn dummy_executor() -> Executor {
- Executor::new(WasmSmartContract::from_compiled(vec![1, 2, 3]))
- }
-
- #[test]
- fn relative_file_paths_resolution() -> eyre::Result<()> {
- // Given
-
- let genesis_key_pair = KeyPair::random();
- let genesis = GenesisBuilder::default().build_and_sign(
- ChainId::from("00000000-0000-0000-0000-000000000000"),
- dummy_executor(),
- vec![],
- &genesis_key_pair,
- );
-
- let mut config = config_factory(genesis_key_pair.public_key());
- iroha_config::base::toml::Writer::new(&mut config)
- .write(["genesis", "file"], "./genesis/genesis.signed.scale")
- .write(["kura", "store_dir"], "../storage")
- .write(["snapshot", "store_dir"], "../snapshots")
- .write(["dev_telemetry", "out_file"], "../logs/telemetry");
-
- let dir = tempfile::tempdir()?;
- let genesis_path = dir.path().join("config/genesis/genesis.signed.scale");
- let executor_path = dir.path().join("config/genesis/executor.wasm");
- let config_path = dir.path().join("config/config.toml");
- std::fs::create_dir(dir.path().join("config"))?;
- std::fs::create_dir(dir.path().join("config/genesis"))?;
- std::fs::write(config_path, toml::to_string(&config)?)?;
- std::fs::write(genesis_path, genesis.0.encode())?;
- std::fs::write(executor_path, "")?;
-
- let config_path = dir.path().join("config/config.toml");
-
- // When
-
- let (config, _logger, genesis) = read_config_and_genesis(&Args {
- config: Some(config_path),
- terminal_colors: false,
- trace_config: false,
- })
- .map_err(|report| eyre::eyre!("{report:?}"))?;
-
- // Then
-
- // No need to check whether genesis.file is resolved - if not, genesis wouldn't be read
- assert!(genesis.is_some());
-
- assert_eq!(
- config.kura.store_dir.resolve_relative_path().absolutize()?,
- dir.path().join("storage")
- );
- assert_eq!(
- config
- .snapshot
- .store_dir
- .resolve_relative_path()
- .absolutize()?,
- dir.path().join("snapshots")
- );
- assert_eq!(
- config
- .dev_telemetry
- .out_file
- .expect("dev telemetry should be set")
- .resolve_relative_path()
- .absolutize()?,
- dir.path().join("logs/telemetry")
- );
-
- Ok(())
- }
-
- #[test]
- fn fails_with_no_trusted_peers_and_submit_role() -> eyre::Result<()> {
- // Given
-
- let genesis_key_pair = KeyPair::random();
- let mut config = config_factory(genesis_key_pair.public_key());
- iroha_config::base::toml::Writer::new(&mut config);
-
- let dir = tempfile::tempdir()?;
- std::fs::write(dir.path().join("config.toml"), toml::to_string(&config)?)?;
- std::fs::write(dir.path().join("executor.wasm"), "")?;
- let config_path = dir.path().join("config.toml");
-
- // When & Then
-
- let report = read_config_and_genesis(&Args {
- config: Some(config_path),
- terminal_colors: false,
- trace_config: false,
- })
- .unwrap_err();
-
- assert_contains!(
- format!("{report:#}"),
- "The network consists from this one peer only"
- );
-
- Ok(())
- }
- }
-
- #[test]
- #[allow(clippy::bool_assert_comparison)] // for expressiveness
- fn default_args() {
- let args = Args::try_parse_from(["test"]).unwrap();
-
- assert_eq!(args.terminal_colors, is_coloring_supported());
- }
-
- #[test]
- #[allow(clippy::bool_assert_comparison)] // for expressiveness
- fn terminal_colors_works_as_expected() -> eyre::Result<()> {
- fn try_with(arg: &str) -> eyre::Result<bool> {
- Ok(Args::try_parse_from(["test", arg])?.terminal_colors)
- }
-
- assert_eq!(
- Args::try_parse_from(["test"])?.terminal_colors,
- is_coloring_supported()
- );
- assert_eq!(try_with("--terminal-colors")?, true);
- assert_eq!(try_with("--terminal-colors=false")?, false);
- assert_eq!(try_with("--terminal-colors=true")?, true);
- assert!(try_with("--terminal-colors=random").is_err());
-
- Ok(())
- }
-
- #[test]
- fn user_provided_config_path_works() {
- let args = Args::try_parse_from(["test", "--config", "/home/custom/file.json"]).unwrap();
-
- assert_eq!(args.config, Some(PathBuf::from("/home/custom/file.json")));
- }
-
- #[test]
- fn user_can_provide_any_extension() {
- let _args = Args::try_parse_from(["test", "--config", "file.toml.but.not"])
- .expect("should allow doing this as well");
- }
-}
diff --git a/crates/irohad/src/main.rs b/crates/irohad/src/main.rs
index 1f1bb177c5f..45478a26e4e 100644
--- a/crates/irohad/src/main.rs
+++ b/crates/irohad/src/main.rs
@@ -1,10 +1,88 @@
//! Iroha server command-line interface.
-use std::env;
+
+use std::{
+ env,
+ future::Future,
+ path::{Path, PathBuf},
+ sync::Arc,
+ time::Duration,
+};
use clap::Parser;
-use error_stack::{IntoReportCompat, ResultExt};
-use iroha_futures::supervisor::ShutdownSignal;
-use irohad::{Args, Iroha};
+use error_stack::{IntoReportCompat, Report, Result, ResultExt};
+use iroha_config::{
+ base::{read::ConfigReader, util::Emitter, WithOrigin},
+ parameters::{actual::Root as Config, user::Root as UserConfig},
+};
+use iroha_core::{
+ block_sync::{BlockSynchronizer, BlockSynchronizerHandle},
+ gossiper::{TransactionGossiper, TransactionGossiperHandle},
+ kiso::KisoHandle,
+ kura::Kura,
+ query::store::LiveQueryStore,
+ queue::Queue,
+ smartcontracts::isi::Registrable as _,
+ snapshot::{try_read_snapshot, SnapshotMaker, TryReadError as TryReadSnapshotError},
+ state::{State, StateReadOnly, World},
+ sumeragi::{GenesisWithPubKey, SumeragiHandle, SumeragiStartArgs},
+ IrohaNetwork,
+};
+#[cfg(feature = "telemetry")]
+use iroha_core::{metrics::MetricsReporter, sumeragi::SumeragiMetrics};
+use iroha_data_model::{block::SignedBlock, prelude::*};
+use iroha_futures::supervisor::{Child, OnShutdown, ShutdownSignal, Supervisor};
+use iroha_genesis::GenesisBlock;
+use iroha_logger::{actor::LoggerHandle, InitConfig as LoggerInitConfig};
+use iroha_primitives::addr::SocketAddr;
+use iroha_torii::Torii;
+use iroha_version::scale::DecodeVersioned;
+use thiserror::Error;
+use tokio::{
+ sync::{broadcast, mpsc},
+ task,
+};
+
+#[allow(missing_docs)]
+pub fn is_coloring_supported() -> bool {
+ supports_color::on(supports_color::Stream::Stdout).is_some()
+}
+
+fn default_terminal_colors_str() -> clap::builder::OsStr {
+ is_coloring_supported().to_string().into()
+}
+
+/// Iroha server CLI
+#[derive(Parser, Debug)]
+#[command(
+ name = "irohad",
+ version = concat!("version=", env!("CARGO_PKG_VERSION"), " git_commit_sha=", env!("VERGEN_GIT_SHA"), " cargo_features=", env!("VERGEN_CARGO_FEATURES")),
+ author
+)]
+pub struct Args {
+ /// Path to the configuration file
+ #[arg(long, short, value_name("PATH"), value_hint(clap::ValueHint::FilePath))]
+ pub config: Option<PathBuf>,
+ /// Enables trace logs of configuration reading & parsing.
+ ///
+ /// Might be useful for configuration troubleshooting.
+ #[arg(long, env)]
+ pub trace_config: bool,
+ /// Whether to enable ANSI-colored output or not
+ ///
+ /// By default, Iroha determines whether the terminal supports colors or not.
+ ///
+ /// In order to disable this flag explicitly, pass `--terminal-colors=false`.
+ #[arg(
+ long,
+ env,
+ default_missing_value("true"),
+ default_value(default_terminal_colors_str()),
+ action(clap::ArgAction::Set),
+ require_equals(true),
+ num_args(0..=1),
+ )]
+ pub terminal_colors: bool,
+}
#[derive(thiserror::Error, Debug)]
enum MainError {
@@ -20,6 +98,557 @@ enum MainError {
IrohaRun,
}
+const EVENTS_BUFFER_CAPACITY: usize = 10_000;
+
+/// [Orchestrator](https://en.wikipedia.org/wiki/Orchestration_%28computing%29)
+/// of the system. It configures, coordinates and manages transactions
+/// and queries processing, work of consensus and storage.
+pub struct Iroha {
+ /// Kura — block storage
+ kura: Arc<Kura>,
+ /// State of blockchain
+ state: Arc<State>,
+}
+
+/// Error(s) that might occur while starting [`Iroha`]
+#[derive(thiserror::Error, Debug, Copy, Clone)]
+#[allow(missing_docs)]
+pub enum StartError {
+ #[error("Unable to start peer-to-peer network")]
+ StartP2p,
+ #[error("Unable to initialize Kura (block storage)")]
+ InitKura,
+ #[error("Unable to start dev telemetry service")]
+ StartDevTelemetry,
+ #[error("Unable to start telemetry service")]
+ StartTelemetry,
+ #[error("Unable to set up listening for OS signals")]
+ ListenOsSignal,
+ #[error("Unable to start Torii (Iroha HTTP API Gateway)")]
+ StartTorii,
+}
+
+struct NetworkRelay {
+ sumeragi: SumeragiHandle,
+ block_sync: BlockSynchronizerHandle,
+ tx_gossiper: TransactionGossiperHandle,
+ network: IrohaNetwork,
+}
+
+impl NetworkRelay {
+ async fn run(mut self) {
+ let (sender, mut receiver) = mpsc::channel(1);
+ self.network.subscribe_to_peers_messages(sender);
+ while let Some(msg) = receiver.recv().await {
+ self.handle_message(msg).await;
+ }
+ iroha_logger::debug!("Exiting the network relay");
+ }
+
+ async fn handle_message(&mut self, msg: iroha_core::NetworkMessage) {
+ use iroha_core::NetworkMessage::*;
+
+ match msg {
+ SumeragiBlock(data) => {
+ self.sumeragi.incoming_block_message(*data);
+ }
+ SumeragiControlFlow(data) => {
+ self.sumeragi.incoming_control_flow_message(*data);
+ }
+ BlockSync(data) => self.block_sync.message(*data).await,
+ TransactionGossiper(data) => self.tx_gossiper.gossip(*data).await,
+ Health => {}
+ }
+ }
+}
+
+impl Iroha {
+ /// Starts Iroha with all its subsystems.
+ ///
+ /// Returns iroha itself and a future of system shutdown.
+ ///
+ /// # Errors
+ /// - Reading telemetry configs
+ /// - Telemetry setup
+ /// - Initialization of [`Sumeragi`] and [`Kura`]
+ #[allow(clippy::too_many_lines)]
+ #[iroha_logger::log(name = "start", skip_all)] // This is actually easier to understand as a linear sequence of init statements.
+ pub async fn start(
+ config: Config,
+ genesis: Option<GenesisBlock>,
+ logger: LoggerHandle,
+ shutdown_signal: ShutdownSignal,
+ ) -> Result<
+ (
+ Self,
+ impl Future<Output = std::result::Result<(), iroha_futures::supervisor::Error>>,
+ ),
+ StartError,
+ > {
+ let mut supervisor = Supervisor::new();
+
+ let (kura, block_count) = Kura::new(&config.kura).change_context(StartError::InitKura)?;
+ let child = Kura::start(kura.clone(), supervisor.shutdown_signal());
+ supervisor.monitor(child);
+
+ let (live_query_store, child) =
+ LiveQueryStore::from_config(config.live_query_store, supervisor.shutdown_signal())
+ .start();
+ supervisor.monitor(child);
+
+ let state = match try_read_snapshot(
+ config.snapshot.store_dir.resolve_relative_path(),
+ &kura,
+ || live_query_store.clone(),
+ block_count,
+ ) {
+ Ok(state) => {
+ iroha_logger::info!(
+ at_height = state.view().height(),
+ "Successfully loaded the state from a snapshot"
+ );
+ Some(state)
+ }
+ Err(TryReadSnapshotError::NotFound) => {
+ iroha_logger::info!("Didn't find a state snapshot; creating an empty state");
+ None
+ }
+ Err(error) => {
+ iroha_logger::warn!(%error, "Failed to load the state from a snapshot; creating an empty state");
+ None
+ }
+ }.unwrap_or_else(|| {
+ let world = World::with(
+ [genesis_domain(config.genesis.public_key.clone())],
+ [genesis_account(config.genesis.public_key.clone())],
+ [],
+ );
+
+ State::new(
+ world,
+ Arc::clone(&kura),
+ live_query_store.clone(),
+ )
+ });
+ let state = Arc::new(state);
+
+ let (events_sender, _) = broadcast::channel(EVENTS_BUFFER_CAPACITY);
+ let queue = Arc::new(Queue::from_config(config.queue, events_sender.clone()));
+
+ let (network, child) = IrohaNetwork::start(
+ config.common.key_pair.clone(),
+ config.network.clone(),
+ supervisor.shutdown_signal(),
+ )
+ .await
+ .attach_printable_lazy(|| config.network.address.clone().into_attachment())
+ .change_context(StartError::StartP2p)?;
+ supervisor.monitor(child);
+
+ #[cfg(feature = "telemetry")]
+ start_telemetry(&logger, &config, &mut supervisor).await?;
+
+ #[cfg(feature = "telemetry")]
+ let metrics_reporter = MetricsReporter::new(
+ Arc::clone(&state),
+ network.clone(),
+ kura.clone(),
+ queue.clone(),
+ );
+
+ let (sumeragi, child) = SumeragiStartArgs {
+ sumeragi_config: config.sumeragi.clone(),
+ common_config: config.common.clone(),
+ events_sender: events_sender.clone(),
+ state: state.clone(),
+ queue: queue.clone(),
+ kura: kura.clone(),
+ network: network.clone(),
+ genesis_network: GenesisWithPubKey {
+ genesis,
+ public_key: config.genesis.public_key.clone(),
+ },
+ block_count,
+ #[cfg(feature = "telemetry")]
+ sumeragi_metrics: SumeragiMetrics {
+ dropped_messages: metrics_reporter.metrics().dropped_messages.clone(),
+ view_changes: metrics_reporter.metrics().view_changes.clone(),
+ },
+ }
+ .start(supervisor.shutdown_signal());
+ supervisor.monitor(child);
+
+ let (block_sync, child) = BlockSynchronizer::from_config(
+ &config.block_sync,
+ sumeragi.clone(),
+ kura.clone(),
+ config.common.peer.clone(),
+ network.clone(),
+ Arc::clone(&state),
+ )
+ .start(supervisor.shutdown_signal());
+ supervisor.monitor(child);
+
+ let (tx_gossiper, child) = TransactionGossiper::from_config(
+ config.common.chain.clone(),
+ config.transaction_gossiper,
+ network.clone(),
+ Arc::clone(&queue),
+ Arc::clone(&state),
+ )
+ .start(supervisor.shutdown_signal());
+ supervisor.monitor(child);
+
+ supervisor.monitor(task::spawn(
+ NetworkRelay {
+ sumeragi,
+ block_sync,
+ tx_gossiper,
+ network,
+ }
+ .run(),
+ ));
+
+ if let Some(snapshot_maker) =
+ SnapshotMaker::from_config(&config.snapshot, Arc::clone(&state))
+ {
+ supervisor.monitor(snapshot_maker.start(supervisor.shutdown_signal()));
+ }
+
+ let (kiso, child) = KisoHandle::start(config.clone());
+ supervisor.monitor(child);
+
+ let torii_run = Torii::new(
+ config.common.chain.clone(),
+ kiso.clone(),
+ config.torii,
+ queue,
+ events_sender,
+ live_query_store,
+ kura.clone(),
+ state.clone(),
+ #[cfg(feature = "telemetry")]
+ metrics_reporter,
+ )
+ .start(supervisor.shutdown_signal());
+ supervisor.monitor(Child::new(
+ tokio::spawn(async move {
+ if let Err(err) = torii_run.await {
+ iroha_logger::error!(?err, "Torii failed to terminate gracefully");
+ // TODO: produce non-zero exit code or something
+ } else {
+ iroha_logger::debug!("Torii exited normally");
+ };
+ }),
+ OnShutdown::Wait(Duration::from_secs(5)),
+ ));
+
+ supervisor.monitor(tokio::task::spawn(config_updates_relay(kiso, logger)));
+
+ supervisor
+ .setup_shutdown_on_os_signals()
+ .change_context(StartError::ListenOsSignal)?;
+
+ supervisor.shutdown_on_external_signal(shutdown_signal);
+
+ Ok((Self { kura, state }, async move {
+ supervisor.start().await?;
+ iroha_logger::info!("Iroha shutdown normally");
+ Ok(())
+ }))
+ }
+
+ #[allow(missing_docs)]
+ pub fn state(&self) -> &Arc<State> {
+ &self.state
+ }
+
+ #[allow(missing_docs)]
+ pub fn kura(&self) -> &Arc<Kura> {
+ &self.kura
+ }
+}
+
+#[cfg(feature = "telemetry")]
+async fn start_telemetry(
+ logger: &LoggerHandle,
+ config: &Config,
+ supervisor: &mut Supervisor,
+) -> Result<(), StartError> {
+ const MSG_SUBSCRIBE: &str = "unable to subscribe to the channel";
+ const MSG_START_TASK: &str = "unable to start the task";
+
+ #[cfg(feature = "dev-telemetry")]
+ {
+ if let Some(out_file) = &config.dev_telemetry.out_file {
+ let receiver = logger
+ .subscribe_on_telemetry(iroha_logger::telemetry::Channel::Future)
+ .await
+ .change_context(StartError::StartDevTelemetry)
+ .attach_printable(MSG_SUBSCRIBE)?;
+ let handle =
+ iroha_telemetry::dev::start_file_output(out_file.resolve_relative_path(), receiver)
+ .await
+ .into_report()
+ .map_err(|report| report.change_context(StartError::StartDevTelemetry))
+ .attach_printable(MSG_START_TASK)?;
+ supervisor.monitor(handle);
+ }
+ }
+
+ if let Some(config) = &config.telemetry {
+ let receiver = logger
+ .subscribe_on_telemetry(iroha_logger::telemetry::Channel::Regular)
+ .await
+ .change_context(StartError::StartTelemetry)
+ .attach_printable(MSG_SUBSCRIBE)?;
+ let handle = iroha_telemetry::ws::start(config.clone(), receiver)
+ .await
+ .into_report()
+ .map_err(|report| report.change_context(StartError::StartTelemetry))
+ .attach_printable(MSG_START_TASK)?;
+ supervisor.monitor(handle);
+ iroha_logger::info!("Telemetry started");
+ Ok(())
+ } else {
+ iroha_logger::info!("Telemetry not started due to absent configuration");
+ Ok(())
+ }
+}
+
+/// Spawns a task which subscribes on updates from the configuration actor
+/// and broadcasts them further to interested actors. This way, neither the config actor nor other ones know
+/// about each other, achieving loose coupling of code and system.
+async fn config_updates_relay(kiso: KisoHandle, logger: LoggerHandle) {
+ let mut log_level_update = kiso
+ .subscribe_on_log_level()
+ .await
+ // FIXME: don't like neither the message nor inability to throw Result to the outside
+ .expect("Cannot proceed without working subscriptions");
+
+ // See https://github.com/tokio-rs/tokio/issues/5616 and
+ // https://github.com/rust-lang/rust-clippy/issues/10636
+ #[allow(clippy::redundant_pub_crate)]
+ loop {
+ tokio::select! {
+ Ok(()) = log_level_update.changed() => {
+ let value = log_level_update.borrow_and_update().clone();
+ if let Err(error) = logger.reload_level(value).await {
+ iroha_logger::error!("Failed to reload log level: {error}");
+ };
+ }
+ else => {
+ iroha_logger::debug!("Exiting config updates relay");
+ break;
+ }
+ };
+ }
+}
+
+fn genesis_account(public_key: PublicKey) -> Account {
+ let genesis_account_id = AccountId::new(iroha_genesis::GENESIS_DOMAIN_ID.clone(), public_key);
+ Account::new(genesis_account_id.clone()).build(&genesis_account_id)
+}
+
+fn genesis_domain(public_key: PublicKey) -> Domain {
+ let genesis_account = genesis_account(public_key);
+ Domain::new(iroha_genesis::GENESIS_DOMAIN_ID.clone()).build(&genesis_account.id)
+}
+
+/// Error of [`read_config_and_genesis`]
+#[derive(Error, Debug)]
+#[allow(missing_docs)]
+pub enum ConfigError {
+ #[error("Error occurred while reading configuration from file(s) and environment")]
+ ReadConfig,
+ #[error("Error occurred while validating configuration integrity")]
+ ParseConfig,
+ #[error("Error occurred while reading genesis block")]
+ ReadGenesis,
+ #[error("The network consists from this one peer only")]
+ LonePeer,
+ #[cfg(feature = "dev-telemetry")]
+ #[error("Telemetry output file path is root or empty")]
+ TelemetryOutFileIsRootOrEmpty,
+ #[cfg(feature = "dev-telemetry")]
+ #[error("Telemetry output file path is a directory")]
+ TelemetryOutFileIsDir,
+ #[error("Torii and Network addresses are the same, but should be different")]
+ SameNetworkAndToriiAddrs,
+ #[error("Invalid directory path found")]
+ InvalidDirPath,
+ #[error("Network error: cannot listen to address `{addr}`")]
+ CannotBindAddress { addr: SocketAddr },
+}
+
+/// Read the configuration and then a genesis block if specified.
+///
+/// # Errors
+/// - If failed to read the config
+/// - If failed to load the genesis block
+pub fn read_config_and_genesis(
+ args: &Args,
+) -> Result<(Config, LoggerInitConfig, Option<GenesisBlock>), ConfigError> {
+ let mut config = ConfigReader::new();
+
+ if let Some(path) = &args.config {
+ config = config
+ .read_toml_with_extends(path)
+ .change_context(ConfigError::ReadConfig)?;
+ }
+
+ let config = config
+ .read_and_complete::<UserConfig>()
+ .change_context(ConfigError::ReadConfig)?
+ .parse()
+ .change_context(ConfigError::ParseConfig)?;
+
+ let genesis = if let Some(signed_file) = &config.genesis.file {
+ let genesis = read_genesis(&signed_file.resolve_relative_path())
+ .attach_printable(signed_file.clone().into_attachment().display_path())?;
+ Some(genesis)
+ } else {
+ None
+ };
+
+ validate_config(&config)?;
+
+ let logger_config = LoggerInitConfig::new(config.logger.clone(), args.terminal_colors);
+
+ Ok((config, logger_config, genesis))
+}
+
+fn read_genesis(path: &Path) -> Result<GenesisBlock, ConfigError> {
+ let bytes = std::fs::read(path).change_context(ConfigError::ReadGenesis)?;
+ let genesis =
+ SignedBlock::decode_all_versioned(&bytes).change_context(ConfigError::ReadGenesis)?;
+ Ok(GenesisBlock(genesis))
+}
+
+fn validate_config(config: &Config) -> Result<(), ConfigError> {
+ let mut emitter = Emitter::new();
+
+ // These cause race condition in tests, due to them actually binding TCP listeners
+ // Since these validations are primarily for the convenience of the end user,
+ // it seems a fine compromise to run it only in release mode
+ #[cfg(not(test))]
+ {
+ validate_try_bind_address(&mut emitter, &config.network.address);
+ validate_try_bind_address(&mut emitter, &config.torii.address);
+ }
+ validate_directory_path(&mut emitter, &config.kura.store_dir);
+ // maybe validate only if snapshot mode is enabled
+ validate_directory_path(&mut emitter, &config.snapshot.store_dir);
+
+ if config.genesis.file.is_none()
+ && !config
+ .sumeragi
+ .trusted_peers
+ .value()
+ .contains_other_trusted_peers()
+ {
+ emitter.emit(Report::new(ConfigError::LonePeer).attach_printable("\
+ Reason: the network consists from this one peer only (no `sumeragi.trusted_peers` provided).\n\
+ Since `genesis.file` is not set, there is no way to receive the genesis block.\n\
+ Either provide the genesis by setting `genesis.file` configuration parameter,\n\
+ or increase the number of trusted peers in the network using `sumeragi.trusted_peers` configuration parameter.\
+ ").attach_printable(config.sumeragi.trusted_peers.clone().into_attachment().display_as_debug()));
+ }
+
+ if config.network.address.value() == config.torii.address.value() {
+ emitter.emit(
+ Report::new(ConfigError::SameNetworkAndToriiAddrs)
+ .attach_printable(config.network.address.clone().into_attachment())
+ .attach_printable(config.torii.address.clone().into_attachment()),
+ );
+ }
+
+ #[cfg(not(feature = "telemetry"))]
+ if config.telemetry.is_some() {
+ // TODO: use a centralized configuration logging
+ // https://github.com/hyperledger/iroha/issues/4300
+ eprintln!("`telemetry` config is specified, but ignored, because Iroha is compiled without `telemetry` feature enabled");
+ }
+
+ #[cfg(not(feature = "dev-telemetry"))]
+ if config.dev_telemetry.out_file.is_some() {
+ // TODO: use a centralized configuration logging
+ // https://github.com/hyperledger/iroha/issues/4300
+ eprintln!("`dev_telemetry.out_file` config is specified, but ignored, because Iroha is compiled without `dev-telemetry` feature enabled");
+ }
+
+ #[cfg(feature = "dev-telemetry")]
+ if let Some(path) = &config.dev_telemetry.out_file {
+ if path.value().parent().is_none() {
+ emitter.emit(
+ Report::new(ConfigError::TelemetryOutFileIsRootOrEmpty)
+ .attach_printable(path.clone().into_attachment().display_path()),
+ );
+ }
+ if path.value().is_dir() {
+ emitter.emit(
+ Report::new(ConfigError::TelemetryOutFileIsDir)
+ .attach_printable(path.clone().into_attachment().display_path()),
+ );
+ }
+ }
+
+ emitter.into_result()?;
+
+ Ok(())
+}
+
+fn validate_directory_path(emitter: &mut Emitter<ConfigError>, path: &WithOrigin<PathBuf>) {
+ #[derive(Debug, Error)]
+ #[error(
+ "expected path to be either non-existing or a directory, but it points to an existing file: {path}"
+ )]
+ struct InvalidDirPathError {
+ path: PathBuf,
+ }
+
+ if path.value().is_file() {
+ emitter.emit(
+ Report::new(InvalidDirPathError {
+ path: path.value().clone(),
+ })
+ .attach_printable(path.clone().into_attachment().display_path())
+ .change_context(ConfigError::InvalidDirPath),
+ );
+ }
+}
+
+#[cfg(not(test))]
+fn validate_try_bind_address(emitter: &mut Emitter<ConfigError>, value: &WithOrigin<SocketAddr>) {
+ use std::net::TcpListener;
+
+ if let Err(err) = TcpListener::bind(value.value()) {
+ emitter.emit(
+ Report::new(err)
+ .attach_printable(value.clone().into_attachment())
+ .change_context(ConfigError::CannotBindAddress {
+ addr: value.value().clone(),
+ }),
+ )
+ }
+}
+
+/// Configures globals of [`error_stack::Report`]
+fn configure_reports(args: &Args) {
+ use std::panic::Location;
+
+ use error_stack::{fmt::ColorMode, Report};
+
+ Report::set_color_mode(if args.terminal_colors {
+ ColorMode::Color
+ } else {
+ ColorMode::None
+ });
+
+ // neither devs nor users benefit from it
+ Report::install_debug_hook::<Location>(|_, _| {});
+}
+
#[tokio::main]
async fn main() -> error_stack::Result<(), MainError> {
let args = Args::parse();
@@ -33,7 +662,7 @@ async fn main() -> error_stack::Result<(), MainError> {
}
let (config, logger_config, genesis) =
- irohad::read_config_and_genesis(&args).change_context(MainError::Config).attach_printable_lazy(|| {
+ read_config_and_genesis(&args).change_context(MainError::Config).attach_printable_lazy(|| {
args.config.as_ref().map_or_else(
|| "`--config` arg was not set, therefore configuration relies fully on environment variables".to_owned(),
|path| format!("config path is specified by `--config` arg: {}", path.display()),
@@ -72,18 +701,177 @@ async fn main() -> error_stack::Result<(), MainError> {
supervisor_fut.await.change_context(MainError::IrohaRun)
}
-/// Configures globals of [`error_stack::Report`]
-fn configure_reports(args: &Args) {
- use std::panic::Location;
+#[cfg(test)]
+mod tests {
+ use iroha_genesis::GenesisBuilder;
- use error_stack::{fmt::ColorMode, Report};
+ use super::*;
- Report::set_color_mode(if args.terminal_colors {
- ColorMode::Color
- } else {
- ColorMode::None
- });
+ mod config_integration {
+ use assertables::{assert_contains, assert_contains_as_result};
+ use iroha_crypto::{ExposedPrivateKey, KeyPair};
+ use iroha_primitives::addr::socket_addr;
+ use iroha_version::Encode;
+ use path_absolutize::Absolutize as _;
- // neither devs nor users benefit from it
- Report::install_debug_hook::<Location>(|_, _| {});
+ use super::*;
+
+ fn config_factory(genesis_public_key: &PublicKey) -> toml::Table {
+ let (pubkey, privkey) = KeyPair::random().into_parts();
+
+ let mut table = toml::Table::new();
+ iroha_config::base::toml::Writer::new(&mut table)
+ .write("chain", "0")
+ .write("public_key", pubkey)
+ .write("private_key", ExposedPrivateKey(privkey))
+ .write(["network", "address"], socket_addr!(127.0.0.1:1337))
+ .write(["torii", "address"], socket_addr!(127.0.0.1:8080))
+ .write(["genesis", "public_key"], genesis_public_key);
+ table
+ }
+
+ fn dummy_executor() -> Executor {
+ Executor::new(WasmSmartContract::from_compiled(vec![1, 2, 3]))
+ }
+
+ #[test]
+ fn relative_file_paths_resolution() -> eyre::Result<()> {
+ // Given
+
+ let genesis_key_pair = KeyPair::random();
+ let genesis = GenesisBuilder::default().build_and_sign(
+ ChainId::from("00000000-0000-0000-0000-000000000000"),
+ dummy_executor(),
+ vec![],
+ &genesis_key_pair,
+ );
+
+ let mut config = config_factory(genesis_key_pair.public_key());
+ iroha_config::base::toml::Writer::new(&mut config)
+ .write(["genesis", "file"], "./genesis/genesis.signed.scale")
+ .write(["kura", "store_dir"], "../storage")
+ .write(["snapshot", "store_dir"], "../snapshots")
+ .write(["dev_telemetry", "out_file"], "../logs/telemetry");
+
+ let dir = tempfile::tempdir()?;
+ let genesis_path = dir.path().join("config/genesis/genesis.signed.scale");
+ let executor_path = dir.path().join("config/genesis/executor.wasm");
+ let config_path = dir.path().join("config/config.toml");
+ std::fs::create_dir(dir.path().join("config"))?;
+ std::fs::create_dir(dir.path().join("config/genesis"))?;
+ std::fs::write(config_path, toml::to_string(&config)?)?;
+ std::fs::write(genesis_path, genesis.0.encode())?;
+ std::fs::write(executor_path, "")?;
+
+ let config_path = dir.path().join("config/config.toml");
+
+ // When
+
+ let (config, _logger, genesis) = read_config_and_genesis(&Args {
+ config: Some(config_path),
+ terminal_colors: false,
+ trace_config: false,
+ })
+ .map_err(|report| eyre::eyre!("{report:?}"))?;
+
+ // Then
+
+ // No need to check whether genesis.file is resolved - if not, genesis wouldn't be read
+ assert!(genesis.is_some());
+
+ assert_eq!(
+ config.kura.store_dir.resolve_relative_path().absolutize()?,
+ dir.path().join("storage")
+ );
+ assert_eq!(
+ config
+ .snapshot
+ .store_dir
+ .resolve_relative_path()
+ .absolutize()?,
+ dir.path().join("snapshots")
+ );
+ assert_eq!(
+ config
+ .dev_telemetry
+ .out_file
+ .expect("dev telemetry should be set")
+ .resolve_relative_path()
+ .absolutize()?,
+ dir.path().join("logs/telemetry")
+ );
+
+ Ok(())
+ }
+
+ #[test]
+ fn fails_with_no_trusted_peers_and_submit_role() -> eyre::Result<()> {
+ // Given
+
+ let genesis_key_pair = KeyPair::random();
+ let mut config = config_factory(genesis_key_pair.public_key());
+ iroha_config::base::toml::Writer::new(&mut config);
+
+ let dir = tempfile::tempdir()?;
+ std::fs::write(dir.path().join("config.toml"), toml::to_string(&config)?)?;
+ std::fs::write(dir.path().join("executor.wasm"), "")?;
+ let config_path = dir.path().join("config.toml");
+
+ // When & Then
+
+ let report = read_config_and_genesis(&Args {
+ config: Some(config_path),
+ terminal_colors: false,
+ trace_config: false,
+ })
+ .unwrap_err();
+
+ assert_contains!(
+ format!("{report:#}"),
+ "The network consists from this one peer only"
+ );
+
+ Ok(())
+ }
+ }
+
+ #[test]
+ #[allow(clippy::bool_assert_comparison)] // for expressiveness
+ fn default_args() {
+ let args = Args::try_parse_from(["test"]).unwrap();
+
+ assert_eq!(args.terminal_colors, is_coloring_supported());
+ }
+
+ #[test]
+ #[allow(clippy::bool_assert_comparison)] // for expressiveness
+ fn terminal_colors_works_as_expected() -> eyre::Result<()> {
+ fn try_with(arg: &str) -> eyre::Result<bool> {
+ Ok(Args::try_parse_from(["test", arg])?.terminal_colors)
+ }
+
+ assert_eq!(
+ Args::try_parse_from(["test"])?.terminal_colors,
+ is_coloring_supported()
+ );
+ assert_eq!(try_with("--terminal-colors")?, true);
+ assert_eq!(try_with("--terminal-colors=false")?, false);
+ assert_eq!(try_with("--terminal-colors=true")?, true);
+ assert!(try_with("--terminal-colors=random").is_err());
+
+ Ok(())
+ }
+
+ #[test]
+ fn user_provided_config_path_works() {
+ let args = Args::try_parse_from(["test", "--config", "/home/custom/file.json"]).unwrap();
+
+ assert_eq!(args.config, Some(PathBuf::from("/home/custom/file.json")));
+ }
+
+ #[test]
+ fn user_can_provide_any_extension() {
+ let _args = Args::try_parse_from(["test", "--config", "file.toml.but.not"])
+ .expect("should allow doing this as well");
+ }
}
diff --git a/crates/irohad/src/samples.rs b/crates/irohad/src/samples.rs
deleted file mode 100644
index 79578355e2e..00000000000
--- a/crates/irohad/src/samples.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-//! This module contains the sample configurations used for testing and benchmarking throughout Iroha.
-use std::collections::HashSet;
-
-use iroha_config::{base::toml::TomlSource, parameters::actual::Root as Config};
-use iroha_crypto::{ExposedPrivateKey, KeyPair, PublicKey};
-use iroha_data_model::{peer::PeerId, ChainId};
-use iroha_primitives::{
- addr::{socket_addr, SocketAddr},
- unique_vec::UniqueVec,
-};
-
-// FIXME: move to a global test-related place, re-use everywhere else
-const DEFAULT_P2P_ADDR: SocketAddr = socket_addr!(127.0.0.1:1337);
-const DEFAULT_TORII_ADDR: SocketAddr = socket_addr!(127.0.0.1:8080);
-
-/// Get sample trusted peers. The public key must be the same as `configuration.public_key`
-///
-/// # Panics
-/// Never
-pub fn get_trusted_peers(public_key: Option<&PublicKey>) -> HashSet<PeerId> {
- let mut trusted_peers: HashSet<PeerId> = [
- (
- "localhost:1338",
- "ed01207233BFC89DCBD68C19FDE6CE6158225298EC1131B6A130D1AEB454C1AB5183C1",
- ),
- (
- "195.162.0.1:23",
- "ed01207233BFC89DCBD68C19FDE6CE6158225298EC1131B6A130D1AEB454C1AB5183C2",
- ),
- (
- "195.162.0.1:24",
- "ed01207233BFC89DCBD68C19FDE6CE6158225298EC1131B6A130D1AEB454C1AB5183C3",
- ),
- ]
- .iter()
- .map(|(a, k)| PeerId::new(a.parse().expect("Valid"), k.parse().unwrap()))
- .collect();
- if let Some(pubkey) = public_key {
- trusted_peers.insert(PeerId {
- address: DEFAULT_P2P_ADDR.clone(),
- public_key: pubkey.clone(),
- });
- }
- trusted_peers
-}
-
-#[allow(clippy::implicit_hasher)]
-/// Sample Iroha configuration in an unparsed format.
-///
-/// [`get_config`] gives the parsed, complete version of it.
-///
-/// Trusted peers must either be specified in this function, including the current peer. Use [`get_trusted_peers`]
-/// to populate `trusted_peers` if in doubt.
-pub fn get_config_toml(
- peers: UniqueVec<PeerId>,
- chain_id: ChainId,
- peer_key_pair: KeyPair,
- genesis_public_key: &PublicKey,
-) -> toml::Table {
- let (public_key, private_key) = peer_key_pair.into_parts();
-
- let mut raw = toml::Table::new();
- iroha_config::base::toml::Writer::new(&mut raw)
- .write("chain", chain_id)
- .write("public_key", public_key)
- .write("private_key", ExposedPrivateKey(private_key))
- .write(["sumeragi", "trusted_peers"], peers)
- .write(["network", "address"], DEFAULT_P2P_ADDR)
- .write(["network", "block_gossip_period_ms"], 500)
- .write(["network", "block_gossip_size"], 1)
- .write(["torii", "address"], DEFAULT_TORII_ADDR)
- .write(["genesis", "public_key"], genesis_public_key)
- .write(["genesis", "file"], "NEVER READ ME; YOU FOUND A BUG!")
- // There is no need in persistence in tests.
- // If required to should be set explicitly not to overlap with other existing tests
- .write(["snapshot", "mode"], "disabled");
-
- raw
-}
-
-#[allow(clippy::implicit_hasher)]
-/// Get a sample Iroha configuration. Trusted peers must either be
-/// specified in this function, including the current peer. Use [`get_trusted_peers`]
-/// to populate `trusted_peers` if in doubt.
-pub fn get_config(
- trusted_peers: UniqueVec<PeerId>,
- chain_id: ChainId,
- peer_key_pair: KeyPair,
- genesis_public_key: &PublicKey,
-) -> Config {
- Config::from_toml_source(TomlSource::inline(get_config_toml(
- trusted_peers,
- chain_id,
- peer_key_pair,
- genesis_public_key,
- )))
- .expect("should be a valid config")
-}
diff --git a/hooks/pre-commit.sample b/hooks/pre-commit.sample
index 040fa2c3f79..d03ae20827e 100755
--- a/hooks/pre-commit.sample
+++ b/hooks/pre-commit.sample
@@ -3,23 +3,22 @@
set -e
# format checks
cargo fmt --all -- --check
-cd ./wasm_samples/default_executor
-cargo fmt --all -- --check
-cd -
-cd ./wasm_samples
-cargo fmt --all -- --check
-cd -
+cargo fmt --manifest-path ./wasm_samples/Cargo.toml --all -- --check
+# lints
+cargo clippy --workspace --benches --tests --examples --all-features
+# TODO: fails, re-enable
+# cargo clippy --workspace --benches --tests --examples --no-default-features
+# build WASMs
+./scripts/build_wasm_samples.sh
# update the default executor
-cargo run --release --bin iroha_wasm_builder -- build ./wasm_samples/default_executor --optimize --out-file ./defaults/executor.wasm
+cp ./wasm_samples/target/prebuilt/default_executor.wasm ./defaults/executor.wasm
# update the default genesis, assuming the transaction authority is `iroha_test_samples::SAMPLE_GENESIS_ACCOUNT_ID`
-cargo run --release --bin kagami -- genesis generate --executor-path-in-genesis ./executor.wasm --genesis-public-key ed01204164BF554923ECE1FD412D241036D863A6AE430476C898248B8237D77534CFC4 > ./defaults/genesis.json
+cargo run --bin kagami -- genesis generate --executor-path-in-genesis ./executor.wasm --genesis-public-key ed01204164BF554923ECE1FD412D241036D863A6AE430476C898248B8237D77534CFC4 > ./defaults/genesis.json
# update schema
-cargo run --release --bin kagami -- schema > ./docs/source/references/schema.json
+cargo run --bin kagami -- schema > ./docs/source/references/schema.json
# update docker compose files
-cargo run --release --bin iroha_swarm -- -p 1 -s Iroha -H -c ./defaults -i hyperledger/iroha:local -b . -o ./defaults/docker-compose.single.yml -F
-cargo run --release --bin iroha_swarm -- -p 4 -s Iroha -H -c ./defaults -i hyperledger/iroha:local -b . -o ./defaults/docker-compose.local.yml -F
-cargo run --release --bin iroha_swarm -- -p 4 -s Iroha -H -c ./defaults -i hyperledger/iroha:dev -o ./defaults/docker-compose.yml -F
-# lints
-cargo lints clippy --workspace --benches --tests --examples --all-features
+cargo run --bin iroha_swarm -- -p 1 -s Iroha -H -c ./defaults -i hyperledger/iroha:local -b . -o ./defaults/docker-compose.single.yml -F
+cargo run --bin iroha_swarm -- -p 4 -s Iroha -H -c ./defaults -i hyperledger/iroha:local -b . -o ./defaults/docker-compose.local.yml -F
+cargo run --bin iroha_swarm -- -p 4 -s Iroha -H -c ./defaults -i hyperledger/iroha:dev -o ./defaults/docker-compose.yml -F
# stage updates
-git add ./defaults/executor.wasm ./defaults/genesis.json ./docs/source/references/schema.json ./defaults/docker-compose.single.yml ./defaults/docker-compose.local.yml ./defaults/docker-compose.yml
+git add ./defaults/genesis.json ./docs/source/references/schema.json ./defaults/docker-compose.single.yml ./defaults/docker-compose.local.yml ./defaults/docker-compose.yml
diff --git a/pytests/iroha_cli_tests/test/assets/test_register_asset_definitions.py b/pytests/iroha_cli_tests/test/assets/test_register_asset_definitions.py
index 4b30c3093ae..2c5710c5892 100644
--- a/pytests/iroha_cli_tests/test/assets/test_register_asset_definitions.py
+++ b/pytests/iroha_cli_tests/test/assets/test_register_asset_definitions.py
@@ -105,6 +105,7 @@ def test_register_asset_with_not_existing_domain(
iroha_cli.should(have.error(Stderr.FAILED_TO_FIND_DOMAIN.value))
+# FIXME: this should not work anymore
@allure.label("sdk_test_id", "register_asset_with_too_long_type")
def test_register_asset_with_too_long_type(
GIVEN_fake_asset_name, GIVEN_registered_domain
From 47ff2791a50e157a47e9b050fc4353b109cd11d4 Mon Sep 17 00:00:00 2001
From: 0x009922 <43530070+0x009922@users.noreply.github.com>
Date: Fri, 4 Oct 2024 16:25:16 +0900
Subject: [PATCH 2/7] chore: remove rebase artifact
Signed-off-by: 0x009922 <43530070+0x009922@users.noreply.github.com>
---
crates/iroha/benches/torii.rs | 0
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 crates/iroha/benches/torii.rs
diff --git a/crates/iroha/benches/torii.rs b/crates/iroha/benches/torii.rs
deleted file mode 100644
index e69de29bb2d..00000000000
From 3f9f9a308798cb273f65c77828231165501d3735 Mon Sep 17 00:00:00 2001
From: 0x009922 <43530070+0x009922@users.noreply.github.com>
Date: Wed, 9 Oct 2024 13:09:37 +0900
Subject: [PATCH 3/7] ci: upload test network artifacts
Signed-off-by: 0x009922 <43530070+0x009922@users.noreply.github.com>
---
.github/workflows/iroha2-dev-pr.yml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/.github/workflows/iroha2-dev-pr.yml b/.github/workflows/iroha2-dev-pr.yml
index cf3fab941a8..a187b5e45fe 100644
--- a/.github/workflows/iroha2-dev-pr.yml
+++ b/.github/workflows/iroha2-dev-pr.yml
@@ -20,6 +20,7 @@ env:
IROHA_CLI_DIR: "/__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}/test"
DOCKER_COMPOSE_PATH: defaults
WASM_SAMPLES_TARGET_DIR: wasm_samples/target/prebuilt
+ TEST_NETWORK_TMP_DIR: /tmp
jobs:
consistency:
@@ -127,6 +128,12 @@ jobs:
with:
name: report-coverage
path: lcov.info
+ - name: Upload test network artifacts
+ if: always()
+ uses: actions/upload-artifact@v4
+ with:
+ name: test_network_runs
+ path: ${{ env.TEST_NETWORK_TMP_DIR }}/irohad_test_network_*
# Run the job to check that the docker containers are properly buildable
pr-generator-build:
From e938063de8799439e54979c3a8115af5b3c575fd Mon Sep 17 00:00:00 2001
From: 0x009922 <43530070+0x009922@users.noreply.github.com>
Date: Wed, 9 Oct 2024 13:53:58 +0900
Subject: [PATCH 4/7] ci: add `ci` nextest profile
Signed-off-by: 0x009922 <43530070+0x009922@users.noreply.github.com>
---
.config/nextest.toml | 5 +++++
.github/workflows/iroha2-dev-pr.yml | 14 ++++++--------
2 files changed, 11 insertions(+), 8 deletions(-)
create mode 100644 .config/nextest.toml
diff --git a/.config/nextest.toml b/.config/nextest.toml
new file mode 100644
index 00000000000..8fbc3634b3d
--- /dev/null
+++ b/.config/nextest.toml
@@ -0,0 +1,5 @@
+[profile.ci]
+retries = 2
+fail-fast = false
+failure-output = "immediate-final"
+
diff --git a/.github/workflows/iroha2-dev-pr.yml b/.github/workflows/iroha2-dev-pr.yml
index a187b5e45fe..7454b61d12e 100644
--- a/.github/workflows/iroha2-dev-pr.yml
+++ b/.github/workflows/iroha2-dev-pr.yml
@@ -93,6 +93,8 @@ jobs:
LLVM_PROFILE_FILE_NAME: "iroha-%p-%m.profraw"
steps:
- uses: actions/checkout@v4
+ - uses: taiki-e/install-action@nextest
+ - uses: taiki-e/install-action@cargo-llvm-cov
- name: Download executor.wasm
uses: actions/download-artifact@v4
with:
@@ -105,21 +107,17 @@ jobs:
path: ${{ env.WASM_SAMPLES_TARGET_DIR }}
- name: Install irohad
run: which irohad || cargo install --path crates/irohad --locked
- - uses: taiki-e/install-action@nextest
- - uses: taiki-e/install-action@cargo-llvm-cov
- - name: Run tests (no default features)
+ - name: Test with no default features
run: >
mold --run cargo llvm-cov nextest
+ --profile ci
--no-default-features
- --no-fail-fast --retries 2
- --failure-output immediate-final
--branch --no-report
- - name: Run tests (all features)
+ - name: Test with all features
run: >
mold --run cargo llvm-cov nextest
+ --profile ci
--all-features
- --no-fail-fast --retries 2
- --failure-output immediate-final
--branch --no-report
- name: Generate lcov report
run: cargo llvm-cov report --lcov --output-path lcov.info
From a440187768aed1c1950178a46274741b0176b603 Mon Sep 17 00:00:00 2001
From: 0x009922 <43530070+0x009922@users.noreply.github.com>
Date: Fri, 4 Oct 2024 17:25:32 +0900
Subject: [PATCH 5/7] ci: reorganise workflows
Signed-off-by: 0x009922 <43530070+0x009922@users.noreply.github.com>
---
.github/workflows/iroha2-dev-nightly.yml | 49 ------------
.github/workflows/iroha2-dev-pr-static.yml | 56 --------------
.github/workflows/iroha2-dev-pr-wasm.yaml | 74 -------------------
.github/workflows/iroha2-label.yml | 19 -----
.../workflows/iroha2-no-incorrect-image.yml | 25 -------
.github/workflows/iroha2-pr-ui.yml | 34 ---------
.../{iroha2-dev.yml => publish_dev.yml} | 2 +-
...iroha2-ci-image.yml => publish_manual.yml} | 2 +-
.../{iroha2-release.yml => publish_what.yml} | 2 +-
...ha2-custom-image.yml => publish_what2.yml} | 2 +-
.../{iroha2-dev-pr.yml => pull_request.yml} | 53 ++++++++++++-
.github/workflows/pull_request_labels.yml | 19 +++++
...r-dojo.yml => pull_request_sonar_dojo.yml} | 4 +-
...ev-pr-title.yml => pull_request_title.yml} | 2 +-
14 files changed, 77 insertions(+), 266 deletions(-)
delete mode 100644 .github/workflows/iroha2-dev-nightly.yml
delete mode 100644 .github/workflows/iroha2-dev-pr-static.yml
delete mode 100644 .github/workflows/iroha2-dev-pr-wasm.yaml
delete mode 100644 .github/workflows/iroha2-label.yml
delete mode 100644 .github/workflows/iroha2-no-incorrect-image.yml
delete mode 100644 .github/workflows/iroha2-pr-ui.yml
rename .github/workflows/{iroha2-dev.yml => publish_dev.yml} (99%)
rename .github/workflows/{iroha2-ci-image.yml => publish_manual.yml} (97%)
rename .github/workflows/{iroha2-release.yml => publish_what.yml} (99%)
rename .github/workflows/{iroha2-custom-image.yml => publish_what2.yml} (99%)
rename .github/workflows/{iroha2-dev-pr.yml => pull_request.yml} (81%)
create mode 100644 .github/workflows/pull_request_labels.yml
rename .github/workflows/{iroha2-dev-sonar-dojo.yml => pull_request_sonar_dojo.yml} (97%)
rename .github/workflows/{iroha2-dev-pr-title.yml => pull_request_title.yml} (98%)
diff --git a/.github/workflows/iroha2-dev-nightly.yml b/.github/workflows/iroha2-dev-nightly.yml
deleted file mode 100644
index c3fec1acf93..00000000000
--- a/.github/workflows/iroha2-dev-nightly.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: I2::Dev::Nightly::Publish
-
-on: workflow_dispatch
-
-env:
- DOCKER_COMPOSE_PATH: defaults
-
-jobs:
- build_executor:
- runs-on: ubuntu-latest
- container:
- image: hyperledger/iroha2-ci:nightly-2024-09-09
- timeout-minutes: 30
- steps:
- - uses: actions/checkout@v4
- - name: Build iroha executor
- run: mold --run cargo run --bin iroha_wasm_builder -- build ./wasm_samples/default_executor --optimize --out-file ${{ env.DOCKER_COMPOSE_PATH }}/executor.wasm
- - name: Upload executor to reuse in other jobs
- uses: actions/upload-artifact@v4
- with:
- name: executor.wasm
- path: ${{ env.DOCKER_COMPOSE_PATH }}/executor.wasm
- retention-days: 1
-
- dockerhub:
- runs-on: ubuntu-latest
- needs: build_executor
- container:
- image: hyperledger/iroha2-ci:nightly-2024-09-09
- steps:
- - uses: actions/checkout@v4
- - name: Download executor.wasm file
- uses: actions/download-artifact@v4
- with:
- name: executor.wasm
- path: ${{ env.DOCKER_COMPOSE_PATH }}
- - uses: docker/login-action@v3
- with:
- username: ${{ secrets.DOCKERHUB_USERNAME }}
- password: ${{ secrets.DOCKERHUB_TOKEN }}
- - name: Build and push iroha2:dev-nightly image
- uses: docker/build-push-action@v6
- with:
- push: true
- tags: hyperledger/iroha:dev-nightly-${{ github.sha }}
- labels: commit=${{ github.sha }}
- build-args: TAG=dev
- # This context specification is required
- context: .
diff --git a/.github/workflows/iroha2-dev-pr-static.yml b/.github/workflows/iroha2-dev-pr-static.yml
deleted file mode 100644
index 7afbfe23fbf..00000000000
--- a/.github/workflows/iroha2-dev-pr-static.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: I2::Dev::Static
-
-on:
- pull_request:
- branches: [ main ]
- paths:
- - '**.rs'
- - '**.json'
- - '**.toml'
- - '.github/workflows/iroha2-dev-pr-static.yml'
- - '**.py'
-
-concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: true
-
-env:
- DOCKER_COMPOSE_PATH: defaults
-
-jobs:
- smart_contracts_analysis:
- runs-on: ubuntu-latest
- container:
- image: hyperledger/iroha2-ci:nightly-2024-09-09
- steps:
- - uses: actions/checkout@v4
- - name: cargo fmt (wasm_samples)
- working-directory: wasm_samples
- run: cargo fmt --all -- --check
-
- python_static_analysis:
- runs-on: ubuntu-latest
- container:
- image: hyperledger/iroha2-ci:nightly-2024-09-09
- strategy:
- matrix:
- suite: [ iroha_cli_tests, iroha_torii_tests ]
- steps:
- - uses: actions/checkout@v4
- - name: Install dependencies using Poetry for pytests/${{ matrix.suite }}
- working-directory: pytests/${{ matrix.suite }}
- run: |
- poetry lock --no-update
- poetry install
- - name: Check code formatting with Black in pytests/${{ matrix.suite }}
- working-directory: pytests/${{ matrix.suite }}
- run: |
- poetry run black --check .
- - name: Run mypy (Type Checker) in pytests/${{ matrix.suite }}
- working-directory: pytests/${{ matrix.suite }}
- run: |
- poetry run mypy --explicit-package-bases --ignore-missing-imports .
- - name: Run flake8 (Linter) in pytests/${{ matrix.suite }}
- working-directory: pytests/${{ matrix.suite }}
- run: |
- poetry run flake8 . --max-line-length=110 --ignore=F401,W503,E203
diff --git a/.github/workflows/iroha2-dev-pr-wasm.yaml b/.github/workflows/iroha2-dev-pr-wasm.yaml
deleted file mode 100644
index 46ea3c64dc1..00000000000
--- a/.github/workflows/iroha2-dev-pr-wasm.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-name: I2::Dev::Wasm
-
-on:
- pull_request:
- branches: [main]
- paths:
- - '.github/workflows/iroha2-dev-pr-wasm.yaml'
-
- - 'crates/iroha_data_model/**.rs'
- - 'crates/iroha_data_model/**.yml'
- - 'crates/iroha_data_model/**.json'
- - 'crates/iroha_data_model/**.toml'
-
- - 'crates/iroha_crypto/**.rs'
- - 'crates/iroha_crypto/**.yml'
- - 'crates/iroha_crypto/**.json'
- - 'crates/iroha_crypto/**.toml'
-
- - 'crates/iroha_smart_contract/**.rs'
- - 'crates/iroha_smart_contract/**.yml'
- - 'crates/iroha_smart_contract/**.json'
- - 'crates/iroha_smart_contract/**.toml'
-
- - 'crates/iroha_executor/**.rs'
- - 'crates/iroha_executor/**.yml'
- - 'crates/iroha_executor/**.json'
- - 'crates/iroha_executor/**.toml'
-
- - 'crates/iroha_trigger/**.rs'
- - 'crates/iroha_trigger/**.yml'
- - 'crates/iroha_trigger/**.json'
- - 'crates/iroha_trigger/**.toml'
-
-concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: true
-
-env:
- DOCKER_COMPOSE_PATH: defaults
-
-jobs:
- build_executor:
- runs-on: ubuntu-latest
- container:
- image: hyperledger/iroha2-ci:nightly-2024-09-09
- timeout-minutes: 30
- steps:
- - uses: actions/checkout@v4
- - name: Build iroha executor
- run: mold --run cargo run --bin iroha_wasm_builder -- build ./wasm_samples/default_executor --optimize --out-file ${{ env.DOCKER_COMPOSE_PATH }}/executor.wasm
- - name: Upload executor to reuse in other jobs
- uses: actions/upload-artifact@v4
- with:
- name: executor.wasm
- path: ${{ env.DOCKER_COMPOSE_PATH }}/executor.wasm
- retention-days: 1
-
- tests:
- runs-on: ubuntu-latest
- container:
- image: hyperledger/iroha2-ci:nightly-2024-09-09
- needs: build_executor
- steps:
- - uses: actions/checkout@v4
- - name: Download executor.wasm
- uses: actions/download-artifact@v4
- with:
- name: executor.wasm
- path: ${{ env.DOCKER_COMPOSE_PATH }}
- - name: Install iroha_wasm_test_runner
- run: which iroha_wasm_test_runner || cargo install --path crates/iroha_wasm_test_runner
- - name: Run smart contract tests on WebAssembly VM
- working-directory: crates/iroha_smart_contract
- run: mold --run cargo test -p iroha_smart_contract -p iroha_smart_contract_utils --release --tests --target wasm32-unknown-unknown --no-fail-fast --quiet
diff --git a/.github/workflows/iroha2-label.yml b/.github/workflows/iroha2-label.yml
deleted file mode 100644
index ff32ad0cab9..00000000000
--- a/.github/workflows/iroha2-label.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: I2::Label
-
-on:
- pull_request_target:
-
-jobs:
- labeler:
- permissions:
- contents: read
- pull-requests: write
- runs-on: ubuntu-latest
- steps:
- - id: label-the-PR
- uses: actions/labeler@v5
- - uses: mshick/add-pr-comment@v2
- if: contains(steps.label-the-PR.outputs.all-labels, 'config-changes')
- with:
- message: |
- @BAStos525
diff --git a/.github/workflows/iroha2-no-incorrect-image.yml b/.github/workflows/iroha2-no-incorrect-image.yml
deleted file mode 100644
index a1c2b311be4..00000000000
--- a/.github/workflows/iroha2-no-incorrect-image.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: I2::CI::check_for_incorrect_images
-
-on:
- push:
- branches:
- - main
- - stable
-
-jobs:
- check:
- runs-on: ubuntu-22.04
- steps:
- - name: Install Python
- uses: actions/setup-python@v5
- with:
- python-version: '>=3.11'
- - uses: actions/checkout@v4
- - name: Install dependencies
- run: pip install -r .github/scripts/ci_test/requirements.txt --no-input
- - name: Check containers on iroha2 stable branch
- if: github.base_ref == 'stable'
- run: python .github/scripts/ci_test/ci_image_scan.py --allow iroha2:stable -- docker-compose*.yml
- - name: Check containers on iroha2 main branch
- if: github.base_ref == 'main'
- run: python .github/scripts/ci_test/ci_image_scan.py --allow iroha2:dev -- docker-compose*.yml
diff --git a/.github/workflows/iroha2-pr-ui.yml b/.github/workflows/iroha2-pr-ui.yml
deleted file mode 100644
index 33dd0b1922a..00000000000
--- a/.github/workflows/iroha2-pr-ui.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: I2::Tests::UI
-
-on:
- pull_request:
- branches: [main, stable, lts]
- paths:
- - 'crates/*_derive/**.rs'
- - 'crates/*_macro*/**.rs'
- - '**/tests/ui.rs'
- - '**/tests/ui_*/**'
- - 'rust-toolchain.toml'
- - '.github/workflows/iroha2-pr-ui.yml'
-
-concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: true
-
-env:
- CARGO_TERM_COLOR: always
-
-jobs:
- tests:
- runs-on: [self-hosted, Linux, iroha2]
- container:
- image: hyperledger/iroha2-ci:nightly-2024-09-09
- timeout-minutes: 60
- strategy:
- matrix:
- feature_flag: [all-features, no-default-features]
- steps:
- - uses: actions/checkout@v4
- - uses: taiki-e/install-action@nextest
- - name: Run UI tests, with ${{ matrix.feature_flag }}
- run: mold --run cargo nextest run --no-fail-fast -E 'test(ui)' --${{ matrix.feature_flag }}
diff --git a/.github/workflows/iroha2-dev.yml b/.github/workflows/publish_dev.yml
similarity index 99%
rename from .github/workflows/iroha2-dev.yml
rename to .github/workflows/publish_dev.yml
index c830514182e..817e10a9ac3 100644
--- a/.github/workflows/iroha2-dev.yml
+++ b/.github/workflows/publish_dev.yml
@@ -1,4 +1,4 @@
-name: I2::Dev::Publish
+name: publish/dev
on:
push:
diff --git a/.github/workflows/iroha2-ci-image.yml b/.github/workflows/publish_manual.yml
similarity index 97%
rename from .github/workflows/iroha2-ci-image.yml
rename to .github/workflows/publish_manual.yml
index 8e09c771ad5..f7124ae076b 100644
--- a/.github/workflows/iroha2-ci-image.yml
+++ b/.github/workflows/publish_manual.yml
@@ -1,4 +1,4 @@
-name: I2::CI::Publish
+name: publish/manual
on:
workflow_dispatch:
diff --git a/.github/workflows/iroha2-release.yml b/.github/workflows/publish_what.yml
similarity index 99%
rename from .github/workflows/iroha2-release.yml
rename to .github/workflows/publish_what.yml
index bb78307f6a8..4eb1c181253 100644
--- a/.github/workflows/iroha2-release.yml
+++ b/.github/workflows/publish_what.yml
@@ -1,4 +1,4 @@
-name: I2::Release::Publish
+name: publish/what?
on:
push:
diff --git a/.github/workflows/iroha2-custom-image.yml b/.github/workflows/publish_what2.yml
similarity index 99%
rename from .github/workflows/iroha2-custom-image.yml
rename to .github/workflows/publish_what2.yml
index 2ebdb726114..cf47cd74570 100644
--- a/.github/workflows/iroha2-custom-image.yml
+++ b/.github/workflows/publish_what2.yml
@@ -1,4 +1,4 @@
-name: I2::Custom::Publish
+name: publish/what 2?
on:
push:
diff --git a/.github/workflows/iroha2-dev-pr.yml b/.github/workflows/pull_request.yml
similarity index 81%
rename from .github/workflows/iroha2-dev-pr.yml
rename to .github/workflows/pull_request.yml
index 7454b61d12e..2ac7bc33074 100644
--- a/.github/workflows/iroha2-dev-pr.yml
+++ b/.github/workflows/pull_request.yml
@@ -1,4 +1,4 @@
-name: I2::Dev::Tests
+name: pull_request
on:
pull_request:
@@ -9,7 +9,7 @@ on:
- '**.toml'
- '**.lock'
- '**.py'
- - '.github/workflows/iroha2-dev-pr.yml'
+ - 'pull_request.yml'
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
@@ -46,7 +46,10 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Format
+ if: always()
run: cargo fmt --all -- --check
+ - name: Format (wasm_samples)
+ run: cargo fmt --manifest-path wasm_samples/Cargo.toml --all -- --check
- name: Lints without features
if: always()
run: cargo clippy --workspace --benches --tests --examples --no-default-features --quiet
@@ -62,6 +65,33 @@ jobs:
name: report-clippy
path: clippy.json
+ python_static_analysis:
+ runs-on: ubuntu-latest
+ container:
+ image: hyperledger/iroha2-ci:nightly-2024-09-09
+ strategy:
+ matrix:
+ suite: [iroha_cli_tests, iroha_torii_tests]
+ steps:
+ - uses: actions/checkout@v4
+ - name: Install dependencies using Poetry for pytests/${{ matrix.suite }}
+ working-directory: pytests/${{ matrix.suite }}
+ run: |
+ poetry lock --no-update
+ poetry install
+ - name: Check code formatting with Black in pytests/${{ matrix.suite }}
+ working-directory: pytests/${{ matrix.suite }}
+ run: |
+ poetry run black --check .
+ - name: Run mypy (Type Checker) in pytests/${{ matrix.suite }}
+ working-directory: pytests/${{ matrix.suite }}
+ run: |
+ poetry run mypy --explicit-package-bases --ignore-missing-imports .
+ - name: Run flake8 (Linter) in pytests/${{ matrix.suite }}
+ working-directory: pytests/${{ matrix.suite }}
+ run: |
+ poetry run flake8 . --max-line-length=110 --ignore=F401,W503,E203
+
build_wasm_samples:
runs-on: ubuntu-latest
container:
@@ -133,6 +163,25 @@ jobs:
name: test_network_runs
path: ${{ env.TEST_NETWORK_TMP_DIR }}/irohad_test_network_*
+ test_wasms:
+ runs-on: ubuntu-latest
+ container:
+ image: hyperledger/iroha2-ci:nightly-2024-09-09
+ needs: build_wasm_samples
+ steps:
+ - uses: actions/checkout@v4
+ - name: Download executor.wasm
+ uses: actions/download-artifact@v4
+ with:
+ name: executor.wasm
+ path: ${{ env.DOCKER_COMPOSE_PATH }}
+ - name: Install iroha_wasm_test_runner
+ run: which iroha_wasm_test_runner || cargo install --path crates/iroha_wasm_test_runner
+ - name: Run smart contract tests on WebAssembly VM
+ working-directory: crates/iroha_smart_contract
+ run: mold --run cargo test -p iroha_smart_contract -p iroha_smart_contract_utils --release --tests --target wasm32-unknown-unknown --no-fail-fast --quiet
+
+
# Run the job to check that the docker containers are properly buildable
pr-generator-build:
# Job will only execute if the head of the pull request is a branch for PR-generator case
diff --git a/.github/workflows/pull_request_labels.yml b/.github/workflows/pull_request_labels.yml
new file mode 100644
index 00000000000..64f6300fe10
--- /dev/null
+++ b/.github/workflows/pull_request_labels.yml
@@ -0,0 +1,19 @@
+name: pull_request/labels
+
+on:
+ pull_request_target:
+
+jobs:
+ main:
+ permissions:
+ contents: read
+ pull-requests: write
+ runs-on: ubuntu-latest
+ steps:
+ - id: label-the-PR
+ uses: actions/labeler@v5
+ - uses: mshick/add-pr-comment@v2
+ if: contains(steps.label-the-PR.outputs.all-labels, 'config-changes')
+ with:
+ message: |
+ @BAStos525
diff --git a/.github/workflows/iroha2-dev-sonar-dojo.yml b/.github/workflows/pull_request_sonar_dojo.yml
similarity index 97%
rename from .github/workflows/iroha2-dev-sonar-dojo.yml
rename to .github/workflows/pull_request_sonar_dojo.yml
index 8b7e305573b..4d8808ba7d4 100644
--- a/.github/workflows/iroha2-dev-sonar-dojo.yml
+++ b/.github/workflows/pull_request_sonar_dojo.yml
@@ -1,8 +1,8 @@
-name: I2::Dev::Sonar-Dojo
+name: pull_request/sonar_dojo
on:
workflow_run:
- workflows: ["I2::Dev::Tests"]
+ workflows: ["pull_request"]
types: [completed]
concurrency:
diff --git a/.github/workflows/iroha2-dev-pr-title.yml b/.github/workflows/pull_request_title.yml
similarity index 98%
rename from .github/workflows/iroha2-dev-pr-title.yml
rename to .github/workflows/pull_request_title.yml
index 1541f3f2516..230818d3ee9 100644
--- a/.github/workflows/iroha2-dev-pr-title.yml
+++ b/.github/workflows/pull_request_title.yml
@@ -1,4 +1,4 @@
-name: I2::Dev::Title
+name: pull_request/title
on:
pull_request_target:
From 1b6c96e6f2abf7977dcefbc288a4167c5e5ab1d5 Mon Sep 17 00:00:00 2001
From: 0x009922 <43530070+0x009922@users.noreply.github.com>
Date: Fri, 4 Oct 2024 17:36:16 +0900
Subject: [PATCH 6/7] chore: rename job name
Signed-off-by: 0x009922 <43530070+0x009922@users.noreply.github.com>
---
.github/workflows/pull_request.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 2ac7bc33074..31ce331b4f2 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -183,7 +183,7 @@ jobs:
# Run the job to check that the docker containers are properly buildable
- pr-generator-build:
+ image_build_push:
# Job will only execute if the head of the pull request is a branch for PR-generator case
if: startsWith(github.head_ref, 'iroha2-pr-deploy/')
runs-on: [self-hosted, Linux, iroha2]
From 2bed378f35296e5750f1592ae927139a8f859bdc Mon Sep 17 00:00:00 2001
From: 0x009922 <43530070+0x009922@users.noreply.github.com>
Date: Wed, 9 Oct 2024 13:15:23 +0900
Subject: [PATCH 7/7] ci: rename workflows, remove redundancies further
Signed-off-by: 0x009922 <43530070+0x009922@users.noreply.github.com>
---
.github/workflows/{pull_request.yml => integrity.yml} | 4 ++--
.github/workflows/{pull_request_labels.yml => labels.yml} | 2 +-
.../workflows/{pull_request_sonar_dojo.yml => sonar_dojo.yml} | 4 ++--
.github/workflows/{pull_request_title.yml => title.yml} | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
rename .github/workflows/{pull_request.yml => integrity.yml} (99%)
rename .github/workflows/{pull_request_labels.yml => labels.yml} (93%)
rename .github/workflows/{pull_request_sonar_dojo.yml => sonar_dojo.yml} (97%)
rename .github/workflows/{pull_request_title.yml => title.yml} (98%)
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/integrity.yml
similarity index 99%
rename from .github/workflows/pull_request.yml
rename to .github/workflows/integrity.yml
index 31ce331b4f2..e2f3e097206 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/integrity.yml
@@ -1,4 +1,4 @@
-name: pull_request
+name: integrity
on:
pull_request:
@@ -92,6 +92,7 @@ jobs:
run: |
poetry run flake8 . --max-line-length=110 --ignore=F401,W503,E203
+
build_wasm_samples:
runs-on: ubuntu-latest
container:
@@ -181,7 +182,6 @@ jobs:
working-directory: crates/iroha_smart_contract
run: mold --run cargo test -p iroha_smart_contract -p iroha_smart_contract_utils --release --tests --target wasm32-unknown-unknown --no-fail-fast --quiet
-
# Run the job to check that the docker containers are properly buildable
image_build_push:
# Job will only execute if the head of the pull request is a branch for PR-generator case
diff --git a/.github/workflows/pull_request_labels.yml b/.github/workflows/labels.yml
similarity index 93%
rename from .github/workflows/pull_request_labels.yml
rename to .github/workflows/labels.yml
index 64f6300fe10..ab32dbae444 100644
--- a/.github/workflows/pull_request_labels.yml
+++ b/.github/workflows/labels.yml
@@ -1,4 +1,4 @@
-name: pull_request/labels
+name: labels
on:
pull_request_target:
diff --git a/.github/workflows/pull_request_sonar_dojo.yml b/.github/workflows/sonar_dojo.yml
similarity index 97%
rename from .github/workflows/pull_request_sonar_dojo.yml
rename to .github/workflows/sonar_dojo.yml
index 4d8808ba7d4..62d1c6aa7ee 100644
--- a/.github/workflows/pull_request_sonar_dojo.yml
+++ b/.github/workflows/sonar_dojo.yml
@@ -1,8 +1,8 @@
-name: pull_request/sonar_dojo
+name: sonar_dojo
on:
workflow_run:
- workflows: ["pull_request"]
+ workflows: ["integrity"]
types: [completed]
concurrency:
diff --git a/.github/workflows/pull_request_title.yml b/.github/workflows/title.yml
similarity index 98%
rename from .github/workflows/pull_request_title.yml
rename to .github/workflows/title.yml
index 230818d3ee9..a707e80274b 100644
--- a/.github/workflows/pull_request_title.yml
+++ b/.github/workflows/title.yml
@@ -1,4 +1,4 @@
-name: pull_request/title
+name: title
on:
pull_request_target: