Skip to content

Commit d995b3c

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

9 files changed

Lines changed: 3 additions & 95 deletions

File tree

protocols/gossipsub/src/behaviour.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2176,7 +2176,7 @@ where
21762176

21772177
#[cfg(feature = "partial_messages")]
21782178
self.partial_messages_extension
2179-
.peer_unsubscribed(*propagation_source, &topic_hash);
2179+
.peer_unsubscribed(*propagation_source, topic_hash);
21802180

21812181
unsubscribed_peers.push((*propagation_source, topic_hash.clone()));
21822182
// generate an unsubscribe event to be polled
@@ -3656,10 +3656,6 @@ where
36563656
self.handle_prune(&propagation_source, prune_msgs);
36573657
}
36583658

3659-
if let Some(_extension) = rpc.test_extension {
3660-
tracing::debug!("Received Test Extension");
3661-
}
3662-
36633659
#[cfg(feature = "partial_messages")]
36643660
if let Some(partial_message) = rpc.partial_message {
36653661
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 & 2 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
},
@@ -745,7 +744,6 @@ fn test_validation_message_size_within_topic_specific() {
745744
messages: vec![raw_message],
746745
subscriptions: vec![],
747746
control_msgs: vec![],
748-
test_extension: None,
749747
#[cfg(feature = "partial_messages")]
750748
partial_message: None,
751749
},

protocols/gossipsub/src/protocol.rs

Lines changed: 0 additions & 2 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
};
@@ -619,7 +618,6 @@ impl Decoder for GossipsubCodec {
619618
})
620619
.collect(),
621620
control_msgs,
622-
test_extension: rpc.testExtension.map(|_test_extension| TestExtension {}),
623621
#[cfg(feature = "partial_messages")]
624622
partial_message,
625623
},

protocols/gossipsub/src/types.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -336,9 +336,6 @@ pub struct Extensions {
336336
pub(crate) partial_messages: Option<bool>,
337337
}
338338

339-
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
340-
pub struct TestExtension {}
341-
342339
/// A Gossipsub RPC message sent.
343340
#[derive(Debug)]
344341
pub enum RpcOut {
@@ -607,8 +604,6 @@ pub struct RpcIn {
607604
pub subscriptions: Vec<Subscription>,
608605
/// List of Gossipsub control messages.
609606
pub control_msgs: Vec<ControlAction>,
610-
/// Gossipsub test extension.
611-
pub test_extension: Option<TestExtension>,
612607
/// Partial messages extension.
613608
#[cfg(feature = "partial_messages")]
614609
pub partial_message: Option<crate::extensions::partial_messages::PartialMessage>,

0 commit comments

Comments
 (0)