Revert "Upgrade in-tree tokio 0.2 usage to tokio 0.3"

This reverts commit 444ed768dc.
This commit is contained in:
Michael Vines
2020-12-30 20:55:41 -08:00
committed by mergify[bot]
parent 2d8dacb72b
commit 3d077fb656
9 changed files with 75 additions and 60 deletions

View File

@@ -5,7 +5,7 @@ use std::{
sync::{Arc, RwLock},
thread::{self, Builder, JoinHandle},
};
use tokio::runtime::Runtime;
use tokio::runtime;
// Delay uploading the largest confirmed root for this many slots. This is done in an attempt to
// ensure that the `CacheBlockTimeService` has had enough time to add the block time for the root
@@ -21,7 +21,7 @@ pub struct BigTableUploadService {
impl BigTableUploadService {
pub fn new(
runtime: Arc<Runtime>,
runtime_handle: runtime::Handle,
bigtable_ledger_storage: solana_storage_bigtable::LedgerStorage,
blockstore: Arc<Blockstore>,
block_commitment_cache: Arc<RwLock<BlockCommitmentCache>>,
@@ -32,7 +32,7 @@ impl BigTableUploadService {
.name("bigtable-upload".to_string())
.spawn(move || {
Self::run(
runtime,
runtime_handle,
bigtable_ledger_storage,
blockstore,
block_commitment_cache,
@@ -45,7 +45,7 @@ impl BigTableUploadService {
}
fn run(
runtime: Arc<Runtime>,
runtime: runtime::Handle,
bigtable_ledger_storage: solana_storage_bigtable::LedgerStorage,
blockstore: Arc<Blockstore>,
block_commitment_cache: Arc<RwLock<BlockCommitmentCache>>,