grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix minor merge issue

Browse Source
This commit is contained in:
Joseph Mark 2017-07-17 13:33:26 +07:00
parent d93a5d3da1
commit fefeb50cae
No known key found for this signature in database
GPG Key ID: 9BA8D1EE2E53C283
2 changed files with 795 additions and 752 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1543
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
parity/configuration.rs
View File

@ -349,7 +349,7 @@ impl Configuration {
net_conf: net_conf, net_conf: net_conf,
network_id: network_id, network_id: network_id,
acc_conf: self.accounts_config()?, acc_conf: self.accounts_config()?,
gas_pricer: self.gas_pricer_config()?, gas_pricer_conf: self.gas_pricer_config()?,
miner_extras: self.miner_extras()?, miner_extras: self.miner_extras()?,
stratum: self.stratum_options()?, stratum: self.stratum_options()?,
update_policy: update_policy, update_policy: update_policy,
@ -1669,7 +1669,7 @@ mod tests {
match conf.into_command().unwrap().cmd { match conf.into_command().unwrap().cmd {
Cmd::Run(c) => { Cmd::Run(c) => {
assert_eq!(c.net_settings.chain, "dev"); assert_eq!(c.net_settings.chain, "dev");
assert_eq!(c.gas_pricer, GasPricerConfig::Fixed(0.into())); assert_eq!(c.gas_pricer_conf, GasPricerConfig::Fixed(0.into()));
assert_eq!(c.miner_options.reseal_min_period, Duration::from_millis(0)); assert_eq!(c.miner_options.reseal_min_period, Duration::from_millis(0));
assert_eq!(c.update_policy.require_consensus, false); assert_eq!(c.update_policy.require_consensus, false);
assert_eq!(c.net_settings.rpc_interface, "0.0.0.0"); assert_eq!(c.net_settings.rpc_interface, "0.0.0.0");