Skip to content

Commit

Permalink
[fix]: revert String in Kura, update test_env.py
Browse files Browse the repository at this point in the history
Signed-off-by: Dmitry Balashov <[email protected]>
  • Loading branch information
0x009922 committed Dec 6, 2023
1 parent 2cfc0e1 commit 48201cd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
3 changes: 1 addition & 2 deletions config/src/kura.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand All @@ -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,
}
Expand Down
5 changes: 2 additions & 3 deletions scripts/test_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down

0 comments on commit 48201cd

Please sign in to comment.