Skip to content

Commit b114128

Browse files
GeemoCandamaGeemoCandama
committed
remove LightClientOptimistic/FinalityReuest struct and some minor fixes
1 parent 9c5f3bf commit b114128

File tree

11 files changed

+61
-92
lines changed

11 files changed

+61
-92
lines changed

‎beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ impl<TSpec: EthSpec> Encoder<OutboundRequest<TSpec>> for SSZSnappyOutboundCodec<
235235
OutboundRequest::Ping(req) => req.as_ssz_bytes(),
236236
OutboundRequest::MetaData(_) => return Ok(()), // no metadata to encode
237237
OutboundRequest::LightClientBootstrap(req) => req.as_ssz_bytes(),
238-
OutboundRequest::LightClientOptimisticUpdate(req) => req.as_ssz_bytes(),
239-
OutboundRequest::LightClientFinalityUpdate(req) => req.as_ssz_bytes(),
238+
OutboundRequest::LightClientOptimisticUpdate => return Ok(()),
239+
OutboundRequest::LightClientFinalityUpdate => return Ok(()),
240240
};
241241
// SSZ encoded bytes should be within `max_packet_size`
242242
if bytes.len() > self.max_packet_size {
@@ -485,11 +485,11 @@ fn handle_v1_request<T: EthSpec>(
485485
},
486486
))),
487487
Protocol::LightClientOptimisticUpdate => Ok(Some(
488-
InboundRequest::LightClientOptimisticUpdate(LightClientOptimisticUpdateRequest {}),
488+
InboundRequest::LightClientOptimisticUpdate,
489+
)),
490+
Protocol::LightClientFinalityUpdate => Ok(Some(
491+
InboundRequest::LightClientFinalityUpdate,
489492
)),
490-
Protocol::LightClientFinalityUpdate => Ok(Some(InboundRequest::LightClientFinalityUpdate(
491-
LightClientFinalityUpdateRequest {},
492-
))),
493493
// MetaData requests return early from InboundUpgrade and do not reach the decoder.
494494
// Handle this case just for completeness.
495495
Protocol::MetaData => {
@@ -898,11 +898,11 @@ mod tests {
898898
OutboundRequest::LightClientBootstrap(bootstrap) => {
899899
assert_eq!(decoded, InboundRequest::LightClientBootstrap(bootstrap))
900900
}
901-
OutboundRequest::LightClientOptimisticUpdate(update) => {
902-
assert_eq!(decoded, InboundRequest::LightClientOptimisticUpdate(update))
901+
OutboundRequest::LightClientOptimisticUpdate => {
902+
assert_eq!(decoded, InboundRequest::LightClientOptimisticUpdate)
903903
}
904-
OutboundRequest::LightClientFinalityUpdate(update) => {
905-
assert_eq!(decoded, InboundRequest::LightClientFinalityUpdate(update))
904+
OutboundRequest::LightClientFinalityUpdate => {
905+
assert_eq!(decoded, InboundRequest::LightClientFinalityUpdate)
906906
}
907907
}
908908
}

‎beacon_node/lighthouse_network/src/rpc/methods.rs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -291,14 +291,6 @@ pub struct LightClientBootstrapRequest {
291291
pub root: Hash256,
292292
}
293293

294-
/// Request a light_client_optimistic_update for lightclients peers.
295-
#[derive(Encode, Decode, Clone, Debug, PartialEq)]
296-
pub struct LightClientOptimisticUpdateRequest {}
297-
298-
/// Request a light_client_finality_update for lightclients peers.
299-
#[derive(Encode, Decode, Clone, Debug, PartialEq)]
300-
pub struct LightClientFinalityUpdateRequest {}
301-
302294
/// The code assigned to an erroneous `RPCResponse`.
303295
#[derive(Debug, Clone, Copy, PartialEq, IntoStaticStr)]
304296
#[strum(serialize_all = "snake_case")]

‎beacon_node/lighthouse_network/src/rpc/mod.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ pub(crate) use protocol::{InboundRequest, RPCProtocol};
2626

2727
pub use handler::SubstreamId;
2828
pub use methods::{
29-
BlocksByRangeRequest, BlocksByRootRequest, GoodbyeReason, LightClientBootstrapRequest,
30-
LightClientFinalityUpdateRequest, LightClientOptimisticUpdateRequest, MaxRequestBlocks,
29+
BlocksByRangeRequest, BlocksByRootRequest, GoodbyeReason, LightClientBootstrapRequest, MaxRequestBlocks,
3130
RPCResponseErrorCode, ResponseTermination, StatusMessage, MAX_REQUEST_BLOCKS,
3231
};
3332
pub(crate) use outbound::OutboundRequest;

‎beacon_node/lighthouse_network/src/rpc/outbound.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ pub enum OutboundRequest<TSpec: EthSpec> {
3939
BlocksByRange(OldBlocksByRangeRequest),
4040
BlocksByRoot(BlocksByRootRequest),
4141
LightClientBootstrap(LightClientBootstrapRequest),
42-
LightClientOptimisticUpdate(LightClientOptimisticUpdateRequest),
43-
LightClientFinalityUpdate(LightClientFinalityUpdateRequest),
42+
LightClientOptimisticUpdate,
43+
LightClientFinalityUpdate,
4444
Ping(Ping),
4545
MetaData(PhantomData<TSpec>),
4646
}
@@ -91,8 +91,8 @@ impl<TSpec: EthSpec> OutboundRequest<TSpec> {
9191
// that we generate from the beacon state.
9292
// We do not make light client rpc requests from the beacon node
9393
OutboundRequest::LightClientBootstrap(_)
94-
| OutboundRequest::LightClientOptimisticUpdate(_)
95-
| OutboundRequest::LightClientFinalityUpdate(_) => vec![],
94+
| OutboundRequest::LightClientOptimisticUpdate
95+
| OutboundRequest::LightClientFinalityUpdate => vec![],
9696
}
9797
}
9898
/* These functions are used in the handler for stream management */
@@ -107,8 +107,8 @@ impl<TSpec: EthSpec> OutboundRequest<TSpec> {
107107
OutboundRequest::Ping(_) => 1,
108108
OutboundRequest::MetaData(_) => 1,
109109
OutboundRequest::LightClientBootstrap(_) => 1,
110-
OutboundRequest::LightClientOptimisticUpdate(_) => 1,
111-
OutboundRequest::LightClientFinalityUpdate(_) => 1,
110+
OutboundRequest::LightClientOptimisticUpdate => 1,
111+
OutboundRequest::LightClientFinalityUpdate => 1,
112112
}
113113
}
114114

