Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[suggestion] Simplify genesis config #4029

Closed
Tracked by #392
0x009922 opened this issue Nov 3, 2023 · 6 comments
Closed
Tracked by #392

[suggestion] Simplify genesis config #4029

0x009922 opened this issue Nov 3, 2023 · 6 comments
Assignees
Labels
config-changes Changes in configuration and start up of the Iroha iroha2-dev The re-implementation of a BFT hyperledger in RUST question Further information is requested

Comments

@0x009922
Copy link
Contributor

0x009922 commented Nov 3, 2023

Description

I propose to simplify genesis configuration a little bit by moving it to config file & env and dropping the related CLI flag.

How it works now

There are the following configurations:

  • --submit-genesis CLI flag to enable submitting for a particular field
  • IROHA_GENESIS env var with path to genesis file (defaults to genesis.json)
  • genesis.public_key (GENESIS_PUBLIC_KEY) parameter that must be set for ALL peers
  • genesis.private_key (GENESIS_PRIVATE_KEY) parameter that must be set when --submit-genesis is set.

What is wrong:

  • IROHA_GENESIS can only be set via ENV
  • Intention to submit genesis is duplicated by setting --submit-genesis and genesis.private_key

Proposed change

  • genesis.public_key, required for all
  • genesis.private_key and genesis.file for the peer that submits the genesis
  • genesis.file might have a default value (genesis.json) which is applied if only genesis.private_key is set. Although it might make behaviour somewhat unclear. I think enforcing genesis.file to be set explicitly will be more reliable.

Benefits:

  • Flexible: genesis might be configured via only config file, or via only ENV, or mixed
  • Simple: no extra CLI flag
@0x009922 0x009922 added question Further information is requested iroha2-dev The re-implementation of a BFT hyperledger in RUST config-changes Changes in configuration and start up of the Iroha labels Nov 3, 2023
@6r1d
Copy link
Contributor

6r1d commented Nov 3, 2023

Thanks, that looks reasonable. If this issue is copied to the docs with minimal changes, it will help the users a lot in the setup stage.

@0x009922 0x009922 changed the title [discussion] Simplify genesis config [suggestion] Simplify genesis config Nov 3, 2023
@0x009922
Copy link
Contributor Author

Related discussion: hyperledger-iroha/iroha-2-docs#397 (comment)

@Mingela
Copy link
Contributor

Mingela commented Nov 17, 2023

What is the error handling procedure in case multiple peers have genesis private key specified?

@0x009922
Copy link
Contributor Author

What is the error handling procedure in case multiple peers have genesis private key specified?

@Mingela, I don't know how the situation of multiple peers submitting genesis blocks is handled now. Anyway, this proposal doesn't change anything here. It only changes the way of configuration.

@Mingela
Copy link
Contributor

Mingela commented Nov 17, 2023

Fine to me then

@mversic
Copy link
Contributor

mversic commented Dec 7, 2023

I would like to preserve the explicit intent to submit genesis. This way user would not get into a situation where multiple nodes submit genesis accidentally. If multiple nodes submitting genesis is not an issue, then we can take the behavior as describe in this issue

@0x009922 0x009922 self-assigned this Dec 8, 2023
0x009922 added a commit that referenced this issue Dec 22, 2023
* [refactor]: refactor cli(s)

- `iroha`: use `clap` `v4`
- `iroha`: update CLI (`--config`, `--terminal-colors`)
- `iroha`: handle user-provided config file strictly
- `iroha`: parse ENV config after file config
- `iroha_config`: add `genesis.file`, remove `account_*` prefix
- `iroha_config`: move some genesis config validation logic
  from `iroha`
