blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Packet::from_data() to remove repeated logic (#24372)

This commit is contained in:
steviez 2022-04-18 00:15:39 -05:00 committed by GitHub
parent 2970507d7c
commit 6a5a540b39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
perf/src/sigverify.rs
View File

@ -3,9 +3,6 @@
//! cores. When perf-libs are available signature verification is offloaded //! cores. When perf-libs are available signature verification is offloaded
//! to the GPU. //! to the GPU.
//! //!
#[cfg(test)]
use solana_sdk::transaction::Transaction;
use { use {
crate::{ crate::{
cuda_runtime::PinnedVec, cuda_runtime::PinnedVec,
@ -711,17 +708,6 @@ pub fn ed25519_verify(
inc_new_counter_debug!("ed25519_verify_gpu", valid_packet_count); inc_new_counter_debug!("ed25519_verify_gpu", valid_packet_count);
} }
#[cfg(test)]
pub fn make_packet_from_transaction(tx: Transaction) -> Packet {
use bincode::serialize;
let tx_bytes = serialize(&tx).unwrap();
let mut packet = Packet::default();
packet.meta.size = tx_bytes.len();
packet.data[..packet.meta.size].copy_from_slice(&tx_bytes);
packet
}
#[cfg(test)] #[cfg(test)]
#[allow(clippy::integer_arithmetic)] #[allow(clippy::integer_arithmetic)]
mod tests { mod tests {
@ -780,7 +766,7 @@ mod tests {
let tx = test_tx(); let tx = test_tx();
let tx_bytes = serialize(&tx).unwrap(); let tx_bytes = serialize(&tx).unwrap();
let message_data = tx.message_data(); let message_data = tx.message_data();
let mut packet = sigverify::make_packet_from_transaction(tx.clone()); let mut packet = Packet::from_data(None, tx.clone()).unwrap();
let packet_offsets = sigverify::get_packet_offsets(&mut packet, 0, false); let packet_offsets = sigverify::get_packet_offsets(&mut packet, 0, false);
@ -816,7 +802,7 @@ mod tests {
}; };
let mut tx = Transaction::new_unsigned(message); let mut tx = Transaction::new_unsigned(message);
tx.signatures = vec![Signature::default(); actual_num_sigs as usize]; tx.signatures = vec![Signature::default(); actual_num_sigs as usize];
sigverify::make_packet_from_transaction(tx) Packet::from_data(None, tx).unwrap()
} }
#[test] #[test]
@ -837,7 +823,7 @@ mod tests {
#[test] #[test]
fn test_small_packet() { fn test_small_packet() {
let tx = test_tx(); let tx = test_tx();
let mut packet = sigverify::make_packet_from_transaction(tx); let mut packet = Packet::from_data(None, tx).unwrap();
packet.data[0] = 0xff; packet.data[0] = 0xff;
packet.data[1] = 0xff; packet.data[1] = 0xff;
@ -856,7 +842,7 @@ mod tests {
tx.signatures = vec![sig; NUM_SIG]; tx.signatures = vec![sig; NUM_SIG];
tx.message.account_keys = vec![]; tx.message.account_keys = vec![];
tx.message.header.num_required_signatures = NUM_SIG as u8; tx.message.header.num_required_signatures = NUM_SIG as u8;
let mut packet = sigverify::make_packet_from_transaction(tx); let mut packet = Packet::from_data(None, tx).unwrap();
let res = sigverify::do_get_packet_offsets(&packet, 0); let res = sigverify::do_get_packet_offsets(&packet, 0);
assert_eq!(res, Err(PacketError::InvalidPubkeyLen)); assert_eq!(res, Err(PacketError::InvalidPubkeyLen));
@ -892,7 +878,7 @@ mod tests {
let sig = keypair1.try_sign_message(&tx.message_data()).unwrap(); let sig = keypair1.try_sign_message(&tx.message_data()).unwrap();
tx.signatures = vec![sig; NUM_SIG]; tx.signatures = vec![sig; NUM_SIG];
let mut packet = sigverify::make_packet_from_transaction(tx); let mut packet = Packet::from_data(None, tx).unwrap();
let res = sigverify::do_get_packet_offsets(&packet, 0); let res = sigverify::do_get_packet_offsets(&packet, 0);
assert_eq!(res, Err(PacketError::InvalidPubkeyLen)); assert_eq!(res, Err(PacketError::InvalidPubkeyLen));
@ -909,7 +895,7 @@ mod tests {
#[test] #[test]
fn test_large_sig_len() { fn test_large_sig_len() {
let tx = test_tx(); let tx = test_tx();
let mut packet = sigverify::make_packet_from_transaction(tx); let mut packet = Packet::from_data(None, tx).unwrap();
// Make the signatures len huge // Make the signatures len huge
packet.data[0] = 0x7f; packet.data[0] = 0x7f;
@ -921,7 +907,7 @@ mod tests {
#[test] #[test]
fn test_really_large_sig_len() { fn test_really_large_sig_len() {
let tx = test_tx(); let tx = test_tx();
let mut packet = sigverify::make_packet_from_transaction(tx); let mut packet = Packet::from_data(None, tx).unwrap();
// Make the signatures len huge // Make the signatures len huge
packet.data[0] = 0xff; packet.data[0] = 0xff;
@ -936,7 +922,7 @@ mod tests {
#[test] #[test]
fn test_invalid_pubkey_len() { fn test_invalid_pubkey_len() {
let tx = test_tx(); let tx = test_tx();
let mut packet = sigverify::make_packet_from_transaction(tx); let mut packet = Packet::from_data(None, tx).unwrap();
let res = sigverify::do_get_packet_offsets(&packet, 0); let res = sigverify::do_get_packet_offsets(&packet, 0);
@ -961,7 +947,7 @@ mod tests {
}; };
let mut tx = Transaction::new_unsigned(message); let mut tx = Transaction::new_unsigned(message);
tx.signatures = vec![Signature::default()]; tx.signatures = vec![Signature::default()];
let packet = sigverify::make_packet_from_transaction(tx); let packet = Packet::from_data(None, tx).unwrap();
let res = sigverify::do_get_packet_offsets(&packet, 0); let res = sigverify::do_get_packet_offsets(&packet, 0);
assert_eq!(res, Err(PacketError::PayerNotWritable)); assert_eq!(res, Err(PacketError::PayerNotWritable));
@ -970,7 +956,7 @@ mod tests {
#[test] #[test]
fn test_unsupported_version() { fn test_unsupported_version() {
let tx = test_tx(); let tx = test_tx();
let mut packet = sigverify::make_packet_from_transaction(tx); let mut packet = Packet::from_data(None, tx).unwrap();
let res = sigverify::do_get_packet_offsets(&packet, 0); let res = sigverify::do_get_packet_offsets(&packet, 0);
@ -984,7 +970,7 @@ mod tests {
#[test] #[test]
fn test_versioned_message() { fn test_versioned_message() {
let tx = test_tx(); let tx = test_tx();
let mut packet = sigverify::make_packet_from_transaction(tx); let mut packet = Packet::from_data(None, tx).unwrap();
let mut legacy_offsets = sigverify::do_get_packet_offsets(&packet, 0).unwrap(); let mut legacy_offsets = sigverify::do_get_packet_offsets(&packet, 0).unwrap();
@ -1027,7 +1013,7 @@ mod tests {
// Just like get_packet_offsets, but not returning redundant information. // Just like get_packet_offsets, but not returning redundant information.
fn get_packet_offsets_from_tx(tx: Transaction, current_offset: u32) -> PacketOffsets { fn get_packet_offsets_from_tx(tx: Transaction, current_offset: u32) -> PacketOffsets {
let mut packet = sigverify::make_packet_from_transaction(tx); let mut packet = Packet::from_data(None, tx).unwrap();
let packet_offsets = let packet_offsets =
sigverify::get_packet_offsets(&mut packet, current_offset as usize, false); sigverify::get_packet_offsets(&mut packet, current_offset as usize, false);
PacketOffsets::new( PacketOffsets::new(
@ -1110,7 +1096,7 @@ mod tests {
fn test_verify_n(n: usize, modify_data: bool) { fn test_verify_n(n: usize, modify_data: bool) {
let tx = test_tx(); let tx = test_tx();
let mut packet = sigverify::make_packet_from_transaction(tx); let mut packet = Packet::from_data(None, tx).unwrap();
// jumble some data to test failure // jumble some data to test failure
if modify_data { if modify_data {
@ -1142,7 +1128,7 @@ mod tests {
let mut tx = test_tx(); let mut tx = test_tx();
// pretend malicious leader dropped a signature... // pretend malicious leader dropped a signature...
tx.signatures.pop(); tx.signatures.pop();
let packet = sigverify::make_packet_from_transaction(tx); let packet = Packet::from_data(None, tx).unwrap();
let mut batches = generate_packet_batches(&packet, 1, 1); let mut batches = generate_packet_batches(&packet, 1, 1);
@ -1174,7 +1160,7 @@ mod tests {
solana_logger::setup(); solana_logger::setup();
let tx = test_multisig_tx(); let tx = test_multisig_tx();
let mut packet = sigverify::make_packet_from_transaction(tx); let mut packet = Packet::from_data(None, tx).unwrap();
let n = 4; let n = 4;
let num_batches = 3; let num_batches = 3;
@ -1210,7 +1196,7 @@ mod tests {
solana_logger::setup(); solana_logger::setup();
let tx = test_multisig_tx(); let tx = test_multisig_tx();
let packet = sigverify::make_packet_from_transaction(tx); let packet = Packet::from_data(None, tx).unwrap();
let recycler = Recycler::default(); let recycler = Recycler::default();
let recycler_out = Recycler::default(); let recycler_out = Recycler::default();
@ -1354,7 +1340,7 @@ mod tests {
{ {
let mut tx = test_tx(); let mut tx = test_tx();
tx.message.instructions[0].data = vec![1, 2, 3]; tx.message.instructions[0].data = vec![1, 2, 3];
let mut packet = sigverify::make_packet_from_transaction(tx); let mut packet = Packet::from_data(None, tx).unwrap();
let packet_offsets = do_get_packet_offsets(&packet, 0).unwrap(); let packet_offsets = do_get_packet_offsets(&packet, 0).unwrap();
check_for_simple_vote_transaction(&mut packet, &packet_offsets, 0).ok(); check_for_simple_vote_transaction(&mut packet, &packet_offsets, 0).ok();
assert!(!packet.meta.is_simple_vote_tx()); assert!(!packet.meta.is_simple_vote_tx());
@ -1364,7 +1350,7 @@ mod tests {
{ {
let mut tx = new_test_vote_tx(&mut rng); let mut tx = new_test_vote_tx(&mut rng);
tx.message.instructions[0].data = vec![1, 2, 3]; tx.message.instructions[0].data = vec![1, 2, 3];
let mut packet = sigverify::make_packet_from_transaction(tx); let mut packet = Packet::from_data(None, tx).unwrap();
let packet_offsets = do_get_packet_offsets(&packet, 0).unwrap(); let packet_offsets = do_get_packet_offsets(&packet, 0).unwrap();
check_for_simple_vote_transaction(&mut packet, &packet_offsets, 0).ok(); check_for_simple_vote_transaction(&mut packet, &packet_offsets, 0).ok();
assert!(packet.meta.is_simple_vote_tx()); assert!(packet.meta.is_simple_vote_tx());
@ -1385,7 +1371,7 @@ mod tests {
CompiledInstruction::new(4, &(), vec![0, 2]), CompiledInstruction::new(4, &(), vec![0, 2]),
], ],
); );
let mut packet = sigverify::make_packet_from_transaction(tx); let mut packet = Packet::from_data(None, tx).unwrap();
let packet_offsets = do_get_packet_offsets(&packet, 0).unwrap(); let packet_offsets = do_get_packet_offsets(&packet, 0).unwrap();
check_for_simple_vote_transaction(&mut packet, &packet_offsets, 0).ok(); check_for_simple_vote_transaction(&mut packet, &packet_offsets, 0).ok();
assert!(!packet.meta.is_simple_vote_tx()); assert!(!packet.meta.is_simple_vote_tx());
@ -1401,11 +1387,9 @@ mod tests {
let mut batch = PacketBatch::default(); let mut batch = PacketBatch::default();
batch batch
.packets .packets
.push(sigverify::make_packet_from_transaction(test_tx())); .push(Packet::from_data(None, test_tx()).unwrap());
let tx = new_test_vote_tx(&mut rng); let tx = new_test_vote_tx(&mut rng);
batch batch.packets.push(Packet::from_data(None, tx).unwrap());
.packets
.push(sigverify::make_packet_from_transaction(tx));
batch batch
.packets .packets
.iter_mut() .iter_mut()