* adds validator flag to allow private ip addresses (#18850)
(cherry picked from commit d2d5f36a3c
)
# Conflicts:
# accounts-cluster-bench/Cargo.toml
# bench-tps/Cargo.toml
# cli/Cargo.toml
# core/benches/cluster_info.rs
# core/src/banking_stage.rs
# core/src/broadcast_stage.rs
# core/src/broadcast_stage/broadcast_duplicates_run.rs
# core/src/broadcast_stage/fail_entry_verification_broadcast_run.rs
# core/src/broadcast_stage/standard_broadcast_run.rs
# core/src/cluster_slots_service.rs
# core/src/repair_service.rs
# core/src/tvu.rs
# core/src/validator.rs
# dos/Cargo.toml
# gossip/src/cluster_info.rs
# gossip/src/crds_gossip_pull.rs
# gossip/src/crds_gossip_push.rs
# gossip/src/gossip_service.rs
# local-cluster/Cargo.toml
# local-cluster/src/cluster_tests.rs
# local-cluster/tests/local_cluster.rs
# rpc/Cargo.toml
# rpc/src/rpc.rs
# tokens/Cargo.toml
# validator/Cargo.toml
# validator/src/main.rs
* removes backport merge conflicts
Co-authored-by: behzad nouri <behzadnouri@gmail.com>
This commit is contained in:
@@ -246,8 +246,9 @@ mod tests {
|
||||
sorted_stakes_with_index,
|
||||
},
|
||||
},
|
||||
solana_sdk::timing::timestamp,
|
||||
std::iter::repeat_with,
|
||||
solana_sdk::{signature::Keypair, timing::timestamp},
|
||||
solana_streamer::socket::SocketAddrSpace,
|
||||
std::{iter::repeat_with, sync::Arc},
|
||||
};
|
||||
|
||||
// Legacy methods copied for testing backward compatibility.
|
||||
@@ -293,7 +294,11 @@ mod tests {
|
||||
.collect();
|
||||
// Add some staked nodes with no contact-info.
|
||||
stakes.extend(repeat_with(|| (Pubkey::new_unique(), rng.gen_range(0, 20))).take(100));
|
||||
let cluster_info = ClusterInfo::new_with_invalid_keypair(this_node);
|
||||
let cluster_info = ClusterInfo::new(
|
||||
this_node,
|
||||
Arc::new(Keypair::new()),
|
||||
SocketAddrSpace::Unspecified,
|
||||
);
|
||||
{
|
||||
let now = timestamp();
|
||||
let mut gossip = cluster_info.gossip.write().unwrap();
|
||||
|
Reference in New Issue
Block a user