Purge Default::default()
This commit is contained in:
parent
a6aaca814c
commit
da5b777ee7
|
@ -342,7 +342,7 @@ pub fn fund_keys(client: &mut ThinClient, source: &Keypair, dests: &[Keypair], t
|
|||
.map(|(k, m)| {
|
||||
(
|
||||
k.clone(),
|
||||
SystemTransaction::new_move_many(k, &m, Default::default(), 0),
|
||||
SystemTransaction::new_move_many(k, &m, Hash::default(), 0),
|
||||
)
|
||||
})
|
||||
.collect();
|
||||
|
|
|
@ -10,6 +10,7 @@ use solana::entry::Entry;
|
|||
use solana::genesis_block::GenesisBlock;
|
||||
use solana::last_id_queue::MAX_ENTRY_IDS;
|
||||
use solana::packet::to_packets_chunked;
|
||||
use solana::poh_service::PohServiceConfig;
|
||||
use solana_sdk::hash::hash;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use solana_sdk::signature::{KeypairUtil, Signature};
|
||||
|
@ -103,7 +104,7 @@ fn bench_banking_stage_multi_accounts(bencher: &mut Bencher) {
|
|||
let (_stage, signal_receiver) = BankingStage::new(
|
||||
&bank,
|
||||
verified_receiver,
|
||||
Default::default(),
|
||||
PohServiceConfig::default(),
|
||||
&genesis_block.last_id(),
|
||||
std::u64::MAX,
|
||||
genesis_block.bootstrap_leader_id,
|
||||
|
@ -212,7 +213,7 @@ fn bench_banking_stage_multi_programs(bencher: &mut Bencher) {
|
|||
let (_stage, signal_receiver) = BankingStage::new(
|
||||
&bank,
|
||||
verified_receiver,
|
||||
Default::default(),
|
||||
PohServiceConfig::default(),
|
||||
&genesis_block.last_id(),
|
||||
std::u64::MAX,
|
||||
genesis_block.bootstrap_leader_id,
|
||||
|
|
|
@ -15,7 +15,7 @@ use test::Bencher;
|
|||
#[ignore]
|
||||
fn bench_bits_set(bencher: &mut Bencher) {
|
||||
let mut bits: BitVec<u8> = BitVec::new_fill(false, 38_340_234 as u64);
|
||||
let mut hasher: FnvHasher = Default::default();
|
||||
let mut hasher = FnvHasher::default();
|
||||
|
||||
bencher.iter(|| {
|
||||
let idx = hasher.finish() % bits.len();
|
||||
|
@ -30,7 +30,7 @@ fn bench_bits_set(bencher: &mut Bencher) {
|
|||
#[ignore]
|
||||
fn bench_bits_set_hasher(bencher: &mut Bencher) {
|
||||
let bits: BitVec<u8> = BitVec::new_fill(false, 38_340_234 as u64);
|
||||
let mut hasher: FnvHasher = Default::default();
|
||||
let mut hasher = FnvHasher::default();
|
||||
|
||||
bencher.iter(|| {
|
||||
let idx = hasher.finish() % bits.len();
|
||||
|
|
|
@ -226,7 +226,7 @@ mod test {
|
|||
#[test]
|
||||
fn test_storage_tx() {
|
||||
let keypair = Keypair::new();
|
||||
let mut accounts = [(keypair.pubkey(), Default::default())];
|
||||
let mut accounts = [(keypair.pubkey(), Account::default())];
|
||||
let mut keyed_accounts = create_keyed_accounts(&mut accounts);
|
||||
assert!(entrypoint(&id(), &mut keyed_accounts, &[], 42).is_err());
|
||||
}
|
||||
|
@ -258,7 +258,7 @@ mod test {
|
|||
#[test]
|
||||
fn test_invalid_accounts_len() {
|
||||
let keypair = Keypair::new();
|
||||
let mut accounts = [Default::default()];
|
||||
let mut accounts = [Account::default()];
|
||||
|
||||
let tx = StorageTransaction::new_mining_proof(
|
||||
&keypair,
|
||||
|
@ -269,7 +269,7 @@ mod test {
|
|||
);
|
||||
assert!(test_transaction(&tx, &mut accounts).is_err());
|
||||
|
||||
let mut accounts = [Default::default(), Default::default(), Default::default()];
|
||||
let mut accounts = [Account::default(), Account::default(), Account::default()];
|
||||
|
||||
assert!(test_transaction(&tx, &mut accounts).is_err());
|
||||
}
|
||||
|
|
|
@ -232,13 +232,13 @@ mod tests {
|
|||
fn test_serialize_claim() {
|
||||
let expr = BudgetExpr::Pay(Payment {
|
||||
tokens: 0,
|
||||
to: Default::default(),
|
||||
to: Pubkey::default(),
|
||||
});
|
||||
let instruction = Instruction::NewBudget(expr);
|
||||
let instructions = vec![transaction::Instruction::new(0, &instruction, vec![])];
|
||||
let claim0 = Transaction {
|
||||
account_keys: vec![],
|
||||
last_id: Default::default(),
|
||||
last_id: Hash::default(),
|
||||
signatures: vec![],
|
||||
program_ids: vec![],
|
||||
instructions,
|
||||
|
|
|
@ -133,7 +133,7 @@ mod tests {
|
|||
let t2 = Keypair::new();
|
||||
let moves = vec![(t1.pubkey(), 1), (t2.pubkey(), 2)];
|
||||
|
||||
let tx = SystemTransaction::new_move_many(&from, &moves, Default::default(), 0);
|
||||
let tx = SystemTransaction::new_move_many(&from, &moves, Hash::default(), 0);
|
||||
assert_eq!(tx.account_keys[0], from.pubkey());
|
||||
assert_eq!(tx.account_keys[1], t1.pubkey());
|
||||
assert_eq!(tx.account_keys[2], t2.pubkey());
|
||||
|
|
|
@ -412,7 +412,7 @@ mod tests {
|
|||
let tx = Transaction::new_with_instructions(
|
||||
&[&key],
|
||||
&[key1, key2],
|
||||
Default::default(),
|
||||
Hash::default(),
|
||||
0,
|
||||
vec![prog1, prog2],
|
||||
instructions,
|
||||
|
@ -447,7 +447,7 @@ mod tests {
|
|||
let tx = Transaction::new_with_instructions(
|
||||
&[&key],
|
||||
&[],
|
||||
Default::default(),
|
||||
Hash::default(),
|
||||
0,
|
||||
vec![],
|
||||
instructions,
|
||||
|
@ -461,12 +461,12 @@ mod tests {
|
|||
let tx = Transaction::new_with_instructions(
|
||||
&[&key],
|
||||
&[],
|
||||
Default::default(),
|
||||
Hash::default(),
|
||||
0,
|
||||
vec![Default::default()],
|
||||
vec![Pubkey::default()],
|
||||
instructions,
|
||||
);
|
||||
assert_eq!(*tx.program_id(0), Default::default());
|
||||
assert_eq!(*tx.program_id(0), Pubkey::default());
|
||||
assert!(!tx.verify_refs());
|
||||
}
|
||||
|
||||
|
|
|
@ -293,7 +293,7 @@ mod tests {
|
|||
let (banking_stage, _entry_receiver) = BankingStage::new(
|
||||
&bank,
|
||||
verified_receiver,
|
||||
Default::default(),
|
||||
PohServiceConfig::default(),
|
||||
&bank.last_id(),
|
||||
std::u64::MAX,
|
||||
genesis_block.bootstrap_leader_id,
|
||||
|
@ -315,7 +315,7 @@ mod tests {
|
|||
let (banking_stage, entry_receiver) = BankingStage::new(
|
||||
&bank,
|
||||
verified_receiver,
|
||||
Default::default(),
|
||||
PohServiceConfig::default(),
|
||||
&bank.last_id(),
|
||||
std::u64::MAX,
|
||||
genesis_block.bootstrap_leader_id,
|
||||
|
@ -367,7 +367,7 @@ mod tests {
|
|||
let (banking_stage, entry_receiver) = BankingStage::new(
|
||||
&bank,
|
||||
verified_receiver,
|
||||
Default::default(),
|
||||
PohServiceConfig::default(),
|
||||
&bank.last_id(),
|
||||
std::u64::MAX,
|
||||
genesis_block.bootstrap_leader_id,
|
||||
|
@ -425,7 +425,7 @@ mod tests {
|
|||
let (banking_stage, entry_receiver) = BankingStage::new(
|
||||
&bank,
|
||||
verified_receiver,
|
||||
Default::default(),
|
||||
PohServiceConfig::default(),
|
||||
&bank.last_id(),
|
||||
std::u64::MAX,
|
||||
genesis_block.bootstrap_leader_id,
|
||||
|
@ -494,7 +494,7 @@ mod tests {
|
|||
let (banking_stage, _entry_receiver) = BankingStage::new(
|
||||
&bank,
|
||||
verified_receiver,
|
||||
Default::default(),
|
||||
PohServiceConfig::default(),
|
||||
&bank.last_id(),
|
||||
max_tick_height,
|
||||
genesis_block.bootstrap_leader_id,
|
||||
|
|
|
@ -25,7 +25,7 @@ impl<T: BloomHashIndex> Bloom<T> {
|
|||
Bloom {
|
||||
keys,
|
||||
bits,
|
||||
_phantom: Default::default(),
|
||||
_phantom: PhantomData::default(),
|
||||
}
|
||||
}
|
||||
/// create filter optimal for num size given the `false_rate`
|
||||
|
|
|
@ -7,6 +7,7 @@ use crate::counter::Counter;
|
|||
use crate::genesis_block::GenesisBlock;
|
||||
use crate::gossip_service::GossipService;
|
||||
use crate::leader_scheduler::LeaderSchedulerConfig;
|
||||
use crate::poh_service::PohServiceConfig;
|
||||
use crate::rpc::JsonRpcService;
|
||||
use crate::rpc_pubsub::PubSubService;
|
||||
use crate::service::Service;
|
||||
|
@ -77,8 +78,8 @@ impl Default for FullnodeConfig {
|
|||
voting_disabled: false,
|
||||
entry_stream: None,
|
||||
storage_rotate_count: NUM_HASHES_FOR_STORAGE_ROTATE,
|
||||
leader_scheduler_config: Default::default(),
|
||||
ledger_config: Default::default(),
|
||||
leader_scheduler_config: LeaderSchedulerConfig::default(),
|
||||
ledger_config: BlocktreeConfig::default(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -271,7 +272,7 @@ impl Fullnode {
|
|||
);
|
||||
let tpu = Tpu::new(
|
||||
&Arc::new(bank.copy_for_tpu()),
|
||||
Default::default(),
|
||||
PohServiceConfig::default(),
|
||||
node.sockets
|
||||
.tpu
|
||||
.iter()
|
||||
|
@ -389,7 +390,7 @@ impl Fullnode {
|
|||
self.to_validator_receiver = to_validator_receiver;
|
||||
self.node_services.tpu.switch_to_leader(
|
||||
&Arc::new(self.bank.copy_for_tpu()),
|
||||
Default::default(),
|
||||
PohServiceConfig::default(),
|
||||
self.tpu_sockets
|
||||
.iter()
|
||||
.map(|s| s.try_clone().expect("Failed to clone TPU sockets"))
|
||||
|
|
|
@ -399,7 +399,7 @@ impl LeaderScheduler {
|
|||
|
||||
impl Default for LeaderScheduler {
|
||||
fn default() -> Self {
|
||||
let config = Default::default();
|
||||
let config = LeaderSchedulerConfig::default();
|
||||
Self::new(&config)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -224,7 +224,7 @@ pub fn to_packets_chunked<T: Serialize>(xs: &[T], chunks: usize) -> Vec<SharedPa
|
|||
p.write()
|
||||
.unwrap()
|
||||
.packets
|
||||
.resize(x.len(), Default::default());
|
||||
.resize(x.len(), Packet::default());
|
||||
for (i, o) in x.iter().zip(p.write().unwrap().packets.iter_mut()) {
|
||||
let mut wr = io::Cursor::new(&mut o.data[..]);
|
||||
serialize_into(&mut wr, &i).expect("serialize request");
|
||||
|
|
|
@ -144,17 +144,19 @@ impl RpcPubSubBank {
|
|||
}
|
||||
}
|
||||
|
||||
type RpcAccountSubscriptions = RwLock<HashMap<Pubkey, HashMap<SubscriptionId, Sink<Account>>>>;
|
||||
type RpcSignatureSubscriptions =
|
||||
RwLock<HashMap<Signature, HashMap<SubscriptionId, Sink<RpcSignatureStatus>>>>;
|
||||
pub struct RpcSubscriptions {
|
||||
account_subscriptions: RwLock<HashMap<Pubkey, HashMap<SubscriptionId, Sink<Account>>>>,
|
||||
signature_subscriptions:
|
||||
RwLock<HashMap<Signature, HashMap<SubscriptionId, Sink<RpcSignatureStatus>>>>,
|
||||
account_subscriptions: RpcAccountSubscriptions,
|
||||
signature_subscriptions: RpcSignatureSubscriptions,
|
||||
}
|
||||
|
||||
impl Default for RpcSubscriptions {
|
||||
fn default() -> Self {
|
||||
RpcSubscriptions {
|
||||
account_subscriptions: Default::default(),
|
||||
signature_subscriptions: Default::default(),
|
||||
account_subscriptions: RpcAccountSubscriptions::default(),
|
||||
signature_subscriptions: RpcSignatureSubscriptions::default(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -260,9 +262,9 @@ struct RpcSolPubSubImpl {
|
|||
impl RpcSolPubSubImpl {
|
||||
fn new(bank: Arc<RwLock<RpcPubSubBank>>) -> Self {
|
||||
RpcSolPubSubImpl {
|
||||
uid: Default::default(),
|
||||
uid: Arc::new(atomic::AtomicUsize::default()),
|
||||
bank,
|
||||
subscription: Arc::new(Default::default()),
|
||||
subscription: Arc::new(RpcSubscriptions::default()),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -442,7 +442,7 @@ mod tests {
|
|||
.write()
|
||||
.unwrap()
|
||||
.packets
|
||||
.resize(0, Default::default());
|
||||
.resize(0, Packet::default());
|
||||
for _ in 0..num_packets_per_batch {
|
||||
packets.write().unwrap().packets.push(packet.clone());
|
||||
}
|
||||
|
|
|
@ -135,7 +135,7 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_has_signature() {
|
||||
let sig = Default::default();
|
||||
let sig = Signature::default();
|
||||
let last_id = hash(Hash::default().as_ref());
|
||||
let mut status_cache = BankStatusCache::new(&last_id);
|
||||
assert_eq!(status_cache.has_signature(&sig), false);
|
||||
|
@ -147,7 +147,7 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_has_signature_checkpoint() {
|
||||
let sig = Default::default();
|
||||
let sig = Signature::default();
|
||||
let last_id = hash(Hash::default().as_ref());
|
||||
let mut first = BankStatusCache::new(&last_id);
|
||||
first.add(&sig);
|
||||
|
@ -164,7 +164,7 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_has_signature_merged1() {
|
||||
let sig = Default::default();
|
||||
let sig = Signature::default();
|
||||
let last_id = hash(Hash::default().as_ref());
|
||||
let mut first = BankStatusCache::new(&last_id);
|
||||
first.add(&sig);
|
||||
|
@ -178,7 +178,7 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_has_signature_merged2() {
|
||||
let sig = Default::default();
|
||||
let sig = Signature::default();
|
||||
let last_id = hash(Hash::default().as_ref());
|
||||
let mut first = BankStatusCache::new(&last_id);
|
||||
first.add(&sig);
|
||||
|
@ -192,7 +192,7 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_failure_status() {
|
||||
let sig = Default::default();
|
||||
let sig = Signature::default();
|
||||
let last_id = hash(Hash::default().as_ref());
|
||||
let mut first = StatusCache::new(&last_id);
|
||||
first.add(&sig);
|
||||
|
@ -206,7 +206,7 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_clear_signatures() {
|
||||
let sig = Default::default();
|
||||
let sig = Signature::default();
|
||||
let last_id = hash(Hash::default().as_ref());
|
||||
let mut first = StatusCache::new(&last_id);
|
||||
first.add(&sig);
|
||||
|
@ -222,7 +222,7 @@ mod tests {
|
|||
}
|
||||
#[test]
|
||||
fn test_clear_signatures_all() {
|
||||
let sig = Default::default();
|
||||
let sig = Signature::default();
|
||||
let last_id = hash(Hash::default().as_ref());
|
||||
let mut first = StatusCache::new(&last_id);
|
||||
first.add(&sig);
|
||||
|
|
|
@ -290,13 +290,8 @@ mod test {
|
|||
leader_node.sockets.tvu.into_iter().map(Arc::new).collect();
|
||||
let t_responder = responder("window_send_test", blob_sockets[0].clone(), r_responder);
|
||||
let mut msgs = Vec::new();
|
||||
let blobs = make_consecutive_blobs(
|
||||
&me_id,
|
||||
14u64,
|
||||
0,
|
||||
Default::default(),
|
||||
&leader_node.info.gossip,
|
||||
);
|
||||
let blobs =
|
||||
make_consecutive_blobs(&me_id, 14u64, 0, Hash::default(), &leader_node.info.gossip);
|
||||
|
||||
for v in 0..10 {
|
||||
let i = 9 - v;
|
||||
|
|
Loading…
Reference in New Issue