Move bootnodes from individual SetConfigs to PeersetConfig

client/network/src/peerset.rs

@@ -192,6 +192,8 @@ impl From<u64> for IncomingIndex {
 /// Configuration to pass when creating the peer set manager.
 #[derive(Debug)]
 pub struct PeersetConfig {
+	/// Bootnodes.
+	pub bootnodes: Vec<PeerId>,
 	/// List of sets of nodes the peerset manages.
 	pub sets: Vec<SetConfig>,
 }
@@ -205,12 +207,6 @@ pub struct SetConfig {
 	/// Maximum number of outgoing links to peers.
 	pub out_peers: u32,
 
-	/// List of bootstrap nodes to initialize the set with.
-	///
-	/// > **Note**: Keep in mind that the networking has to know an address for these nodes,
-	/// > otherwise it will not be able to connect to them.
-	pub bootnodes: Vec<PeerId>,
-
 	/// Lists of nodes we should always be connected to.
 	///
 	/// > **Note**: Keep in mind that the networking has to know an address for these nodes,
@@ -244,8 +240,7 @@ pub struct Peerset {
 impl Peerset {
 	/// Builds a new peerset from the given configuration.
 	pub fn from_config(config: PeersetConfig) -> (Peerset, PeersetHandle) {
-		let default_set_config = &config.sets[0];
-		let peer_store = PeerStore::new(default_set_config.bootnodes.clone());
+		let peer_store = PeerStore::new(config.bootnodes);
 
 		let (to_notifications, from_controllers) =
 			tracing_unbounded("mpsc_protocol_controllers_to_notifications", 10_000);

client/network/src/protocol.rs

@@ -131,7 +131,6 @@ impl<B: BlockT> Protocol<B> {
 			sets.push(crate::peerset::SetConfig {
 				in_peers: network_config.default_peers_set.in_peers,
 				out_peers: network_config.default_peers_set.out_peers,
-				bootnodes,
 				reserved_nodes: default_sets_reserved.clone(),
 				reserved_only: network_config.default_peers_set.non_reserved_mode ==
 					NonReservedPeerMode::Deny,
@@ -150,13 +149,12 @@ impl<B: BlockT> Protocol<B> {
 				sets.push(crate::peerset::SetConfig {
 					in_peers: set_cfg.set_config.in_peers,
 					out_peers: set_cfg.set_config.out_peers,
-					bootnodes: Vec::new(),
 					reserved_nodes,
 					reserved_only,
 				});
 			}
 
-			crate::peerset::Peerset::from_config(crate::peerset::PeersetConfig { sets })
+			crate::peerset::Peerset::from_config(crate::peerset::PeersetConfig { bootnodes, sets })
 		};
 
 		let behaviour = {

client/network/src/protocol/notifications/behaviour.rs

@@ -2159,12 +2159,14 @@ mod tests {
 			sets.push(crate::peerset::SetConfig {
 				in_peers: 25,
 				out_peers: 25,
-				bootnodes: Vec::new(),
 				reserved_nodes: HashSet::new(),
 				reserved_only: false,
 			});
 
-			crate::peerset::Peerset::from_config(crate::peerset::PeersetConfig { sets })
+			crate::peerset::Peerset::from_config(crate::peerset::PeersetConfig {
+				bootnodes: Vec::new(),
+				sets,
+			})
 		};
 
 		(

client/network/src/protocol/notifications/tests.rs

@@ -67,18 +67,14 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 
 		let (peerset, handle) =
 			crate::peerset::Peerset::from_config(crate::peerset::PeersetConfig {
+				bootnodes: if index == 0 {
+					keypairs.iter().skip(1).map(|keypair| keypair.public().to_peer_id()).collect()
+				} else {
+					vec![]
+				},
 				sets: vec![crate::peerset::SetConfig {
 					in_peers: 25,
 					out_peers: 25,
-					bootnodes: if index == 0 {
-						keypairs
-							.iter()
-							.skip(1)
-							.map(|keypair| keypair.public().to_peer_id())
-							.collect()
-					} else {
-						vec![]
-					},
 					reserved_nodes: Default::default(),
 					reserved_only: false,
 				}],

client/network/src/protocol_controller.rs

@@ -775,7 +775,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 0,
 			out_peers: 0,
-			bootnodes: Vec::new(),
 			reserved_nodes: std::iter::once(reserved1).collect(),
 			reserved_only: true,
 		};
@@ -838,7 +837,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 0,
 			out_peers: 0,
-			bootnodes: Vec::new(),
 			reserved_nodes: std::iter::once(reserved1).collect(),
 			reserved_only: true,
 		};
@@ -890,7 +888,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 0,
 			out_peers: 0,
-			bootnodes: Vec::new(),
 			reserved_nodes: std::iter::once(reserved1).collect(),
 			reserved_only: true,
 		};
@@ -950,7 +947,6 @@ mod tests {
 			in_peers: 0,
 			// Less slots than candidates.
 			out_peers: 2,
-			bootnodes: Vec::new(),
 			reserved_nodes: HashSet::new(),
 			reserved_only: false,
 		};
@@ -998,13 +994,8 @@ mod tests {
 		let outgoing_candidates = vec![regular1, regular2];
 		let reserved_nodes = [reserved1, reserved2].iter().cloned().collect();
 
-		let config = SetConfig {
-			in_peers: 10,
-			out_peers: 10,
-			bootnodes: Vec::new(),
-			reserved_nodes,
-			reserved_only: false,
-		};
+		let config =
+			SetConfig { in_peers: 10, out_peers: 10, reserved_nodes, reserved_only: false };
 		let (tx, mut rx) = tracing_unbounded("mpsc_test_to_notifications", 100);
 
 		let mut peer_store = MockPeerStoreHandle::new();
@@ -1043,7 +1034,6 @@ mod tests {
 			in_peers: 0,
 			// Less slots than candidates.
 			out_peers: 2,
-			bootnodes: Vec::new(),
 			reserved_nodes: HashSet::new(),
 			reserved_only: false,
 		};
@@ -1114,7 +1104,6 @@ mod tests {
 			in_peers: 0,
 			// Make sure we have slots available.
 			out_peers: 2,
-			bootnodes: Vec::new(),
 			reserved_nodes: HashSet::new(),
 			reserved_only: true,
 		};
@@ -1141,7 +1130,6 @@ mod tests {
 			// Make sure we have slots available.
 			in_peers: 2,
 			out_peers: 0,
-			bootnodes: Vec::new(),
 			reserved_nodes: HashSet::new(),
 			reserved_only: true,
 		};
@@ -1179,7 +1167,6 @@ mod tests {
 			in_peers: 0,
 			// Make sure we have slots available.
 			out_peers: 10,
-			bootnodes: Vec::new(),
 			reserved_nodes: HashSet::new(),
 			reserved_only: true,
 		};
@@ -1226,7 +1213,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 10,
 			out_peers: 10,
-			bootnodes: Vec::new(),
 			reserved_nodes: [reserved1, reserved2].iter().cloned().collect(),
 			reserved_only: false,
 		};
@@ -1287,7 +1273,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 10,
 			out_peers: 10,
-			bootnodes: Vec::new(),
 			reserved_nodes: [reserved1, reserved2].iter().cloned().collect(),
 			reserved_only: false,
 		};
@@ -1320,7 +1305,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 10,
 			out_peers: 10,
-			bootnodes: Vec::new(),
 			reserved_nodes: [reserved1, reserved2].iter().cloned().collect(),
 			reserved_only: true,
 		};
@@ -1367,7 +1351,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 10,
 			out_peers: 10,
-			bootnodes: Vec::new(),
 			reserved_nodes: [peer1, peer2].iter().cloned().collect(),
 			reserved_only: false,
 		};
@@ -1414,7 +1397,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 10,
 			out_peers: 10,
-			bootnodes: Vec::new(),
 			reserved_nodes: HashSet::new(),
 			reserved_only: false,
 		};
@@ -1457,7 +1439,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 10,
 			out_peers: 10,
-			bootnodes: Vec::new(),
 			reserved_nodes: HashSet::new(),
 			reserved_only: false,
 		};
@@ -1517,7 +1498,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 10,
 			out_peers: 10,
-			bootnodes: Vec::new(),
 			reserved_nodes: [reserved1, reserved2].iter().cloned().collect(),
 			reserved_only: false,
 		};
@@ -1574,7 +1554,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 10,
 			out_peers: 10,
-			bootnodes: Vec::new(),
 			reserved_nodes: HashSet::new(),
 			reserved_only: false,
 		};
@@ -1627,7 +1606,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 10,
 			out_peers: 10,
-			bootnodes: Vec::new(),
 			reserved_nodes: [reserved1, reserved2].iter().cloned().collect(),
 			reserved_only: false,
 		};
