-
Notifications
You must be signed in to change notification settings - Fork 741
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
Migrate validator client to clap derive #6300
base: unstable
Are you sure you want to change the base?
Conversation
if validator_client_config.web3_signer_keep_alive_timeout == 0 { | ||
config.web3_signer_keep_alive_timeout = None | ||
} else { | ||
config.web3_signer_keep_alive_timeout = Some(Duration::from_millis( | ||
validator_client_config.web3_signer_keep_alive_timeout, | ||
)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note the breaking change here. Since I've defined web3_signer_keep_alive_timeout
as a u64
, null
is no longer a valid option. Users will need to use 0
instead.
If this breaking change is too intrusive I can define web3_signer_keep_alive_timeout
as a string and we can keep functionality as is.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pretty keen to get the clap derive migrations merged!
Will give it a more thorough review once the conflicts are fixed.
…ap-derive-validator-manager
@@ -430,7 +437,7 @@ fn no_doppelganger_protection_flag() { | |||
fn no_gas_limit_flag() { | |||
CommandLineTest::new() | |||
.run() | |||
.with_config(|config| assert!(config.gas_limit.is_none())); | |||
.with_config(|config| assert!(config.gas_limit == Some(30_000_000))); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a functional difference between None
and 30_000_000
here? Might be worth now renaming this test to gas_limit_flag_default
to better match the naming scheme.
validator_client/src/config.rs
Outdated
validator_client_config.enable_doppelganger_protection; | ||
config.builder_proposals = validator_client_config.builder_proposals; | ||
config.prefer_builder_proposals = validator_client_config.prefer_builder_proposals; | ||
config.gas_limit = Some(validator_client_config.gas_limit); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If gas limit now defaults to Some
, can we remove the Option
altogether?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like some asserts in the tests need to be updated to match.
Issue Addressed
Partially #5900
Proposed Changes
Migrate the validator client cli to clap derive