Skip to content

Commit a39b9b2

Browse files
jxsjxs
committed
remove test-extension code
1 parent fc0a57b commit a39b9b2

11 files changed

Lines changed: 13 additions & 151 deletions

File tree

‎protocols/gossipsub/src/behaviour.rs‎

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,12 +1674,6 @@ where
16741674
}
16751675

16761676
peer.extensions = Some(extensions);
1677-
1678-
if extensions.test_extension.unwrap_or(false)
1679-
&& matches!(peer.kind, PeerKind::Gossipsubv1_3)
1680-
{
1681-
self.send_message(*peer_id, RpcOut::TestExtension);
1682-
}
16831677
}
16841678

16851679
/// Removes the specified peer from the mesh, returning true if it was present.
@@ -2176,7 +2170,7 @@ where
21762170

21772171
#[cfg(feature = "partial_messages")]
21782172
self.partial_messages_extension
2179-
.peer_unsubscribed(*propagation_source, &topic_hash);
2173+
.peer_unsubscribed(*propagation_source, topic_hash);
21802174

21812175
unsubscribed_peers.push((*propagation_source, topic_hash.clone()));
21822176
// generate an unsubscribe event to be polled
@@ -3417,12 +3411,11 @@ where
34173411
self.send_message(
34183412
peer_id,
34193413
RpcOut::Extensions(Extensions {
3420-
test_extension: Some(true),
3421-
partial_messages: if cfg!(feature = "partial_messages") {
3422-
Some(true)
3423-
} else {
3424-
None
3425-
},
3414+
#[cfg(feature = "partial_messages")]
3415+
partial_messages: Some(true),
3416+
3417+
#[cfg(not(feature = "partial_messages"))]
3418+
partial_messages: None,
34263419
}),
34273420
);
34283421
}
@@ -3458,12 +3451,10 @@ where
34583451
self.send_message(
34593452
peer_id,
34603453
RpcOut::Extensions(Extensions {
3461-
test_extension: Some(true),
3462-
partial_messages: if cfg!(feature = "partial_messages") {
3463-
Some(true)
3464-
} else {
3465-
None
3466-
},
3454+
#[cfg(feature = "partial_messages")]
3455+
partial_messages: Some(true),
3456+
#[cfg(not(feature = "partial_messages"))]
3457+
partial_messages: None,
34673458
}),
34683459
);
34693460
}
@@ -3656,10 +3647,6 @@ where
36563647
self.handle_prune(&propagation_source, prune_msgs);
36573648
}
36583649

