From acfd72d7c49fccff135b8642895ff9cfdf0981d2 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 4 Sep 2020 18:49:48 +0000
Subject: [PATCH] Adapt to v1.2

---
 core/src/bigtable_upload_service.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/bigtable_upload_service.rs b/core/src/bigtable_upload_service.rs
index b8a445504b..74709ab508 100644
--- a/core/src/bigtable_upload_service.rs
+++ b/core/src/bigtable_upload_service.rs
@@ -1,5 +1,5 @@
+use crate::commitment::BlockCommitmentCache;
 use solana_ledger::blockstore::Blockstore;
-use solana_runtime::commitment::BlockCommitmentCache;
 use std::{
     sync::atomic::{AtomicBool, Ordering},
     sync::{Arc, RwLock},
@@ -49,12 +49,12 @@ impl BigTableUploadService {
                 break;
             }
 
-            let max_confirmed_root = block_commitment_cache
+            let largest_confirmed_root = block_commitment_cache
                 .read()
                 .unwrap()
-                .highest_confirmed_root();
+                .largest_confirmed_root();
 
-            if max_confirmed_root == starting_slot {
+            if largest_confirmed_root == starting_slot {
                 std::thread::sleep(std::time::Duration::from_secs(1));
                 continue;
             }
@@ -63,13 +63,13 @@ impl BigTableUploadService {
                 blockstore.clone(),
                 bigtable_ledger_storage.clone(),
                 starting_slot,
-                Some(max_confirmed_root),
+                Some(largest_confirmed_root),
                 true,
                 exit.clone(),
             ));
 
             match result {
-                Ok(()) => starting_slot = max_confirmed_root,
+                Ok(()) => starting_slot = largest_confirmed_root,
                 Err(err) => {
                     warn!("bigtable: upload_confirmed_blocks: {}", err);
                     std::thread::sleep(std::time::Duration::from_secs(2));