@@ -122,10 +122,10 @@ impl<TSpec: EthSpec> OutboundRequest<TSpec> {
122122
OutboundRequest::Ping(_) => Protocol::Ping,
123123
OutboundRequest::MetaData(_) => Protocol::MetaData,
124124
OutboundRequest::LightClientBootstrap(_) => Protocol::LightClientBootstrap,
125-
OutboundRequest::LightClientOptimisticUpdate(_) => {
125+
OutboundRequest::LightClientOptimisticUpdate => {
126126
Protocol::LightClientOptimisticUpdate
127127
}
128-
OutboundRequest::LightClientFinalityUpdate(_) => Protocol::LightClientFinalityUpdate,
128+
OutboundRequest::LightClientFinalityUpdate => Protocol::LightClientFinalityUpdate,
129129
}
130130
}
131131

@@ -138,8 +138,8 @@ impl<TSpec: EthSpec> OutboundRequest<TSpec> {
138138
OutboundRequest::BlocksByRange(_) => ResponseTermination::BlocksByRange,
139139
OutboundRequest::BlocksByRoot(_) => ResponseTermination::BlocksByRoot,
140140
OutboundRequest::LightClientBootstrap(_)
141-
| OutboundRequest::LightClientOptimisticUpdate(_)
142-
| OutboundRequest::LightClientFinalityUpdate(_) => unreachable!(),
141+
| OutboundRequest::LightClientOptimisticUpdate
142+
| OutboundRequest::LightClientFinalityUpdate => unreachable!(),
143143
OutboundRequest::Status(_) => unreachable!(),
144144
OutboundRequest::Goodbye(_) => unreachable!(),
145145
OutboundRequest::Ping(_) => unreachable!(),
@@ -200,10 +200,10 @@ impl<TSpec: EthSpec> std::fmt::Display for OutboundRequest<TSpec> {
200200
OutboundRequest::LightClientBootstrap(bootstrap) => {
201201
write!(f, "Lightclient Bootstrap: {}", bootstrap.root)
202202
}
203-
OutboundRequest::LightClientOptimisticUpdate(_) => {
203+
OutboundRequest::LightClientOptimisticUpdate => {
204204
write!(f, "Light client optimistic update request")
205205
}
206-
OutboundRequest::LightClientFinalityUpdate(_) => {
206+
OutboundRequest::LightClientFinalityUpdate => {
207207
write!(f, "Light client finality update request")
208208
}
209209
}

‎beacon_node/lighthouse_network/src/rpc/protocol.rs‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use tokio_util::{
2222
};
2323
use types::{
2424
BeaconBlock, BeaconBlockAltair, BeaconBlockBase, BeaconBlockMerge, EthSpec, ForkContext,
25-
ForkName, Hash256, MainnetEthSpec, Signature, SignedBeaconBlock,
25+
ForkName, Hash256, MainnetEthSpec, Signature, SignedBeaconBlock, LightClientFinalityUpdate, LightClientOptimisticUpdate,
2626
};
2727

2828
lazy_static! {
@@ -321,14 +321,8 @@ impl ProtocolId {
321321
<LightClientBootstrapRequest as Encode>::ssz_fixed_len(),
322322
<LightClientBootstrapRequest as Encode>::ssz_fixed_len(),
323323
),
324-
Protocol::LightClientOptimisticUpdate => RpcLimits::new(
325-
<LightClientOptimisticUpdateRequest as Encode>::ssz_fixed_len(),
326-
<LightClientOptimisticUpdateRequest as Encode>::ssz_fixed_len(),
327-
),
328-
Protocol::LightClientFinalityUpdate => RpcLimits::new(
329-
<LightClientFinalityUpdateRequest as Encode>::ssz_fixed_len(),
330-
<LightClientFinalityUpdateRequest as Encode>::ssz_fixed_len(),
331-
),
324+
Protocol::LightClientOptimisticUpdate => RpcLimits::new(0, 0),
325+
Protocol::LightClientFinalityUpdate => RpcLimits::new(0, 0),
332326
Protocol::MetaData => RpcLimits::new(0, 0), // Metadata requests are empty
333327
}
334328
}
@@ -357,12 +351,12 @@ impl ProtocolId {
357351
<LightClientBootstrapRequest as Encode>::ssz_fixed_len(),
358352
),
359353
Protocol::LightClientOptimisticUpdate => RpcLimits::new(
360-
<LightClientOptimisticUpdateRequest as Encode>::ssz_fixed_len(),
361-
<LightClientOptimisticUpdateRequest as Encode>::ssz_fixed_len(),
354+
<LightClientOptimisticUpdate<T> as Encode>::ssz_fixed_len(),
355+
<LightClientOptimisticUpdate<T> as Encode>::ssz_fixed_len(),
362356
),
363357
Protocol::LightClientFinalityUpdate => RpcLimits::new(
364-
<LightClientFinalityUpdateRequest as Encode>::ssz_fixed_len(),
365-
<LightClientFinalityUpdateRequest as Encode>::ssz_fixed_len(),
358+
<LightClientFinalityUpdate<T> as Encode>::ssz_fixed_len(),
359+
<LightClientFinalityUpdate<T> as Encode>::ssz_fixed_len(),
366360
),
367361
}
368362
}
@@ -470,8 +464,8 @@ pub enum InboundRequest<TSpec: EthSpec> {
470464
BlocksByRange(OldBlocksByRangeRequest),
471465
BlocksByRoot(BlocksByRootRequest),
472466
LightClientBootstrap(LightClientBootstrapRequest),
473-
LightClientOptimisticUpdate(LightClientOptimisticUpdateRequest),
474-
LightClientFinalityUpdate(LightClientFinalityUpdateRequest),
467+
LightClientOptimisticUpdate,
468+
LightClientFinalityUpdate,
475469
Ping(Ping),
476470
MetaData(PhantomData<TSpec>),
477471
}
@@ -490,8 +484,8 @@ impl<TSpec: EthSpec> InboundRequest<TSpec> {
490484
InboundRequest::Ping(_) => 1,
491485
InboundRequest::MetaData(_) => 1,
492486
InboundRequest::LightClientBootstrap(_) => 1,
493-
InboundRequest::LightClientOptimisticUpdate(_) => 1,
494-
InboundRequest::LightClientFinalityUpdate(_) => 1,
487+
InboundRequest::LightClientOptimisticUpdate => 1,
488+
InboundRequest::LightClientFinalityUpdate => 1,
495489
}
496490
}
497491

