cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

chainwatch: Fix build

Browse Source
This commit is contained in:
Łukasz Magiera 2020-07-01 12:05:50 +02:00
parent 1761823efe
commit 131928ee53
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/lotus-chainwatch/storage.go
View File

@ -523,12 +523,12 @@ func (st *storage) storeSectors(minerTips map[types.TipSetKey][]*minerStateInfo,
if _, err := stmt.Exec( if _, err := stmt.Exec(
miner.addr.String(), miner.addr.String(),
uint64(sector.ID), uint64(sector.ID),
int64(sector.Info.ActivationEpoch), int64(sector.Info.Activation),
int64(sector.Info.Info.Expiration), int64(sector.Info.Expiration),
sector.Info.DealWeight.String(), sector.Info.DealWeight.String(),
sector.Info.VerifiedDealWeight.String(), sector.Info.VerifiedDealWeight.String(),
sector.Info.Info.SealedCID.String(), sector.Info.SealedCID.String(),
int64(sector.Info.Info.SealRandEpoch), 0, // TODO: Not there now?
); err != nil { ); err != nil {
return err return err
} }
@ -693,13 +693,13 @@ func (st *storage) updateMinerSectors(miners []*minerSectorUpdate, api api.FullN
var newSecInfo miner_spec.SectorOnChainInfo var newSecInfo miner_spec.SectorOnChainInfo
// if we cannot find an old sector in the new list then it was removed. // if we cannot find an old sector in the new list then it was removed.
if err := oldSectors.ForEach(&oldSecInfo, func(i int64) error { if err := oldSectors.ForEach(&oldSecInfo, func(i int64) error {
found, err := newSectors.Get(uint64(oldSecInfo.Info.SectorNumber), &newSecInfo) found, err := newSectors.Get(uint64(oldSecInfo.SectorNumber), &newSecInfo)
if err != nil { if err != nil {
log.Warnw("new sectors get", "error", err) log.Warnw("new sectors get", "error", err)
return err return err
} }
if !found { if !found {
log.Infow("MINER DELETED SECTOR", "miner", miner.minerState.addr.String(), "sector", oldSecInfo.Info.SectorNumber, "tipset", miner.tskey.String()) log.Infow("MINER DELETED SECTOR", "miner", miner.minerState.addr.String(), "sector", oldSecInfo.SectorNumber, "tipset", miner.tskey.String())
deletedSectors = append(deletedSectors, &deletedSector{ deletedSectors = append(deletedSectors, &deletedSector{
deletedSector: oldSecInfo, deletedSector: oldSecInfo,
miner: miner.minerState.addr, miner: miner.minerState.addr,
@ -731,14 +731,14 @@ func (st *storage) updateMinerSectors(miners []*minerSectorUpdate, api api.FullN
return err return err
} }
// TODO validate this shits right // TODO validate this shits right
if ts.Height() >= ds.deletedSector.Info.Expiration { if ts.Height() >= ds.deletedSector.Expiration {
// means it expired, do nothing // means it expired, do nothing
log.Infow("expired sector", "miner", ds.miner.String(), "sector", ds.deletedSector.Info.SectorNumber) log.Infow("expired sector", "miner", ds.miner.String(), "sector", ds.deletedSector.SectorNumber)
continue continue
} }
log.Infow("terminated sector", "miner", ds.miner.String(), "sector", ds.deletedSector.Info.SectorNumber) log.Infow("terminated sector", "miner", ds.miner.String(), "sector", ds.deletedSector.SectorNumber)
// means it was terminated. // means it was terminated.
if _, err := stmt.Exec(int64(ts.Height()), ds.miner.String(), int64(ds.deletedSector.Info.SectorNumber)); err != nil { if _, err := stmt.Exec(int64(ts.Height()), ds.miner.String(), int64(ds.deletedSector.SectorNumber)); err != nil {
return err return err
} }
} }