Fix minor merge issue
This commit is contained in:
parent
d93a5d3da1
commit
fefeb50cae
1543
Cargo.lock
generated
1543
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -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");
|
||||||
|
Loading…
Reference in New Issue
Block a user