* Rename Packets to PacketBatch (#21794)
(cherry picked from commit 254ef3e7b6
)
# Conflicts:
# core/src/ancestor_hashes_service.rs
# core/src/banking_stage.rs
# core/src/cluster_info_vote_listener.rs
# core/src/fetch_stage.rs
# core/src/serve_repair.rs
# core/src/shred_fetch_stage.rs
# core/src/sigverify_stage.rs
# core/src/verified_vote_packets.rs
# core/src/window_service.rs
# gossip/src/cluster_info.rs
# ledger/src/entry.rs
# streamer/src/streamer.rs
* resolve conflicts
Co-authored-by: Justin Starry <justin@solana.com>
This commit is contained in:
@@ -13,7 +13,7 @@ use {
|
||||
get_tmp_ledger_path,
|
||||
},
|
||||
solana_measure::measure::Measure,
|
||||
solana_perf::packet::to_packets_chunked,
|
||||
solana_perf::packet::to_packet_batches,
|
||||
solana_poh::poh_recorder::{create_test_recorder, PohRecorder, WorkingBankEntry},
|
||||
solana_runtime::{
|
||||
accounts_background_service::AbsRequestSender, bank::Bank, bank_forks::BankForks,
|
||||
@@ -211,7 +211,7 @@ fn main() {
|
||||
bank.clear_signatures();
|
||||
}
|
||||
|
||||
let mut verified: Vec<_> = to_packets_chunked(&transactions, packets_per_chunk);
|
||||
let mut verified: Vec<_> = to_packet_batches(&transactions, packets_per_chunk);
|
||||
let ledger_path = get_tmp_ledger_path!();
|
||||
{
|
||||
let blockstore = Arc::new(
|
||||
@@ -364,7 +364,7 @@ fn main() {
|
||||
let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen::<u8>()).collect();
|
||||
tx.signatures[0] = Signature::new(&sig[0..64]);
|
||||
}
|
||||
verified = to_packets_chunked(&transactions.clone(), packets_per_chunk);
|
||||
verified = to_packet_batches(&transactions.clone(), packets_per_chunk);
|
||||
}
|
||||
|
||||
start += chunk_len;
|
||||
|
Reference in New Issue
Block a user