3659-
if let Some(_extension) = rpc.test_extension {
3660-
tracing::debug!("Received Test Extension");
3661-
}
3662-
36633650
#[cfg(feature = "partial_messages")]
36643651
if let Some(partial_message) = rpc.partial_message {
36653652
if self

‎protocols/gossipsub/src/behaviour/tests/gossip.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ fn test_handle_iwant_msg_but_already_sent_idontwant() {
207207
let rpc = RpcIn {
208208
messages: vec![],
209209
subscriptions: vec![],
210-
test_extension: None,
211210
#[cfg(feature = "partial_messages")]
212211
partial_message: None,
213212
control_msgs: vec![ControlAction::IDontWant(IDontWant {

‎protocols/gossipsub/src/behaviour/tests/idontwant.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ fn parses_idontwant() {
225225
let rpc = RpcIn {
226226
messages: vec![],
227227
subscriptions: vec![],
228-
test_extension: None,
229228
#[cfg(feature = "partial_messages")]
230229
partial_message: None,
231230
control_msgs: vec![ControlAction::IDontWant(IDontWant {

‎protocols/gossipsub/src/behaviour/tests/mod.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,6 @@ pub(super) fn proto_to_message(rpc: &proto::RPC) -> RpcIn {
546546
})
547547
.collect(),
548548
control_msgs,
549-
test_extension: None,
550549
#[cfg(feature = "partial_messages")]
551550
partial_message: None,
552551
}

‎protocols/gossipsub/src/behaviour/tests/partial.rs‎

Lines changed: 2 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use core::slice;
22
use std::collections::{BTreeSet, HashMap, HashSet};
33

4-
use hashlink::LinkedHashMap;
54
use libp2p_core::{Multiaddr, PeerId};
65
use libp2p_swarm::{ConnectionId, NetworkBehaviour, ToSwarm};
76

@@ -15,80 +14,10 @@ use crate::{
1514
Metadata, Partial, PartialAction, PartialError, PartialMessage, PublishAction,
1615
ReceivedAction, State, DEFAULT_PARTIAL_TTL,
1716
},
18-
queue::Queue,
19-
types::{
20-
ControlAction, Extensions, IHave, PeerDetails, PeerKind, RpcIn, RpcOut, SubscriptionOpts,
21-
},
22-
Behaviour, ConfigBuilder, Event, MessageAuthenticity, TopicHash, ValidationMode,
17+
types::{IHave, PeerKind, RpcIn, RpcOut, SubscriptionOpts},
18+
ConfigBuilder, Event, TopicHash, ValidationMode,
2319
};
2420

25-
#[test]
26-
fn test_handle_extensions_message() {
27-
let mut gs: Behaviour = Behaviour::new(
28-
MessageAuthenticity::Anonymous,
29-
ConfigBuilder::default()
30-
.validation_mode(ValidationMode::None)
31-
.build()
32-
.unwrap(),
33-
)
34-
.unwrap();
35-
36-
let peer_id = PeerId::random();
37-
let messages = Queue::new(gs.config.connection_handler_queue_len());
38-
39-
// Add peer without extensions
40-
gs.connected_peers.insert(
41-
peer_id,
42-
PeerDetails {
43-
kind: PeerKind::Gossipsubv1_3,
44-
connections: vec![ConnectionId::new_unchecked(0)],
45-
outbound: false,
46-
topics: BTreeSet::new(),
47-
messages,
48-
dont_send: LinkedHashMap::new(),
49-
extensions: None,
50-
},
51-
);
52-
53-
// Simulate receiving extensions message
54-
let extensions = Extensions {
55-
test_extension: Some(false),
56-
partial_messages: None,
57-
};
58-
gs.handle_extensions(&peer_id, extensions);
59-
60-
// Verify extensions were stored
61-
let peer_details = gs.connected_peers.get(&peer_id).unwrap();
62-
assert!(peer_details.extensions.is_some());
63-
64-
// Simulate receiving duplicate extensions message from another peer
65-
let duplicate_rpc = RpcIn {
66-
messages: vec![],
67-
subscriptions: vec![],
68-
control_msgs: vec![ControlAction::Extensions(Some(Extensions {
69-
test_extension: Some(true),
70-
partial_messages: None,
71-
}))],
72-
test_extension: None,
73-
#[cfg(feature = "partial_messages")]
74-
partial_message: None,
75-
};
76-
77-
gs.on_connection_handler_event(
78-
peer_id,
79-
ConnectionId::new_unchecked(0),
80-
HandlerEvent::Message {
81-
rpc: duplicate_rpc,
82-
invalid_messages: vec![],
83-
},
84-
);
85-
86-
// Extensions should still be present (not cleared or changed)
87-
let peer_details = gs.connected_peers.get(&peer_id).unwrap();
88-
let test_extension = peer_details.extensions.unwrap().test_extension.unwrap();
89-
assert!(!test_extension);
90-
}
91-
9221
/// A simple bitmap-based test implementation of the `Partial` trait.
9322
/// Uses a fixed number of parts where each part is represented by a bit in a u8 bitmap.
9423
#[derive(Clone, Debug)]
@@ -1652,7 +1581,6 @@ fn test_partial_messages_two_node_exchange() {
16521581
messages: vec![],
16531582
subscriptions: vec![],
16541583
control_msgs: vec![],
1655-
test_extension: None,
16561584
partial_message: Some(node2_partial),
16571585
},
16581586
invalid_messages: vec![],
@@ -1890,7 +1818,6 @@ fn test_partial_messages_response_on_receive() {
18901818
messages: vec![],
18911819
subscriptions: vec![],
18921820
control_msgs: vec![],
1893-
test_extension: None,
18941821
partial_message: Some(peer_partial),
18951822
},
18961823
invalid_messages: vec![],

‎protocols/gossipsub/src/behaviour/tests/scoring.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,6 @@ fn test_ignore_rpc_from_peers_below_graylist_threshold() {
684684
messages: vec![raw_message1],
685685
subscriptions: vec![subscription.clone()],
686686
control_msgs: vec![control_action],
687-
test_extension: None,
688687
#[cfg(feature = "partial_messages")]
689688
partial_message: None,
690689
},
@@ -713,7 +712,6 @@ fn test_ignore_rpc_from_peers_below_graylist_threshold() {
713712
messages: vec![raw_message3],
714713
subscriptions: vec![subscription],
715714
control_msgs: vec![control_action],
716-
test_extension: None,
717715
#[cfg(feature = "partial_messages")]
718716
partial_message: None,
719717
},
@@ -1310,7 +1308,6 @@ fn test_scoring_p4_invalid_signature() {
13101308
messages: vec![],
13111309
subscriptions: vec![],
13121310
control_msgs: vec![],
1313-
test_extension: None,
13141311
#[cfg(feature = "partial_messages")]
13151312
partial_message: None,
13161313
},

‎protocols/gossipsub/src/behaviour/tests/topic_config.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@ fn test_validation_error_message_size_too_large_topic_specific() {
636636
messages: vec![raw_message],
637637
subscriptions: vec![],
638638
control_msgs: vec![],
639-
test_extension: None,
640639
#[cfg(feature = "partial_messages")]
641640
partial_message: None,
642641
},
@@ -684,7 +683,6 @@ fn test_validation_error_message_size_too_large_topic_specific() {
684683
subscriptions: vec![],
685684
control: None,
686685
partial: None,
687-
testExtension: None,
688686
};
689687
codec.encode(rpc, &mut buf).unwrap();
690688

@@ -745,7 +743,6 @@ fn test_validation_message_size_within_topic_specific() {
745743
messages: vec![raw_message],
746744
subscriptions: vec![],
747745
control_msgs: vec![],
748-
test_extension: None,
749746
#[cfg(feature = "partial_messages")]
750747
partial_message: None,
751748
},
@@ -793,7 +790,6 @@ fn test_validation_message_size_within_topic_specific() {
793790
subscriptions: vec![],
794791
control: None,
795792
partial: None,
796-
testExtension: None,
797793
};
798794
codec.encode(rpc, &mut buf).unwrap();
799795

‎protocols/gossipsub/src/generated/gossipsub/pb.rs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ pub struct RPC {
2020
pub publish: Vec<gossipsub::pb::Message>,
2121
pub control: Option<gossipsub::pb::ControlMessage>,
2222
pub partial: Option<gossipsub::pb::PartialMessagesExtension>,
23-
pub testExtension: Option<gossipsub::pb::TestExtension>,
2423
}
2524

2625
impl<'a> MessageRead<'a> for RPC {
@@ -32,7 +31,6 @@ impl<'a> MessageRead<'a> for RPC {
3231
Ok(18) => msg.publish.push(r.read_message::<gossipsub::pb::Message>(bytes)?),
3332
Ok(26) => msg.control = Some(r.read_message::<gossipsub::pb::ControlMessage>(bytes)?),
3433
Ok(82) => msg.partial = Some(r.read_message::<gossipsub::pb::PartialMessagesExtension>(bytes)?),
35-
Ok(51939474) => msg.testExtension = Some(r.read_message::<gossipsub::pb::TestExtension>(bytes)?),
3634
Ok(t) => { r.read_unknown(bytes, t)?; }
3735
Err(e) => return Err(e),
3836
}
@@ -48,15 +46,13 @@ impl MessageWrite for RPC {
4846
+ self.publish.iter().map(|s| 1 + sizeof_len((s).get_size())).sum::<usize>()
4947
+ self.control.as_ref().map_or(0, |m| 1 + sizeof_len((m).get_size()))
5048
+ self.partial.as_ref().map_or(0, |m| 1 + sizeof_len((m).get_size()))
51-
+ self.testExtension.as_ref().map_or(0, |m| 4 + sizeof_len((m).get_size()))
5249
}
5350

5451
fn write_message<W: WriterBackend>(&self, w: &mut Writer<W>) -> Result<()> {
5552
for s in &self.subscriptions { w.write_with_tag(10, |w| w.write_message(s))?; }
5653
for s in &self.publish { w.write_with_tag(18, |w| w.write_message(s))?; }
5754
if let Some(ref s) = self.control { w.write_with_tag(26, |w| w.write_message(s))?; }
5855
if let Some(ref s) = self.partial { w.write_with_tag(82, |w| w.write_message(s))?; }
59-
if let Some(ref s) = self.testExtension { w.write_with_tag(51939474, |w| w.write_message(s))?; }
6056
Ok(())
6157
}
6258
}
@@ -391,7 +387,6 @@ impl MessageWrite for ControlIDontWant {
391387
#[derive(Debug, Default, PartialEq, Clone)]
392388
pub struct ControlExtensions {
393389
pub partialMessages: Option<bool>,
394-
pub testExtension: Option<bool>,
395390
}
396391

397392
impl<'a> MessageRead<'a> for ControlExtensions {
@@ -400,7 +395,6 @@ impl<'a> MessageRead<'a> for ControlExtensions {
400395
while !r.is_eof() {
401396
match r.next_tag(bytes) {
402397
Ok(80) => msg.partialMessages = Some(r.read_bool(bytes)?),
403-
Ok(51939472) => msg.testExtension = Some(r.read_bool(bytes)?),
404398
Ok(t) => { r.read_unknown(bytes, t)?; }
405399
Err(e) => return Err(e),
406400
}
@@ -413,12 +407,10 @@ impl MessageWrite for ControlExtensions {
413407
fn get_size(&self) -> usize {
414408
0
415409
+ self.partialMessages.as_ref().map_or(0, |m| 1 + sizeof_varint(*(m) as u64))
416-
+ self.testExtension.as_ref().map_or(0, |m| 4 + sizeof_varint(*(m) as u64))
417410
}
418411

419412
fn write_message<W: WriterBackend>(&self, w: &mut Writer<W>) -> Result<()> {
420413
if let Some(ref s) = self.partialMessages { w.write_with_tag(80, |w| w.write_bool(*s))?; }
421-
if let Some(ref s) = self.testExtension { w.write_with_tag(51939472, |w| w.write_bool(*s))?; }
422414
Ok(())
423415
}
424416
}

‎protocols/gossipsub/src/generated/rpc.proto‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ message RPC {
2222
optional ControlMessage control = 3;
2323
// Canonical Extensions should register their messages here.
2424
optional PartialMessagesExtension partial = 10;
25-
26-
// Experimental Extensions should register their messages here. They
27-
// must use field numbers larger than 0x200000 to be encoded with at least 4
28-
// bytes
29-
optional TestExtension testExtension = 6492434;
3025
}
3126

3227
message Message {
@@ -72,10 +67,6 @@ message ControlIDontWant {
7267

7368
message ControlExtensions {
7469
optional bool partialMessages = 10;
75-
76-
// Experimental extensions must use field numbers larger than 0x200000 to be
77-
// encoded with at least 4 bytes
78-
optional bool testExtension = 6492434;
7970
}
8071

8172
message TestExtension {}

‎protocols/gossipsub/src/protocol.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ use crate::{
3939
types::{
4040
ControlAction, Extensions, Graft, IDontWant, IHave, IWant, MessageId, PeerInfo, PeerKind,
4141
Prune, RawMessage, RpcIn, Subscription, SubscriptionAction, SubscriptionOpts,
42-
TestExtension,
4342
},
4443
ValidationError,
4544
};
@@ -566,7 +565,6 @@ impl Decoder for GossipsubCodec {
566565
.collect();
567566

568567
let extensions_msg = rpc_control.extensions.map(|extensions| Extensions {
569-
test_extension: extensions.testExtension,
570568
partial_messages: extensions.partialMessages,
571569
});
572570

@@ -619,7 +617,6 @@ impl Decoder for GossipsubCodec {
619617
})
620618
.collect(),
621619
control_msgs,
622-
test_extension: rpc.testExtension.map(|_test_extension| TestExtension {}),
623620
#[cfg(feature = "partial_messages")]
624621
partial_message,
625622
},

0 commit comments

Comments
 (0)