cerc-io/go-ethereum
13
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Rebase missed these changes needed at 1.10.20

Browse Source
This commit is contained in:
Michael Shaw 2022-07-27 18:07:42 -04:00
parent 0f7b7099d8
commit 3e5f8e938e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
statediff/service.go
View File

@ -647,7 +647,7 @@ func (sds *Service) Unsubscribe(id rpc.ID) error {
// This function will check the status of geth syncing. // This function will check the status of geth syncing.
// It will return false if geth has finished syncing. // It will return false if geth has finished syncing.
// It will return a true Geth is still 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() syncStatus, err := pubEthAPI.Syncing()
if err != nil { if err != nil {
return true, err return true, err
@ -667,7 +667,7 @@ func (sds *Service) WaitingForSync() error {
// Has the geth node synced to head? // Has the geth node synced to head?
Synced := false Synced := false
pubEthAPI := ethapi.NewPublicEthereumAPI(sds.BackendAPI) pubEthAPI := ethapi.NewEthereumAPI(sds.BackendAPI)
for !Synced { for !Synced {
syncStatus, err := sds.GetSyncStatus(pubEthAPI) syncStatus, err := sds.GetSyncStatus(pubEthAPI)
if err != nil { if err != nil {

2
statediff/service_test.go
View File

@ -396,7 +396,7 @@ func testGetSyncStatus(t *testing.T) {
// Update the backend current block value // Update the backend current block value
t.Log("Updating Current Block to: ", table.currentBlock) t.Log("Updating Current Block to: ", table.currentBlock)
backend.CurrBlock = table.currentBlock backend.CurrBlock = table.currentBlock
pubEthAPI := ethapi.NewPublicEthereumAPI(service.BackendAPI) pubEthAPI := ethapi.NewEthereumAPI(service.BackendAPI)
syncStatus, err := service.GetSyncStatus(pubEthAPI) syncStatus, err := service.GetSyncStatus(pubEthAPI)
if err != nil { if err != nil {