[hyperledger-iroha#2118]: WIP: Default config

Signed-off-by: Ilia Churin <[email protected]>
ilchu · Aug 2, 2022 · 45f3643 · 45f3643
1 parent b8fc0c6
commit 45f3643
Show file tree

Hide file tree

Showing 15 changed files with 1,216 additions and 819 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
@@ -8,7 +8,8 @@ use std::{panic, path::PathBuf, sync::Arc};
 
 use color_eyre::eyre::{eyre, Result, WrapErr};
 use iroha_actor::{broker::*, prelude::*};
-use iroha_config::iroha::Configuration;
+use iroha_config::base::proxy::DocsDefault;
+use iroha_config::iroha::{Configuration, ConfigurationProxy};
 use iroha_core::{
     block_sync::{BlockSynchronizer, BlockSynchronizerTrait},
     genesis::{GenesisNetwork, GenesisNetworkTrait, RawGenesisBlock},

diff --git a/cli/src/samples.rs b/cli/src/samples.rs
@@ -3,6 +3,7 @@
 use std::{collections::HashSet, str::FromStr};
 
 use iroha_config::{
+    base::proxy::DocsDefault,
     block_sync::Configuration as BlockSyncConfiguration,
     genesis::Configuration as GenesisConfiguration,
     iroha::Configuration,
@@ -13,6 +14,7 @@ use iroha_config::{
     wasm::Configuration as WasmConfiguration,
     wsv::Configuration as WsvConfiguration,
 };
+
 use iroha_crypto::{KeyPair, PublicKey};
 use iroha_data_model::peer::Id as PeerId;
 

diff --git a/config/base/Cargo.toml b/config/base/Cargo.toml
@@ -12,3 +12,4 @@ serde_json = "1.0"
 thiserror = "1.0.30"
 crossbeam = "0.8.1"
 derive_more = "0.99.17"
+eyre = "0.6.8"