From 6f5e0cd1612f10fd4b81bfbb46e5247ff47b563e Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Thu, 23 Jan 2020 10:20:34 -0700
Subject: [PATCH] Type grooming

---
 core/src/snapshot_packager_service.rs | 29 +++++++++++++++++----------
 core/tests/bank_forks.rs              |  5 ++---
 ledger-tool/src/main.rs               |  4 +---
 ledger/src/snapshot_package.rs        | 10 ++++-----
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/core/src/snapshot_packager_service.rs b/core/src/snapshot_packager_service.rs
index aa5f5a76ab..8546a815a2 100644
--- a/core/src/snapshot_packager_service.rs
+++ b/core/src/snapshot_packager_service.rs
@@ -1,16 +1,23 @@
-use solana_ledger::snapshot_package::{SnapshotPackage, SnapshotPackageReceiver};
-use solana_ledger::snapshot_utils::{
-    serialize_status_cache, SnapshotError, TAR_ACCOUNTS_DIR, TAR_SNAPSHOTS_DIR, TAR_VERSION_FILE,
+use solana_ledger::{
+    snapshot_package::{SnapshotPackage, SnapshotPackageReceiver},
+    snapshot_utils::{
+        serialize_status_cache, SnapshotError, TAR_ACCOUNTS_DIR, TAR_SNAPSHOTS_DIR,
+        TAR_VERSION_FILE,
+    },
 };
 use solana_measure::measure::Measure;
 use solana_metrics::datapoint_info;
-use std::fs;
-use std::process::ExitStatus;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::mpsc::RecvTimeoutError;
-use std::sync::Arc;
-use std::thread::{self, Builder, JoinHandle};
-use std::time::Duration;
+use std::{
+    fs,
+    process::ExitStatus,
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        mpsc::RecvTimeoutError,
+        Arc,
+    },
+    thread::{self, Builder, JoinHandle},
+    time::Duration,
+};
 use symlink;
 use tempfile::TempDir;
 use thiserror::Error;
@@ -284,7 +291,7 @@ mod tests {
         // before we compare, stick an empty status_cache in this dir so that the package comparision works
         // This is needed since the status_cache is added by the packager and is not collected from
         // the source dir for snapshots
-        let dummy_slot_deltas: Vec<SlotDelta<TransactionResult<()>>> = vec![];
+        let dummy_slot_deltas: Vec<SlotDelta<transaction::Result<()>>> = vec![];
         snapshot_utils::serialize_snapshot_data_file(
             &snapshots_dir.join(SNAPSHOT_STATUS_CACHE_FILE_NAME),
             MAX_SNAPSHOT_DATA_FILE_SIZE,
diff --git a/core/tests/bank_forks.rs b/core/tests/bank_forks.rs
index e96d9ff8ba..da301a6fa5 100644
--- a/core/tests/bank_forks.rs
+++ b/core/tests/bank_forks.rs
@@ -22,8 +22,7 @@ mod tests {
         hash::hashv,
         pubkey::Pubkey,
         signature::{Keypair, KeypairUtil},
-        system_transaction,
-        transaction::Result as TransactionResult,
+        system_transaction, transaction,
     };
     use std::{fs, path::PathBuf, sync::atomic::AtomicBool, sync::mpsc::channel, sync::Arc};
     use tempfile::TempDir;
@@ -310,7 +309,7 @@ mod tests {
         // before we compare, stick an empty status_cache in this dir so that the package comparision works
         // This is needed since the status_cache is added by the packager and is not collected from
         // the source dir for snapshots
-        let dummy_slot_deltas: Vec<SlotDelta<TransactionResult<()>>> = vec![];
+        let dummy_slot_deltas: Vec<SlotDelta<transaction::Result<()>>> = vec![];
         snapshot_utils::serialize_snapshot_data_file(
             &saved_snapshots_dir
                 .path()
diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs
index 1d4bd64866..96a05eb48b 100644
--- a/ledger-tool/src/main.rs
+++ b/ledger-tool/src/main.rs
@@ -3,13 +3,11 @@ use clap::{
 };
 use histogram;
 use serde_json::json;
-use solana_ledger::blockstore_db::Database;
 use solana_ledger::{
     bank_forks::{BankForks, SnapshotConfig},
     bank_forks_utils,
     blockstore::Blockstore,
-    blockstore_db,
-    blockstore_db::Column,
+    blockstore_db::{self, Column, Database},
     blockstore_processor,
     rooted_slot_iterator::RootedSlotIterator,
 };
diff --git a/ledger/src/snapshot_package.rs b/ledger/src/snapshot_package.rs
index 212393f120..3c1598d757 100644
--- a/ledger/src/snapshot_package.rs
+++ b/ledger/src/snapshot_package.rs
@@ -1,6 +1,6 @@
 use solana_runtime::accounts_db::AccountStorageEntry;
 use solana_runtime::status_cache::SlotDelta;
-use solana_sdk::transaction::Result as TransactionResult;
+use solana_sdk::{clock::Slot, transaction};
 use std::path::PathBuf;
 use std::sync::mpsc::{Receiver, SendError, Sender};
 use std::sync::Arc;
@@ -12,8 +12,8 @@ pub type SnapshotPackageSendError = SendError<SnapshotPackage>;
 
 #[derive(Debug)]
 pub struct SnapshotPackage {
-    pub root: u64,
-    pub slot_deltas: Vec<SlotDelta<TransactionResult<()>>>,
+    pub root: Slot,
+    pub slot_deltas: Vec<SlotDelta<transaction::Result<()>>>,
     pub snapshot_links: TempDir,
     pub storage_entries: Vec<Arc<AccountStorageEntry>>,
     pub tar_output_file: PathBuf,
@@ -21,8 +21,8 @@ pub struct SnapshotPackage {
 
 impl SnapshotPackage {
     pub fn new(
-        root: u64,
-        slot_deltas: Vec<SlotDelta<TransactionResult<()>>>,
+        root: Slot,
+        slot_deltas: Vec<SlotDelta<transaction::Result<()>>>,
         snapshot_links: TempDir,
         storage_entries: Vec<Arc<AccountStorageEntry>>,
         tar_output_file: PathBuf,