@@ -505,8 +499,8 @@ impl<TSpec: EthSpec> InboundRequest<TSpec> {
505499
InboundRequest::Ping(_) => Protocol::Ping,
506500
InboundRequest::MetaData(_) => Protocol::MetaData,
507501
InboundRequest::LightClientBootstrap(_) => Protocol::LightClientBootstrap,
508-
InboundRequest::LightClientOptimisticUpdate(_) => Protocol::LightClientOptimisticUpdate,
509-
InboundRequest::LightClientFinalityUpdate(_) => Protocol::LightClientFinalityUpdate,
502+
InboundRequest::LightClientOptimisticUpdate => Protocol::LightClientOptimisticUpdate,
503+
InboundRequest::LightClientFinalityUpdate => Protocol::LightClientFinalityUpdate,
510504
}
511505
}
512506

@@ -523,8 +517,8 @@ impl<TSpec: EthSpec> InboundRequest<TSpec> {
523517
InboundRequest::Ping(_) => unreachable!(),
524518
InboundRequest::MetaData(_) => unreachable!(),
525519
InboundRequest::LightClientBootstrap(_) => unreachable!(),
526-
InboundRequest::LightClientFinalityUpdate(_) => unreachable!(),
527-
InboundRequest::LightClientOptimisticUpdate(_) => unreachable!(),
520+
InboundRequest::LightClientFinalityUpdate => unreachable!(),
521+
InboundRequest::LightClientOptimisticUpdate => unreachable!(),
528522
}
529523
}
530524
}
@@ -631,10 +625,10 @@ impl<TSpec: EthSpec> std::fmt::Display for InboundRequest<TSpec> {
631625
InboundRequest::LightClientBootstrap(bootstrap) => {
632626
write!(f, "LightClientBootstrap: {}", bootstrap.root)
633627
}
634-
InboundRequest::LightClientOptimisticUpdate(_) => {
628+
InboundRequest::LightClientOptimisticUpdate => {
635629
write!(f, "Light client optimistic update request")
636630
}
637-
InboundRequest::LightClientFinalityUpdate(_) => {
631+
InboundRequest::LightClientFinalityUpdate => {
638632
write!(f, "Light client finality update request")
639633
}
640634
}

‎beacon_node/lighthouse_network/src/service/api_types.rs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use types::{
99
use crate::rpc::{
1010
methods::{
1111
BlocksByRangeRequest, BlocksByRootRequest, LightClientBootstrapRequest,
12-
LightClientFinalityUpdateRequest, LightClientOptimisticUpdateRequest,
1312
OldBlocksByRangeRequest, RPCCodedResponse, RPCResponse, ResponseTermination, StatusMessage,
1413
},
1514
OutboundRequest, SubstreamId,
@@ -41,9 +40,9 @@ pub enum Request {
4140
// light client bootstrap request
4241
LightClientBootstrap(LightClientBootstrapRequest),
4342
// light client optimistic update request
44-
LightClientOptimisticUpdate(LightClientOptimisticUpdateRequest),
43+
LightClientOptimisticUpdate,
4544
// light client finality update request
46-
LightClientFinalityUpdate(LightClientFinalityUpdateRequest),
45+
LightClientFinalityUpdate,
4746
}
4847

4948
impl<TSpec: EthSpec> std::convert::From<Request> for OutboundRequest<TSpec> {
@@ -58,11 +57,11 @@ impl<TSpec: EthSpec> std::convert::From<Request> for OutboundRequest<TSpec> {
5857
})
5958
}
6059
Request::LightClientBootstrap(b) => OutboundRequest::LightClientBootstrap(b),
61-
Request::LightClientOptimisticUpdate(update) => {
62-
OutboundRequest::LightClientOptimisticUpdate(update)
60+
Request::LightClientOptimisticUpdate => {
61+
OutboundRequest::LightClientOptimisticUpdate
6362
}
64-
Request::LightClientFinalityUpdate(update) => {
65-
OutboundRequest::LightClientFinalityUpdate(update)
63+
Request::LightClientFinalityUpdate => {
64+
OutboundRequest::LightClientFinalityUpdate
6665
}
6766
Request::Status(s) => OutboundRequest::Status(s),
6867
}

‎beacon_node/lighthouse_network/src/service/mod.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -985,11 +985,11 @@ impl<AppReqId: ReqId, TSpec: EthSpec> Network<AppReqId, TSpec> {
985985
Request::LightClientBootstrap(_) => {
986986
metrics::inc_counter_vec(&metrics::TOTAL_RPC_REQUESTS, &["light_client_bootstrap"])
987987
}
988-
Request::LightClientOptimisticUpdate(_) => metrics::inc_counter_vec(
988+
Request::LightClientOptimisticUpdate => metrics::inc_counter_vec(
989989
&metrics::TOTAL_RPC_REQUESTS,
990990
&["light_client_optimistic_update"],
991991
),
992-
Request::LightClientFinalityUpdate(_) => metrics::inc_counter_vec(
992+
Request::LightClientFinalityUpdate => metrics::inc_counter_vec(
993993
&metrics::TOTAL_RPC_REQUESTS,
994994
&["light_client_finality_update"],
995995
),
@@ -1270,19 +1270,19 @@ impl<AppReqId: ReqId, TSpec: EthSpec> Network<AppReqId, TSpec> {
12701270
);
12711271
Some(event)
12721272
}
1273-
InboundRequest::LightClientOptimisticUpdate(req) => {
1273+
InboundRequest::LightClientOptimisticUpdate => {
12741274
let event = self.build_request(
12751275
peer_request_id,
12761276
peer_id,
1277-
Request::LightClientOptimisticUpdate(req),
1277+
Request::LightClientOptimisticUpdate,
12781278
);
12791279
Some(event)
12801280
}
1281-
InboundRequest::LightClientFinalityUpdate(req) => {
1281+
InboundRequest::LightClientFinalityUpdate => {
12821282
let event = self.build_request(
12831283
peer_request_id,
12841284
peer_id,
1285-
Request::LightClientFinalityUpdate(req),
1285+
Request::LightClientFinalityUpdate,
12861286
);
12871287
Some(event)
12881288
}

‎beacon_node/network/src/beacon_processor/mod.rs‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,7 @@ use beacon_chain::{BeaconChain, BeaconChainTypes, GossipVerifiedBlock, NotifyExe
4545
use derivative::Derivative;
4646
use futures::stream::{Stream, StreamExt};
4747
use futures::task::Poll;
48-
use lighthouse_network::rpc::{
49-
LightClientBootstrapRequest, LightClientFinalityUpdateRequest,
50-
LightClientOptimisticUpdateRequest,
51-
};
48+
use lighthouse_network::rpc::LightClientBootstrapRequest;
5249
use lighthouse_network::{
5350
rpc::{BlocksByRangeRequest, BlocksByRootRequest, StatusMessage},
5451
Client, MessageId, NetworkGlobals, PeerId, PeerRequestId,
@@ -642,14 +639,12 @@ impl<T: BeaconChainTypes> WorkEvent<T> {
642639
pub fn light_client_optimistic_update_request(
643640
peer_id: PeerId,
644641
request_id: PeerRequestId,
645-
request: LightClientOptimisticUpdateRequest,
646642
) -> Self {
647643
Self {
648644
drop_during_sync: true,
649645
work: Work::LightClientOptimisticUpdateRequest {
650646
peer_id,
651647
request_id,
652-
request,
653648
},
654649
}
655650
}
@@ -658,14 +653,12 @@ impl<T: BeaconChainTypes> WorkEvent<T> {
658653
pub fn light_client_finality_update_request(
659654
peer_id: PeerId,
660655
request_id: PeerRequestId,
661-
request: LightClientFinalityUpdateRequest,
662656
) -> Self {
663657
Self {
664658
drop_during_sync: true,
665659
work: Work::LightClientFinalityUpdateRequest {
666660
peer_id,
667661
request_id,
668-
request,
669662
},
670663
}
671664
}
@@ -866,12 +859,10 @@ pub enum Work<T: BeaconChainTypes> {
866859
LightClientOptimisticUpdateRequest {
867860
peer_id: PeerId,
868861
request_id: PeerRequestId,
869-
request: LightClientOptimisticUpdateRequest,
870862
},
871863
LightClientFinalityUpdateRequest {
872864
peer_id: PeerId,
873865
request_id: PeerRequestId,
874-
request: LightClientFinalityUpdateRequest,
875866
},
876867
}
877868

@@ -1827,16 +1818,14 @@ impl<T: BeaconChainTypes> BeaconProcessor<T> {
18271818
Work::LightClientOptimisticUpdateRequest {
18281819
peer_id,
18291820
request_id,
1830-
request,
18311821
} => task_spawner.spawn_blocking(move || {
1832-
worker.handle_light_client_optimistic_update(peer_id, request_id, request)
1822+
worker.handle_light_client_optimistic_update(peer_id, request_id)
18331823
}),
18341824
Work::LightClientFinalityUpdateRequest {
18351825
peer_id,
18361826
request_id,
1837-
request,
18381827
} => task_spawner.spawn_blocking(move || {
1839-
worker.handle_light_client_finality_update(peer_id, request_id, request)
1828+
worker.handle_light_client_finality_update(peer_id, request_id)
18401829
}),
18411830
Work::UnknownBlockAttestation {
18421831
message_id,

0 commit comments

Comments
 (0)