Skip to content

Commit 0f6a184

Browse files
committed
fixes
1 parent b974be2 commit 0f6a184

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

core/lib/protobuf_config/src/consensus.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use zksync_config::configs::consensus::{
44
AttesterPublicKey, ConsensusConfig, GenesisSpec, Host, NodePublicKey, ProtocolVersion,
55
RpcConfig, ValidatorPublicKey, WeightedAttester, WeightedValidator,
66
};
7-
use zksync_protobuf::{kB, read_optional, repr::ProtoRepr, required, ProtoFmt};
7+
use zksync_protobuf::{kB, read_optional, read_required, repr::ProtoRepr, required, ProtoFmt};
88

99
use crate::{parse_h160, proto::consensus as proto, read_optional_repr};
1010

@@ -154,7 +154,7 @@ impl ProtoRepr for proto::Config {
154154
.context("server_addr")?,
155155
public_addr: Host(required(&self.public_addr).context("public_addr")?.clone()),
156156
max_payload_size,
157-
view_timeout: required(&self.view_timeout).context("view_timeout")?,
157+
view_timeout: read_required(&self.view_timeout).context("view_timeout")?,
158158
max_batch_size,
159159
gossip_dynamic_inbound_limit: required(&self.gossip_dynamic_inbound_limit)
160160
.and_then(|x| Ok((*x).try_into()?))

core/node/consensus/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::collections::{BTreeMap, HashMap};
33

44
use anyhow::Context as _;
55
use secrecy::{ExposeSecret as _, Secret};
6-
use zksync_concurrency::{limiter, net, time};
6+
use zksync_concurrency::net;
77
use zksync_config::{
88
configs,
99
configs::consensus::{ConsensusConfig, ConsensusSecrets, Host, NodePublicKey},

core/node/consensus/src/testonly.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ fn make_config(
149149
public_addr: config::Host(cfg.public_addr.0.clone()),
150150
max_payload_size: usize::MAX,
151151
max_batch_size: usize::MAX,
152-
view_timeout: usize::MAX,
152+
view_timeout: time::Duration::milliseconds(10000),
153153
gossip_dynamic_inbound_limit: cfg.gossip.dynamic_inbound_limit,
154154
gossip_static_inbound: cfg
155155
.gossip

0 commit comments

Comments
 (0)