@@ -1688,7 +1666,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 10,
 			out_peers: 10,
-			bootnodes: Vec::new(),
 			reserved_nodes: HashSet::new(),
 			reserved_only: false,
 		};
@@ -1741,7 +1718,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 10,
 			out_peers: 10,
-			bootnodes: Vec::new(),
 			reserved_nodes: HashSet::new(),
 			reserved_only: false,
 		};
@@ -1795,7 +1771,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 1,
 			out_peers: 1,
-			bootnodes: Vec::new(),
 			reserved_nodes: HashSet::new(),
 			reserved_only: false,
 		};
@@ -1849,7 +1824,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 1,
 			out_peers: 10,
-			bootnodes: Vec::new(),
 			reserved_nodes: HashSet::new(),
 			reserved_only: false,
 		};
@@ -1880,7 +1854,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 10,
 			out_peers: 10,
-			bootnodes: Vec::new(),
 			reserved_nodes: HashSet::new(),
 			reserved_only: false,
 		};
@@ -1906,7 +1879,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 10,
 			out_peers: 10,
-			bootnodes: Vec::new(),
 			reserved_nodes: std::iter::once(reserved1).collect(),
 			reserved_only: false,
 		};
@@ -1933,7 +1905,6 @@ mod tests {
 		let config = SetConfig {
 			in_peers: 10,
 			out_peers: 10,
-			bootnodes: Vec::new(),
 			reserved_nodes: std::iter::once(reserved1).collect(),
 			reserved_only: false,
 		};

client/network/src/request_responses.rs

@@ -1073,10 +1073,10 @@ mod tests {
 			.boxed();
 
 		let config = PeersetConfig {
+			bootnodes: vec![],
 			sets: vec![SetConfig {
 				in_peers: u32::max_value(),
 				out_peers: u32::max_value(),
-				bootnodes: vec![],
 				reserved_nodes: Default::default(),
 				reserved_only: false,
 			}],

client/network/test/src/peerset.rs

@@ -130,14 +130,14 @@ fn test_once() {
 	let mut reserved_nodes = HashSet::<PeerId>::new();
 
 	let (mut peerset, peerset_handle) = Peerset::from_config(PeersetConfig {
+		bootnodes: (0..Uniform::new_inclusive(0, 4).sample(&mut rng))
+			.map(|_| {
+				let id = PeerId::random();
+				known_nodes.insert(id, State::Disconnected);
+				id
+			})
+			.collect(),
 		sets: vec![SetConfig {
-			bootnodes: (0..Uniform::new_inclusive(0, 4).sample(&mut rng))
-				.map(|_| {
-					let id = PeerId::random();
-					known_nodes.insert(id, State::Disconnected);
-					id
-				})
-				.collect(),
 			reserved_nodes: {
 				(0..Uniform::new_inclusive(0, 2).sample(&mut rng))
 					.map(|_| {