fixes after rebase
This commit is contained in:
parent
b609d4d6c2
commit
8c6cd1e66e
@ -628,7 +628,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
|
||||||
@ -648,7 +648,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 {
|
||||||
|
@ -395,7 +395,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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user