bench-tps: Transition to using spl-instruction-padding (solana-labs#2…

…8496) * bench-tps: Transition to using spl-instruction-padding * Use macros for conversions
tinydancer-io · Oct 26, 2022 · 9d7e999 · 9d7e999
1 parent 340d3b5
commit 9d7e999
Show file tree

Hide file tree

Showing 9 changed files with 138 additions and 131 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
@@ -37,6 +37,7 @@ solana-streamer = { path = "../streamer", version = "=1.15.0" }
 solana-thin-client = { path = "../thin-client", version = "=1.15.0" }
 solana-tpu-client = { path = "../tpu-client", version = "=1.15.0", default-features = false }
 solana-version = { path = "../version", version = "=1.15.0" }
+spl-instruction-padding = "0.1"
 thiserror = "1.0"
 
 [dev-dependencies]

diff --git a/bench-tps/src/bench.rs b/bench-tps/src/bench.rs
@@ -1,10 +1,10 @@
 use {
     crate::{
         bench_tps_client::*,
-        cli::Config,
-        inline_instruction_padding_program::{create_padded_instruction, InstructionPaddingConfig},
+        cli::{Config, InstructionPaddingConfig},
         perf_utils::{sample_txs, SampleStats},
         send_batch::*,
+        spl_convert::FromOtherSolana,
     },
     log::*,
     rand::distributions::{Distribution, Uniform},
@@ -25,6 +25,7 @@ use {
         timing::{duration_as_ms, duration_as_s, duration_as_us, timestamp},
         transaction::Transaction,
     },
+    spl_instruction_padding::instruction::wrap_instruction,
     std::{
         collections::{HashSet, VecDeque},
         process::exit,
@@ -552,13 +553,15 @@ fn transfer_with_compute_unit_price_and_padding(
     let from_pubkey = from_keypair.pubkey();
     let transfer_instruction = system_instruction::transfer(&from_pubkey, to, lamports);
     let instruction = if let Some(instruction_padding_config) = instruction_padding_config {
-        create_padded_instruction(
-            instruction_padding_config.program_id,
-            transfer_instruction,
-            vec![],
-            instruction_padding_config.data_size,
+        FromOtherSolana::from(
+            wrap_instruction(
+                FromOtherSolana::from(instruction_padding_config.program_id),
+                FromOtherSolana::from(transfer_instruction),
+                vec![],
+                instruction_padding_config.data_size,
+            )
+            .expect("Could not create padded instruction"),
         )
-        .expect("Could not create padded instruction")
     } else {
         transfer_instruction
     };
@@ -645,13 +648,15 @@ fn nonced_transfer_with_padding(
     let from_pubkey = from_keypair.pubkey();
     let transfer_instruction = system_instruction::transfer(&from_pubkey, to, lamports);
     let instruction = if let Some(instruction_padding_config) = instruction_padding_config {
-        create_padded_instruction(
-            instruction_padding_config.program_id,
-            transfer_instruction,
-            vec![],
-            instruction_padding_config.data_size,
+        FromOtherSolana::from(
+            wrap_instruction(
+                FromOtherSolana::from(instruction_padding_config.program_id),
+                FromOtherSolana::from(transfer_instruction),
+                vec![],
+                instruction_padding_config.data_size,
+            )
+            .expect("Could not create padded instruction"),
         )
-        .expect("Could not create padded instruction")
     } else {
         transfer_instruction
     };

diff --git a/bench-tps/src/cli.rs b/bench-tps/src/cli.rs
@@ -1,5 +1,5 @@
 use {
-    crate::inline_instruction_padding_program::{self, InstructionPaddingConfig},
+    crate::spl_convert::FromOtherSolana,
     clap::{crate_description, crate_name, App, Arg, ArgMatches},
     solana_clap_utils::input_validators::{is_url, is_url_or_moniker},
     solana_cli_config::{ConfigInput, CONFIG_FILE},
@@ -31,6 +31,11 @@ impl Default for ExternalClientType {
     }
 }
 
+pub struct InstructionPaddingConfig {
+    pub program_id: Pubkey,
+    pub data_size: u32,
+}
+
 /// Holds the configuration for a single run of the benchmark
 pub struct Config {
     pub entrypoint_addr: SocketAddr,
@@ -477,7 +482,7 @@ pub fn extract_args(matches: &ArgMatches) -> Config {
         let program_id = matches
             .value_of("instruction_padding_program_id")
             .map(|target_str| target_str.parse().unwrap())
-            .unwrap_or(inline_instruction_padding_program::ID);
+            .unwrap_or_else(|| FromOtherSolana::from(spl_instruction_padding::ID));
         args.instruction_padding_config = Some(InstructionPaddingConfig {
             program_id,
             data_size: data_size

diff --git a/bench-tps/src/inline_instruction_padding_program.rs b/bench-tps/src/inline_instruction_padding_program.rs
diff --git a/bench-tps/src/lib.rs b/bench-tps/src/lib.rs
@@ -2,7 +2,7 @@
 pub mod bench;
 pub mod bench_tps_client;
 pub mod cli;
-pub mod inline_instruction_padding_program;
 pub mod keypairs;
 mod perf_utils;
 pub mod send_batch;
+pub mod spl_convert;