[feature] #3454: make LTS the default

Signed-off-by: Marin Veršić <marin.versic101@gmail.com>
hyperledger · May 5, 2023 · 0429594 · 0429594
1 parent d760772
commit 0429594
Show file tree

Hide file tree

Showing 21 changed files with 493 additions and 545 deletions.
diff --git a/README.md b/README.md
@@ -118,7 +118,7 @@ docker compose up
 With the `docker-compose` instance running, use [Iroha Client CLI](./client_cli/README.md):
 
 ```bash
-cp configs/client_cli/config.json target/debug/config.json
+cp configs/cli/config.json target/debug/config.json
 cd target/debug
 ./iroha_client_cli --help
 ```

diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -115,9 +115,8 @@ async fn main() -> Result<(), color_eyre::Report> {
         iroha_logger::warn!("The configuration parameter `DISABLE_PANIC_TERMINAL_COLORS` is deprecated. Set `TERMINAL_COLORS=false` instead. ")
     }
     iroha_logger::info!(
-        git_commit_sha = env!("VERGEN_GIT_SHA"),
-        "Hyperledgerいろは2にようこそ！(translation) Welcome to Hyperledger Iroha {}!",
-        env!("CARGO_PKG_VERSION")
+        git_commit_sha = env!("VERGEN_GIT_SHA"), version = %env!("CARGO_PKG_VERSION"),
+        "Hyperledgerいろは2にようこそ！(translation) Welcome to Hyperledger Iroha!"
     );
 
     let genesis = if let Some(genesis_path) = &args.genesis_path {

diff --git a/client/examples/tutorial.rs b/client/examples/tutorial.rs
@@ -12,12 +12,12 @@ use iroha_data_model::TryToValue;
 
 fn main() {
     // #region rust_config_load
-    let config_loc = "../configs/client_cli/config.json";
+    let config_loc = "../configs/client/config.json";
     let file = File::open(config_loc)
         .wrap_err("Unable to load the configuration file at `.....`")
         .expect("Config file is loading normally.");
     let config: Configuration = serde_json::from_reader(file)
-        .wrap_err("Failed to parse `../configs/client_cli/config.json`")
+        .wrap_err("Failed to parse `../configs/client/config.json`")
         .expect("Verified in tests");
     // #endregion rust_config_load
 

diff --git a/config/src/client.rs b/config/src/client.rs
@@ -233,7 +233,7 @@ mod tests {
     use super::*;
     use crate::torii::{uri::DEFAULT_API_URL, DEFAULT_TORII_TELEMETRY_URL};
 
-    const CONFIGURATION_PATH: &str = "../configs/client_cli/config.json";
+    const CONFIGURATION_PATH: &str = "../configs/client/config.json";
 
     prop_compose! {
         // TODO: make tests to check generated key validity

diff --git a/configs/peer/legacy_stable/config.json → configs/client/config.json b/configs/peer/legacy_stable/config.json → configs/client/config.json
diff --git a/configs/client_cli/config.json b/configs/client_cli/config.json