Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Initialize private tx logger only if private tx functionality is enabled #10758

Merged
merged 3 commits into from
Jun 19, 2019
Merged

Initialize private tx logger only if private tx functionality is enabled #10758

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d5ead7
Initialize private tx logger only if private tx functionality is enabled
grbIzl Jun 18, 2019
2626d12
Fix configuration test
grbIzl Jun 18, 2019
f43cb1a
Use default contructor for config
grbIzl Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions parity/configuration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,10 @@ impl Configuration {
let provider_conf = ProviderConfig {
validator_accounts: to_addresses(&self.args.arg_private_validators)?,
signer_account: self.args.arg_private_signer.clone().and_then(|account| to_address(Some(account)).ok()),
logs_path: Some(dirs.base),
logs_path: match self.args.flag_private_enabled {
true => Some(dirs.base),
false => None,
}
};

let encryptor_conf = EncryptorConfig {
Expand Down Expand Up @@ -1458,7 +1461,7 @@ mod tests {
private_provider_conf: ProviderConfig {
validator_accounts: Default::default(),
signer_account: Default::default(),
logs_path: Some(Directories::default().base),
logs_path: None,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like ProviderConfig should impl Default too?

},
private_encryptor_conf: Default::default(),
private_tx_enabled: false,
Expand Down