forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 23:26:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

dont return a pointer from LastStateSyncTime

Browse source
This commit is contained in:
atvanguard 2020-05-19 21:42:32 +05:30
parent 89248d7116
commit 3236e423d2
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
consensus/bor/bor.go
View file

@ -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) {

11
consensus/bor/genesis_contracts_client.go
View file

@ -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) {