From 3e5f8e938e6ae083891c714b9cda557bf69f3bd1 Mon Sep 17 00:00:00 2001
From: Michael Shaw <michael@abastionofsanity.com>
Date: Wed, 27 Jul 2022 18:07:42 -0400
Subject: [PATCH] Rebase missed these changes needed at 1.10.20

---
 statediff/service.go      | 4 ++--
 statediff/service_test.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/statediff/service.go b/statediff/service.go
index 30d227f17..b73247647 100644
--- a/statediff/service.go
+++ b/statediff/service.go
@@ -647,7 +647,7 @@ func (sds *Service) Unsubscribe(id rpc.ID) error {
 // This function will check the status of geth syncing.
 // It will return false if geth has finished syncing.
 // It will return a true Geth is still syncing.
-func (sds *Service) GetSyncStatus(pubEthAPI *ethapi.PublicEthereumAPI) (bool, error) {
+func (sds *Service) GetSyncStatus(pubEthAPI *ethapi.EthereumAPI) (bool, error) {
 	syncStatus, err := pubEthAPI.Syncing()
 	if err != nil {
 		return true, err
@@ -667,7 +667,7 @@ func (sds *Service) WaitingForSync() error {
 
 	// Has the geth node synced to head?
 	Synced := false
-	pubEthAPI := ethapi.NewPublicEthereumAPI(sds.BackendAPI)
+	pubEthAPI := ethapi.NewEthereumAPI(sds.BackendAPI)
 	for !Synced {
 		syncStatus, err := sds.GetSyncStatus(pubEthAPI)
 		if err != nil {
diff --git a/statediff/service_test.go b/statediff/service_test.go
index ecf8bdadb..1df068608 100644
--- a/statediff/service_test.go
+++ b/statediff/service_test.go
@@ -396,7 +396,7 @@ func testGetSyncStatus(t *testing.T) {
 		// Update the backend current block value
 		t.Log("Updating Current Block to: ", table.currentBlock)
 		backend.CurrBlock = table.currentBlock
-		pubEthAPI := ethapi.NewPublicEthereumAPI(service.BackendAPI)
+		pubEthAPI := ethapi.NewEthereumAPI(service.BackendAPI)
 		syncStatus, err := service.GetSyncStatus(pubEthAPI)
 
 		if err != nil {