Skip to content

Commit 9d91c77

Browse files
0x009922DCNick3
0x009922
and
DCNick3
authored
feat: improve config debug-ability (#4456)
* [refactor]: put new API into `iroha_config_base` Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [test]: move tests Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [feat]: create foundation for `ReadConfig` derive (wip) Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [fix]: parse `default` properly Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [feat]: impl shape analysis Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [test]: update stderr Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [fix]: fix macro, it kind of works! Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: improve errors Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: update `iroha_config` (wip) Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: update user layer, mostly Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: move `iroha_config` onto the new rails Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: lints & chores Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [fix]: fix visibility issues in data model Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [fix]: after-rebase chores Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: update `iroha_core` Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: update the whole workspace Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: lints Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [chore]: fix cfg Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: balance trace logs Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: move high-level validations to CLI layer Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: change `custom` to `env_custom` Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [feat]: attach TOML value to report Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [feat]: enhance origin attachments Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [fix]: client cli... works? Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: rehearse errors Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: chores Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [fix]: compiler errors and lints Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [test]: fix tests, validate addrs only in `release` Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: internal docs, renamings, lints Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [test]: fix private keys in test configs Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [fix]: allow self peer id in trusted peers Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [test]: update snapshot Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: ⭐️NINIKA⭐️ <DCNick3@users.noreply.github.com> Signed-off-by: 0x009922 <43530070+0x009922@users.noreply.github.com> * [feat]: prefix macro error Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [docs]: add a note about syntactic match Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: delegate parsing to `syn::punctuated` Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: use mutable reader, split `ReadingDone` Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: lints Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [chore]: link false-positive issue rust-lang/rust#44752 (comment) Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: ignore report locations address #4456 (comment) Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [fix]: use `ExposedPrivateKey` Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [fix]: fix with all-features Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [refactor]: chores Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * [chore]: format Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * refactor: use stricter `TrustedPeers` struct Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * chore: remove extra TODO Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * refactor: remove `env_custom` Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * chore: remove extra import Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * revert: return `pub(crate)` vis Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * chore: dead import Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> * fix: fix path to `iroha_test_config.toml` Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> --------- Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> Signed-off-by: 0x009922 <43530070+0x009922@users.noreply.github.com> Co-authored-by: ⭐️NINIKA⭐️ <DCNick3@users.noreply.github.com>
1 parent bf789ef commit 9d91c77

81 files changed

Lines changed: 4916 additions & 3346 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Cargo.lock‎

Lines changed: 350 additions & 495 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ iroha_data_model_derive = { version = "=2.0.0-pre-rc.21", path = "data_model/der
3030
iroha_client = { version = "=2.0.0-pre-rc.21", path = "client" }
3131
iroha_config = { version = "=2.0.0-pre-rc.21", path = "config" }
3232
iroha_config_base = { version = "=2.0.0-pre-rc.21", path = "config/base" }
33+
iroha_config_base_derive = { version = "=2.0.0-pre-rc.21", path = "config/base/derive" }
3334
iroha_schema_gen = { version = "=2.0.0-pre-rc.21", path = "schema/gen" }
3435
iroha_schema = { version = "=2.0.0-pre-rc.21", path = "schema", default-features = false }
3536
iroha_schema_derive = { version = "=2.0.0-pre-rc.21", path = "schema/derive" }
@@ -96,11 +97,13 @@ spinoff = "0.8.0"
9697

9798
criterion = "0.5.1"
9899
expect-test = "1.5.0"
100+
assertables = "7"
99101

100102
eyre = "0.6.12"
101103
color-eyre = "0.6.3"
102104
thiserror = { version = "1.0.60", default-features = false }
103105
displaydoc = { version = "0.2.4", default-features = false }
106+
error-stack = "0.4.1"
104107

105108
cfg-if = "1.0.0"
106109
derive_more = { version = "0.99.17", default-features = false }

‎cli/Cargo.toml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,25 @@ iroha_genesis = { workspace = true }
5454
iroha_wasm_builder = { workspace = true }
5555

5656
clap = { workspace = true, features = ["derive", "env", "string"] }
57-
color-eyre = { workspace = true }
5857
eyre = { workspace = true }
58+
error-stack = { workspace = true, features = ["eyre"] }
59+
thiserror = { workspace = true }
5960
tracing = { workspace = true }
6061
tokio = { workspace = true, features = ["macros", "signal"] }
6162
once_cell = { workspace = true }
6263
owo-colors = { workspace = true, features = ["supports-colors"] }
6364
supports-color = { workspace = true }
65+
toml = { workspace = true }
6466

6567
thread-local-panic-hook = { version = "0.1.0", optional = true }
6668

6769
[dev-dependencies]
6870
serial_test = "3.1.1"
6971
tempfile = { workspace = true }
70-
toml = { workspace = true }
7172
json5 = { workspace = true }
7273
futures = { workspace = true }
7374
path-absolutize = { workspace = true }
74-
assertables = "7"
75+
assertables = { workspace = true }
7576

7677
[build-dependencies]
7778
iroha_wasm_builder = { workspace = true }

0 commit comments

Comments
 (0)