From 3236e423d2bad7883e6e1846df49be2a8e256efd Mon Sep 17 00:00:00 2001
From: atvanguard <93arpit@gmail.com>
Date: Tue, 19 May 2020 21:42:32 +0530
Subject: [PATCH] dont return a pointer from LastStateSyncTime
---
consensus/bor/bor.go | 2 +-
consensus/bor/genesis_contracts_client.go | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/consensus/bor/bor.go b/consensus/bor/bor.go
index 15c94e6d5..37ae73128 100644
--- a/consensus/bor/bor.go
+++ b/consensus/bor/bor.go
@@ -1085,7 +1085,7 @@ func (c *Bor) CommitStates(
return err
}
- from := *lastSync
+ from := lastSync
to := time.Unix(int64(chain.Chain.GetHeaderByNumber(number-c.config.Sprint).Time), 0)
lastStateID := _lastStateID.Uint64()
if !from.Before(to) {
diff --git a/consensus/bor/genesis_contracts_client.go b/consensus/bor/genesis_contracts_client.go
index 48c4bb5e6..fe995dfbf 100644
--- a/consensus/bor/genesis_contracts_client.go
+++ b/consensus/bor/genesis_contracts_client.go
@@ -76,12 +76,12 @@ func (gc *GenesisContractsClient) CommitState(
return nil
}
-func (gc *GenesisContractsClient) LastStateSyncTime(snapshotNumber uint64) (*time.Time, error) {
+func (gc *GenesisContractsClient) LastStateSyncTime(snapshotNumber uint64) (time.Time, error) {
method := "lastStateSyncTime"
data, err := gc.stateReceiverABI.Pack(method)
if err != nil {
log.Error("Unable to pack tx for getLastSyncTime", "error", err)
- return nil, err
+ return time.Time{}, err
}
msgData := (hexutil.Bytes)(data)
@@ -93,15 +93,14 @@ func (gc *GenesisContractsClient) LastStateSyncTime(snapshotNumber uint64) (*tim
Data: &msgData,
}, rpc.BlockNumber(snapshotNumber))
if err != nil {
- return nil, err
+ return time.Time{}, err
}
var ret = new(*big.Int)
if err := gc.stateReceiverABI.Unpack(ret, method, result); err != nil {
- return nil, err
+ return time.Time{}, err
}
- _time := time.Unix((*ret).Int64(), 0)
- return &_time, nil
+ return time.Unix((*ret).Int64(), 0), nil
}
func (gc *GenesisContractsClient) LastStateId(snapshotNumber uint64) (*big.Int, error) {
--
GitLab