- `iroha_client_cli`: upgrade `clap` to `v4`
- `iroha_genesis`: remove side effects (bail, logs)
- `iroha_genesis`: clarify validation logic (#3075)
- `iroha_genesis`: remove `pub` to guard invariant of `GenesisNetwork`

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: chore

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: fix & test config

- `iroha_config`: use `PathBuf` when appropriate
- `iroha_config`: fix `Path` behaviour
- `iroha_config`: finally, make `disable_panic_terminal_colors`
  truly optional (#3506)
- `iroha`: resolve all relative paths in config file
- `iroha`: improve config error messages
- `iroha`: add config integration tests

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: test & refactor

- `iroha_client_cli`: adopt `--config` from `iroha`
- `iroha_client_cli`: refactor `--metadata` arg
- `iroha`: extend tests
- update test code overall

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: clippy, tests

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: use `serde_as_str` for paths

Signed-off-by: Dmitry Balashov <[email protected]>

* [chore]: re-generate peer config

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: update `test_env.py`

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: remove deprecated option from test config

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: update README

Signed-off-by: Dmitry Balashov <[email protected]>

* [chore]: remove obsolete comment

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: update `iroha_swarm`

Now it relies on that `genesis.file` is set in the config file

Signed-off-by: Dmitry Balashov <[email protected]>

* [feat]: `kagami config peer` + `--genesis-file-in-config`

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: chores

Signed-off-by: Dmitry Balashov <[email protected]>

* Apply suggestions from code review

Co-authored-by: Ekaterina Mekhnetsova <[email protected]>
Signed-off-by: 0x009922 <[email protected]>

* [feat]: use `PATH` as value name

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: align `StatusFailure` message

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: adopt suggestion in `iroha_client_cli`

#4153 (comment)
Signed-off-by: Dmitry Balashov <[email protected]>

* [build]: exclude `genesis.file` from default config

Signed-off-by: Dmitry Balashov <[email protected]>

* [feat]: refine genesis config parse error

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: fix & refactor `test_env.py`

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: fix CANNOT_BE_EMPTY message

It is updated with a new version of clap

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: return `disable_panic_terminal_colors: null` to test config

It is needed so that only `iroha_test_config.json` without
defaults layer is valid (will fix on config refactoring)

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: handle configuration properly in `iroha_swarm`

- set `GENESIS_FILE` in env, since `config.json` doesn't have it
- strictly specify `config.json` and `genesis.json` files

Signed-off-by: Dmitry Balashov <[email protected]>

* Apply suggestions from code review

Co-authored-by: ⭐️NINIKA⭐️ <[email protected]>
Signed-off-by: 0x009922 <[email protected]>

* Update client_cli/src/main.rs

Co-authored-by: ⭐️NINIKA⭐️ <[email protected]>
Signed-off-by: 0x009922 <[email protected]>

* [refactor]: eliminate extra `iroha_config` dependency

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: remove dead code

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: use `serde_json::json!`

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: remove `disable_panic_terminal_colors` parameter

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: update genesis & its testing

- remove `cfg(test)` behaviour from `GenesisNetwork::new()`
- refactor `impl TestGenesis for Genesis`
  - remove extra `bool` + `Option` invariant
  - allow creating genesis with additional ISIs
- remove `test-utils` feature & `GenesisNetwork::transactions_mut()`
- update related tests
- update error message on signing failure

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: remove extension check from `Path::default()`

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: update genesis topology messages

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: use `Popen`'s `env` instead of global `os.environ`

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: typo

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: use `Partial`/`Full` terminology

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: inherit env from OS

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: link issue #4161

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: format

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: apply lints

Signed-off-by: Dmitry Balashov <[email protected]>

* [feat]: panic on default path extension

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: update err message

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: update docs of `read_config`

Signed-off-by: Dmitry Balashov <[email protected]>

---------

Signed-off-by: Dmitry Balashov <[email protected]>
Signed-off-by: 0x009922 <[email protected]>
Co-authored-by: Ekaterina Mekhnetsova <[email protected]>
Co-authored-by: ⭐️NINIKA⭐️ <[email protected]>
Asem-Abdelhady pushed a commit to Asem-Abdelhady/iroha that referenced this issue Jan 9, 2024
…r-iroha#4136: refactor CLIs (hyperledger-iroha#4153)

* [refactor]: refactor cli(s)

- `iroha`: use `clap` `v4`
- `iroha`: update CLI (`--config`, `--terminal-colors`)
- `iroha`: handle user-provided config file strictly
- `iroha`: parse ENV config after file config
- `iroha_config`: add `genesis.file`, remove `account_*` prefix
- `iroha_config`: move some genesis config validation logic
  from `iroha`
- `iroha_client_cli`: upgrade `clap` to `v4`
- `iroha_genesis`: remove side effects (bail, logs)
- `iroha_genesis`: clarify validation logic (hyperledger-iroha#3075)
- `iroha_genesis`: remove `pub` to guard invariant of `GenesisNetwork`

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: chore

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: fix & test config

- `iroha_config`: use `PathBuf` when appropriate
- `iroha_config`: fix `Path` behaviour
- `iroha_config`: finally, make `disable_panic_terminal_colors`
  truly optional (hyperledger-iroha#3506)
- `iroha`: resolve all relative paths in config file
- `iroha`: improve config error messages
- `iroha`: add config integration tests

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: test & refactor

- `iroha_client_cli`: adopt `--config` from `iroha`
- `iroha_client_cli`: refactor `--metadata` arg
- `iroha`: extend tests
- update test code overall

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: clippy, tests

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: use `serde_as_str` for paths

Signed-off-by: Dmitry Balashov <[email protected]>

* [chore]: re-generate peer config

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: update `test_env.py`

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: remove deprecated option from test config

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: update README

Signed-off-by: Dmitry Balashov <[email protected]>

* [chore]: remove obsolete comment

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: update `iroha_swarm`

Now it relies on that `genesis.file` is set in the config file

Signed-off-by: Dmitry Balashov <[email protected]>

* [feat]: `kagami config peer` + `--genesis-file-in-config`

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: chores

Signed-off-by: Dmitry Balashov <[email protected]>

* Apply suggestions from code review

Co-authored-by: Ekaterina Mekhnetsova <[email protected]>
Signed-off-by: 0x009922 <[email protected]>

* [feat]: use `PATH` as value name

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: align `StatusFailure` message

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: adopt suggestion in `iroha_client_cli`

hyperledger-iroha#4153 (comment)
Signed-off-by: Dmitry Balashov <[email protected]>

* [build]: exclude `genesis.file` from default config

Signed-off-by: Dmitry Balashov <[email protected]>

* [feat]: refine genesis config parse error

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: fix & refactor `test_env.py`

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: fix CANNOT_BE_EMPTY message

It is updated with a new version of clap

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: return `disable_panic_terminal_colors: null` to test config

It is needed so that only `iroha_test_config.json` without
defaults layer is valid (will fix on config refactoring)

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: handle configuration properly in `iroha_swarm`

- set `GENESIS_FILE` in env, since `config.json` doesn't have it
- strictly specify `config.json` and `genesis.json` files

Signed-off-by: Dmitry Balashov <[email protected]>

* Apply suggestions from code review

Co-authored-by: ⭐️NINIKA⭐️ <[email protected]>
Signed-off-by: 0x009922 <[email protected]>

* Update client_cli/src/main.rs

Co-authored-by: ⭐️NINIKA⭐️ <[email protected]>
Signed-off-by: 0x009922 <[email protected]>

* [refactor]: eliminate extra `iroha_config` dependency

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: remove dead code

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: use `serde_json::json!`

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: remove `disable_panic_terminal_colors` parameter

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: update genesis & its testing

- remove `cfg(test)` behaviour from `GenesisNetwork::new()`
- refactor `impl TestGenesis for Genesis`
  - remove extra `bool` + `Option` invariant
  - allow creating genesis with additional ISIs
- remove `test-utils` feature & `GenesisNetwork::transactions_mut()`
- update related tests
- update error message on signing failure

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: remove extension check from `Path::default()`

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: update genesis topology messages

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: use `Popen`'s `env` instead of global `os.environ`

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: typo

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: use `Partial`/`Full` terminology

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: inherit env from OS

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: link issue hyperledger-iroha#4161

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: format

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: apply lints

Signed-off-by: Dmitry Balashov <[email protected]>

* [feat]: panic on default path extension

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: update err message

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: update docs of `read_config`

Signed-off-by: Dmitry Balashov <[email protected]>

---------

Signed-off-by: Dmitry Balashov <[email protected]>
Signed-off-by: 0x009922 <[email protected]>
Co-authored-by: Ekaterina Mekhnetsova <[email protected]>
Co-authored-by: ⭐️NINIKA⭐️ <[email protected]>
Asem-Abdelhady pushed a commit to Asem-Abdelhady/iroha that referenced this issue Jan 22, 2024
…r-iroha#4136: refactor CLIs (hyperledger-iroha#4153)

* [refactor]: refactor cli(s)

- `iroha`: use `clap` `v4`
- `iroha`: update CLI (`--config`, `--terminal-colors`)
- `iroha`: handle user-provided config file strictly
- `iroha`: parse ENV config after file config
- `iroha_config`: add `genesis.file`, remove `account_*` prefix
- `iroha_config`: move some genesis config validation logic
  from `iroha`
- `iroha_client_cli`: upgrade `clap` to `v4`
- `iroha_genesis`: remove side effects (bail, logs)
- `iroha_genesis`: clarify validation logic (hyperledger-iroha#3075)
- `iroha_genesis`: remove `pub` to guard invariant of `GenesisNetwork`

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: chore

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: fix & test config

- `iroha_config`: use `PathBuf` when appropriate
- `iroha_config`: fix `Path` behaviour
- `iroha_config`: finally, make `disable_panic_terminal_colors`
  truly optional (hyperledger-iroha#3506)
- `iroha`: resolve all relative paths in config file
- `iroha`: improve config error messages
- `iroha`: add config integration tests

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: test & refactor

- `iroha_client_cli`: adopt `--config` from `iroha`
- `iroha_client_cli`: refactor `--metadata` arg
- `iroha`: extend tests
- update test code overall

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: clippy, tests

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: use `serde_as_str` for paths

Signed-off-by: Dmitry Balashov <[email protected]>

* [chore]: re-generate peer config

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: update `test_env.py`

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: remove deprecated option from test config

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: update README

Signed-off-by: Dmitry Balashov <[email protected]>

* [chore]: remove obsolete comment

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: update `iroha_swarm`

Now it relies on that `genesis.file` is set in the config file

Signed-off-by: Dmitry Balashov <[email protected]>

* [feat]: `kagami config peer` + `--genesis-file-in-config`

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: chores

Signed-off-by: Dmitry Balashov <[email protected]>

* Apply suggestions from code review

Co-authored-by: Ekaterina Mekhnetsova <[email protected]>
Signed-off-by: 0x009922 <[email protected]>

* [feat]: use `PATH` as value name

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: align `StatusFailure` message

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: adopt suggestion in `iroha_client_cli`

hyperledger-iroha#4153 (comment)
Signed-off-by: Dmitry Balashov <[email protected]>

* [build]: exclude `genesis.file` from default config

Signed-off-by: Dmitry Balashov <[email protected]>

* [feat]: refine genesis config parse error

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: fix & refactor `test_env.py`

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: fix CANNOT_BE_EMPTY message

It is updated with a new version of clap

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: return `disable_panic_terminal_colors: null` to test config

It is needed so that only `iroha_test_config.json` without
defaults layer is valid (will fix on config refactoring)

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: handle configuration properly in `iroha_swarm`

- set `GENESIS_FILE` in env, since `config.json` doesn't have it
- strictly specify `config.json` and `genesis.json` files

Signed-off-by: Dmitry Balashov <[email protected]>

* Apply suggestions from code review

Co-authored-by: ⭐️NINIKA⭐️ <[email protected]>
Signed-off-by: 0x009922 <[email protected]>

* Update client_cli/src/main.rs

Co-authored-by: ⭐️NINIKA⭐️ <[email protected]>
Signed-off-by: 0x009922 <[email protected]>

* [refactor]: eliminate extra `iroha_config` dependency

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: remove dead code

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: use `serde_json::json!`

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: remove `disable_panic_terminal_colors` parameter

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: update genesis & its testing

- remove `cfg(test)` behaviour from `GenesisNetwork::new()`
- refactor `impl TestGenesis for Genesis`
  - remove extra `bool` + `Option` invariant
  - allow creating genesis with additional ISIs
- remove `test-utils` feature & `GenesisNetwork::transactions_mut()`
- update related tests
- update error message on signing failure

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: remove extension check from `Path::default()`

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: update genesis topology messages

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: use `Popen`'s `env` instead of global `os.environ`

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: typo

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: use `Partial`/`Full` terminology

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: inherit env from OS

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: link issue hyperledger-iroha#4161

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: format

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: apply lints

Signed-off-by: Dmitry Balashov <[email protected]>

* [feat]: panic on default path extension

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: update err message

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: update docs of `read_config`

Signed-off-by: Dmitry Balashov <[email protected]>

---------

Signed-off-by: Dmitry Balashov <[email protected]>
Signed-off-by: 0x009922 <[email protected]>
Co-authored-by: Ekaterina Mekhnetsova <[email protected]>
Co-authored-by: ⭐️NINIKA⭐️ <[email protected]>
Signed-off-by: Asem-Abdelhady <[email protected]>
Asem-Abdelhady pushed a commit to Asem-Abdelhady/iroha that referenced this issue Feb 9, 2024
…r-iroha#4136: refactor CLIs (hyperledger-iroha#4153)

* [refactor]: refactor cli(s)

- `iroha`: use `clap` `v4`
- `iroha`: update CLI (`--config`, `--terminal-colors`)
- `iroha`: handle user-provided config file strictly
- `iroha`: parse ENV config after file config
- `iroha_config`: add `genesis.file`, remove `account_*` prefix
- `iroha_config`: move some genesis config validation logic
  from `iroha`
- `iroha_client_cli`: upgrade `clap` to `v4`
- `iroha_genesis`: remove side effects (bail, logs)
- `iroha_genesis`: clarify validation logic (hyperledger-iroha#3075)
- `iroha_genesis`: remove `pub` to guard invariant of `GenesisNetwork`

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: chore

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: fix & test config

- `iroha_config`: use `PathBuf` when appropriate
- `iroha_config`: fix `Path` behaviour
- `iroha_config`: finally, make `disable_panic_terminal_colors`
  truly optional (hyperledger-iroha#3506)
- `iroha`: resolve all relative paths in config file
- `iroha`: improve config error messages
- `iroha`: add config integration tests

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: test & refactor

- `iroha_client_cli`: adopt `--config` from `iroha`
- `iroha_client_cli`: refactor `--metadata` arg
- `iroha`: extend tests
- update test code overall

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: clippy, tests

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: use `serde_as_str` for paths

Signed-off-by: Dmitry Balashov <[email protected]>

* [chore]: re-generate peer config

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: update `test_env.py`

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: remove deprecated option from test config

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: update README

Signed-off-by: Dmitry Balashov <[email protected]>

* [chore]: remove obsolete comment

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: update `iroha_swarm`

Now it relies on that `genesis.file` is set in the config file

Signed-off-by: Dmitry Balashov <[email protected]>

* [feat]: `kagami config peer` + `--genesis-file-in-config`

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: chores

Signed-off-by: Dmitry Balashov <[email protected]>

* Apply suggestions from code review

Co-authored-by: Ekaterina Mekhnetsova <[email protected]>
Signed-off-by: 0x009922 <[email protected]>

* [feat]: use `PATH` as value name

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: align `StatusFailure` message

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: adopt suggestion in `iroha_client_cli`

hyperledger-iroha#4153 (comment)
Signed-off-by: Dmitry Balashov <[email protected]>

* [build]: exclude `genesis.file` from default config

Signed-off-by: Dmitry Balashov <[email protected]>

* [feat]: refine genesis config parse error

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: fix & refactor `test_env.py`

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: fix CANNOT_BE_EMPTY message

It is updated with a new version of clap

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: return `disable_panic_terminal_colors: null` to test config

It is needed so that only `iroha_test_config.json` without
defaults layer is valid (will fix on config refactoring)

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: handle configuration properly in `iroha_swarm`

- set `GENESIS_FILE` in env, since `config.json` doesn't have it
- strictly specify `config.json` and `genesis.json` files

Signed-off-by: Dmitry Balashov <[email protected]>

* Apply suggestions from code review

Co-authored-by: ⭐️NINIKA⭐️ <[email protected]>
Signed-off-by: 0x009922 <[email protected]>

* Update client_cli/src/main.rs

Co-authored-by: ⭐️NINIKA⭐️ <[email protected]>
Signed-off-by: 0x009922 <[email protected]>

* [refactor]: eliminate extra `iroha_config` dependency

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: remove dead code

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: use `serde_json::json!`

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: remove `disable_panic_terminal_colors` parameter

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: update genesis & its testing

- remove `cfg(test)` behaviour from `GenesisNetwork::new()`
- refactor `impl TestGenesis for Genesis`
  - remove extra `bool` + `Option` invariant
  - allow creating genesis with additional ISIs
- remove `test-utils` feature & `GenesisNetwork::transactions_mut()`
- update related tests
- update error message on signing failure

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: remove extension check from `Path::default()`

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: update genesis topology messages

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: use `Popen`'s `env` instead of global `os.environ`

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: typo

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: use `Partial`/`Full` terminology

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: inherit env from OS

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: link issue hyperledger-iroha#4161

Signed-off-by: Dmitry Balashov <[email protected]>

* [fix]: format

Signed-off-by: Dmitry Balashov <[email protected]>

* [refactor]: apply lints

Signed-off-by: Dmitry Balashov <[email protected]>

* [feat]: panic on default path extension

Signed-off-by: Dmitry Balashov <[email protected]>

* [test]: update err message

Signed-off-by: Dmitry Balashov <[email protected]>

* [docs]: update docs of `read_config`

Signed-off-by: Dmitry Balashov <[email protected]>

---------

Signed-off-by: Dmitry Balashov <[email protected]>
Signed-off-by: 0x009922 <[email protected]>
Co-authored-by: Ekaterina Mekhnetsova <[email protected]>
Co-authored-by: ⭐️NINIKA⭐️ <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
config-changes Changes in configuration and start up of the Iroha iroha2-dev The re-implementation of a BFT hyperledger in RUST question Further information is requested
Projects
None yet
Development

No branches or pull requests

4 participants