From ebd676faaa7dad8d4f7fed44f10bb27c4761f78d Mon Sep 17 00:00:00 2001 From: Stephen Akridge Date: Wed, 9 Jan 2019 13:34:41 -0800 Subject: [PATCH] Rename Block to EntrySlice --- benches/db_ledger.rs | 4 +++- benches/ledger.rs | 2 +- src/bank.rs | 2 +- src/banking_stage.rs | 2 +- src/broadcast_service.rs | 2 +- src/db_ledger.rs | 2 +- src/db_window.rs | 2 +- src/erasure.rs | 2 +- src/ledger.rs | 6 +++--- src/mint.rs | 2 +- src/replay_stage.rs | 2 +- 11 files changed, 15 insertions(+), 13 deletions(-) diff --git a/benches/db_ledger.rs b/benches/db_ledger.rs index 1e55c543d4..814051c80a 100644 --- a/benches/db_ledger.rs +++ b/benches/db_ledger.rs @@ -6,7 +6,9 @@ extern crate test; use rand::seq::SliceRandom; use rand::{thread_rng, Rng}; use solana::db_ledger::DbLedger; -use solana::ledger::{get_tmp_ledger_path, make_large_test_entries, make_tiny_test_entries, Block}; +use solana::ledger::{ + get_tmp_ledger_path, make_large_test_entries, make_tiny_test_entries, EntrySlice, +}; use solana::packet::{Blob, BLOB_HEADER_SIZE}; use test::Bencher; diff --git a/benches/ledger.rs b/benches/ledger.rs index f6969acbc6..0ee30e1512 100644 --- a/benches/ledger.rs +++ b/benches/ledger.rs @@ -3,7 +3,7 @@ extern crate test; use solana::entry::reconstruct_entries_from_blobs; -use solana::ledger::{next_entries, Block}; +use solana::ledger::{next_entries, EntrySlice}; use solana_sdk::hash::{hash, Hash}; use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::system_transaction::SystemTransaction; diff --git a/src/bank.rs b/src/bank.rs index 86fb3c3183..03963d4e9e 100644 --- a/src/bank.rs +++ b/src/bank.rs @@ -9,7 +9,7 @@ use crate::counter::Counter; use crate::entry::Entry; use crate::jsonrpc_macros::pubsub::Sink; use crate::leader_scheduler::LeaderScheduler; -use crate::ledger::Block; +use crate::ledger::EntrySlice; use crate::mint::Mint; use crate::poh_recorder::PohRecorder; use crate::rpc::RpcSignatureStatus; diff --git a/src/banking_stage.rs b/src/banking_stage.rs index be66079f21..5cd10d0586 100644 --- a/src/banking_stage.rs +++ b/src/banking_stage.rs @@ -268,7 +268,7 @@ mod tests { use super::*; use crate::bank::Bank; use crate::banking_stage::BankingStageReturnType; - use crate::ledger::Block; + use crate::ledger::EntrySlice; use crate::mint::Mint; use crate::packet::to_packets; use solana_sdk::signature::{Keypair, KeypairUtil}; diff --git a/src/broadcast_service.rs b/src/broadcast_service.rs index 14f920e0c8..a3936a5f5c 100644 --- a/src/broadcast_service.rs +++ b/src/broadcast_service.rs @@ -8,7 +8,7 @@ use crate::entry::Entry; #[cfg(feature = "erasure")] use crate::erasure; use crate::leader_scheduler::LeaderScheduler; -use crate::ledger::Block; +use crate::ledger::EntrySlice; use crate::packet::{index_blobs, SharedBlob}; use crate::result::{Error, Result}; use crate::service::Service; diff --git a/src/db_ledger.rs b/src/db_ledger.rs index ab4f903170..2fa94b6f76 100644 --- a/src/db_ledger.rs +++ b/src/db_ledger.rs @@ -843,7 +843,7 @@ where #[cfg(test)] mod tests { use super::*; - use crate::ledger::{get_tmp_ledger_path, make_tiny_test_entries, Block}; + use crate::ledger::{get_tmp_ledger_path, make_tiny_test_entries, EntrySlice}; use crate::packet::index_blobs; #[test] diff --git a/src/db_window.rs b/src/db_window.rs index e2a2f16609..4610c483b4 100644 --- a/src/db_window.rs +++ b/src/db_window.rs @@ -301,7 +301,7 @@ mod test { use crate::erasure::test::{generate_db_ledger_from_window, setup_window_ledger}; #[cfg(all(feature = "erasure", test))] use crate::erasure::{NUM_CODING, NUM_DATA}; - use crate::ledger::{get_tmp_ledger_path, make_tiny_test_entries, Block}; + use crate::ledger::{get_tmp_ledger_path, make_tiny_test_entries, EntrySlice}; use crate::packet::{index_blobs, Blob, Packet, Packets, SharedBlob, PACKET_DATA_SIZE}; use crate::streamer::{receiver, responder, PacketReceiver}; use solana_sdk::signature::{Keypair, KeypairUtil}; diff --git a/src/erasure.rs b/src/erasure.rs index d19af3fcdf..ef6137267c 100644 --- a/src/erasure.rs +++ b/src/erasure.rs @@ -549,7 +549,7 @@ fn categorize_blob( pub mod test { use super::*; use crate::db_ledger::{DbLedger, DEFAULT_SLOT_HEIGHT}; - use crate::ledger::{get_tmp_ledger_path, make_tiny_test_entries, Block}; + use crate::ledger::{get_tmp_ledger_path, make_tiny_test_entries, EntrySlice}; use crate::packet::{index_blobs, SharedBlob, BLOB_DATA_SIZE, BLOB_SIZE}; use crate::window::WindowSlot; diff --git a/src/ledger.rs b/src/ledger.rs index 852f77a8f7..81c40fec0a 100644 --- a/src/ledger.rs +++ b/src/ledger.rs @@ -18,8 +18,8 @@ use solana_sdk::vote_program::Vote; use solana_sdk::vote_transaction::VoteTransaction; use std::fs::remove_dir_all; -// a Block is a slice of Entries -pub trait Block { +// an EntrySlice is a slice of Entries +pub trait EntrySlice { /// Verifies the hashes and counts of a slice of transactions are all consistent. fn verify(&self, start_hash: &Hash) -> bool; fn to_shared_blobs(&self) -> Vec; @@ -27,7 +27,7 @@ pub trait Block { fn votes(&self) -> Vec<(Pubkey, Vote, Hash)>; } -impl Block for [Entry] { +impl EntrySlice for [Entry] { fn verify(&self, start_hash: &Hash) -> bool { let genesis = [Entry { tick_height: 0, diff --git a/src/mint.rs b/src/mint.rs index 6f182585d0..04f9aea577 100644 --- a/src/mint.rs +++ b/src/mint.rs @@ -103,7 +103,7 @@ impl Mint { #[cfg(test)] mod tests { use super::*; - use crate::ledger::Block; + use crate::ledger::EntrySlice; use bincode::deserialize; use solana_sdk::system_instruction::SystemInstruction; use solana_sdk::system_program; diff --git a/src/replay_stage.rs b/src/replay_stage.rs index 97610dd7b3..ae71e2a708 100644 --- a/src/replay_stage.rs +++ b/src/replay_stage.rs @@ -6,7 +6,7 @@ use crate::counter::Counter; use crate::entry::{EntryReceiver, EntrySender}; use solana_sdk::hash::Hash; -use crate::ledger::Block; +use crate::ledger::EntrySlice; use crate::packet::BlobError; use crate::result::{Error, Result}; use crate::rpc_request::RpcClient;