From 48201cda60184be275c6c2327ea3922033d224bc Mon Sep 17 00:00:00 2001 From: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> Date: Wed, 6 Dec 2023 11:41:54 +0700 Subject: [PATCH] [fix]: revert `String` in Kura, update `test_env.py` Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com> --- config/src/kura.rs | 3 +-- scripts/test_env.py | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/src/kura.rs b/config/src/kura.rs index d99a5e97800..03c0cb4fb74 100644 --- a/config/src/kura.rs +++ b/config/src/kura.rs @@ -1,5 +1,4 @@ //! Module for kura-related configuration and structs -use std::path::PathBuf; use eyre::Result; use iroha_config_base::derive::{Documented, Proxy}; @@ -15,7 +14,7 @@ pub struct Configuration { /// Initialization mode: `strict` or `fast`. pub init_mode: Mode, /// Path to the existing block store folder or path to create new folder. - pub block_store_path: PathBuf, + pub block_store_path: String, /// Whether or not new blocks be outputted to a file called blocks.json. pub debug_output_new_blocks: bool, } diff --git a/scripts/test_env.py b/scripts/test_env.py index 21db25afa48..458fc0ae6c1 100755 --- a/scripts/test_env.py +++ b/scripts/test_env.py @@ -119,8 +119,7 @@ def run(self, is_genesis: bool = False): os.environ["KURA_BLOCK_STORE_PATH"] = str(peer_dir.joinpath("storage")) os.environ["SNAPSHOT_DIR_PATH"] = str(peer_dir.joinpath("storage")) os.environ["LOG_LEVEL"] = "TRACE" - # FIXME: should it be JSON here? - os.environ["LOG_FORMAT"] = "json" + os.environ["LOG_FORMAT"] = "\"pretty\"" os.environ["LOG_TOKIO_CONSOLE_ADDR"] = f"{self.host_ip}:{self.tokio_console_port}" os.environ["IROHA_PUBLIC_KEY"] = self.public_key os.environ["IROHA_PRIVATE_KEY"] = self.private_key @@ -130,7 +129,7 @@ def run(self, is_genesis: bool = False): genesis_arg = "--submit-genesis" if is_genesis else "" # FD never gets closed - log_file = open(peer_dir.joinpath("log.json"), "w") + log_file = open(peer_dir.joinpath(".log"), "w") # These processes are created detached from the parent process already subprocess.Popen([self.name, genesis_arg], executable=f"{self.out_dir}/peers/iroha", stdout=log_file, stderr=subprocess.STDOUT)