gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup (#7176)

Browse Source 
* Drop serde error instances

These were no longer needed after ToPrimitive instances were
added.

* Rename last of _api crates
This commit is contained in:
Greg Fitzgerald
2019-11-29 13:50:32 -07:00
committed by GitHub
parent f4229a5d3e
commit 92d485dd4d
24 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bench-tps/Cargo.toml
View File

@@ -21,7 +21,7 @@ solana-core = { path = "../core", version = "0.22.0" }
solana-genesis = { path = "../genesis", version = "0.22.0" }
solana-client = { path = "../client", version = "0.22.0" }
solana-drone = { path = "../drone", version = "0.22.0" }
solana-librapay-api = { path = "../programs/librapay_api", version = "0.22.0", optional = true }
solana-librapay = { path = "../programs/librapay", version = "0.22.0", optional = true }
solana-logger = { path = "../logger", version = "0.22.0" }
solana-metrics = { path = "../metrics", version = "0.22.0" }
solana-measure = { path = "../measure", version = "0.22.0" }
@@ -36,4 +36,4 @@ serial_test_derive = "0.3.1"
solana-local-cluster = { path = "../local-cluster", version = "0.22.0" }
[features]
move = ["solana-librapay-api", "solana-move-loader-program"]
move = ["solana-librapay", "solana-move-loader-program"]

4
bench-tps/src/bench.rs
View File

@@ -5,7 +5,7 @@ use solana_client::perf_utils::{sample_txs, SampleStats};
use solana_core::gen_keys::GenKeys;
use solana_drone::drone::request_airdrop_transaction;
#[cfg(feature = "move")]
use solana_librapay_api::{create_genesis, upload_mint_script, upload_payment_script};
use solana_librapay::{create_genesis, upload_mint_script, upload_payment_script};
use solana_measure::measure::Measure;
use solana_metrics::{self, datapoint_debug};
use solana_sdk::{
@@ -37,7 +37,7 @@ const MAX_TX_QUEUE_AGE: u64 =
MAX_PROCESSING_AGE as u64 * DEFAULT_TICKS_PER_SLOT / DEFAULT_TICKS_PER_SECOND;
#[cfg(feature = "move")]
use solana_librapay_api::librapay_transaction;
use solana_librapay::librapay_transaction;
pub const MAX_SPENDS_PER_TX: u64 = 4;