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

More test fixing

Browse Source
This commit is contained in:
Łukasz Magiera 2020-07-14 22:30:21 +02:00
parent 59e5144122
commit bbfa66636d
5 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/apistruct/struct.go
View File

@ -132,7 +132,7 @@ type FullNodeStruct struct {
StateMinerPower func(context.Context, address.Address, types.TipSetKey) (*api.MinerPower, error) `perm:"read"` StateMinerPower func(context.Context, address.Address, types.TipSetKey) (*api.MinerPower, error) `perm:"read"`
StateMinerInfo func(context.Context, address.Address, types.TipSetKey) (api.MinerInfo, error) `perm:"read"` StateMinerInfo func(context.Context, address.Address, types.TipSetKey) (api.MinerInfo, error) `perm:"read"`
StateMinerDeadlines func(context.Context, address.Address, types.TipSetKey) ([]*miner.Deadline, error) `perm:"read"` StateMinerDeadlines func(context.Context, address.Address, types.TipSetKey) ([]*miner.Deadline, error) `perm:"read"`
StateMinerPartitions func(context.Context, address.Address, uint64, types.TipSetKey) ([]*miner.Partition, error) StateMinerPartitions func(context.Context, address.Address, uint64, types.TipSetKey) ([]*miner.Partition, error) `perm:"read"`
StateMinerFaults func(context.Context, address.Address, types.TipSetKey) (*abi.BitField, error) `perm:"read"` StateMinerFaults func(context.Context, address.Address, types.TipSetKey) (*abi.BitField, error) `perm:"read"`
StateAllMinerFaults func(context.Context, abi.ChainEpoch, types.TipSetKey) ([]*api.Fault, error) `perm:"read"` StateAllMinerFaults func(context.Context, abi.ChainEpoch, types.TipSetKey) ([]*api.Fault, error) `perm:"read"`
StateMinerRecoveries func(context.Context, address.Address, types.TipSetKey) (*abi.BitField, error) `perm:"read"` StateMinerRecoveries func(context.Context, address.Address, types.TipSetKey) (*abi.BitField, error) `perm:"read"`

11
chain/events/state/predicates_test.go
View File

@ -436,7 +436,16 @@ func createEmptyMinerState(ctx context.Context, t *testing.T, store *cbornode.Ba
emptyMap, err := store.Put(context.TODO(), hamt.NewNode(store, hamt.UseTreeBitWidth(5))) emptyMap, err := store.Put(context.TODO(), hamt.NewNode(store, hamt.UseTreeBitWidth(5)))
require.NoError(t, err) require.NoError(t, err)
emptyDeadlines := miner.ConstructDeadlines() emptyDeadline, err := store.Put(context.TODO(), &miner.Deadline{
Partitions: emptyArrayCid,
ExpirationsEpochs: emptyArrayCid,
PostSubmissions: abi.NewBitField(),
EarlyTerminations: abi.NewBitField(),
LiveSectors: 0,
})
require.NoError(t, err)
emptyDeadlines := miner.ConstructDeadlines(emptyDeadline)
emptyDeadlinesCid, err := store.Put(context.Background(), emptyDeadlines) emptyDeadlinesCid, err := store.Put(context.Background(), emptyDeadlines)
require.NoError(t, err) require.NoError(t, err)

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

@ -644,6 +644,8 @@ func (st *storage) storeMiners(minerTips map[types.TipSetKey][]*minerStateInfo)
pid = peerid.String() pid = peerid.String()
} }
} }
panic("TODO")
if _, err := stmt.Exec( if _, err := stmt.Exec(
miner.addr.String(), miner.addr.String(),
miner.info.Owner.String(), miner.info.Owner.String(),
@ -652,7 +654,7 @@ func (st *storage) storeMiners(minerTips map[types.TipSetKey][]*minerStateInfo)
miner.info.SectorSize.ShortString(), miner.info.SectorSize.ShortString(),
miner.state.PreCommitDeposits.String(), miner.state.PreCommitDeposits.String(),
miner.state.LockedFunds.String(), miner.state.LockedFunds.String(),
miner.state.NextDeadlineToProcessFaults, 0, //miner.state.NextDeadlineToProcessFaults,
); err != nil { ); err != nil {
log.Errorw("failed to store miner state", "state", miner.state, "info", miner.info, "error", err) log.Errorw("failed to store miner state", "state", miner.state, "info", miner.info, "error", err)
return err return err

3
cmd/lotus-chainwatch/sync.go
View File

@ -375,7 +375,8 @@ func syncHead(ctx context.Context, api api.FullNode, st *storage, headTs *types.
return return
} }
rewardInfo.baselinePower = rewardActorState.BaselinePower panic("TODO")
//rewardInfo.baselinePower = rewardActorState.BaselinePower
}) })
log.Infow("Completed Reward Processing", "duration", time.Since(rewardProcessingStartedAt).String(), "processed", len(rewardTips)) log.Infow("Completed Reward Processing", "duration", time.Since(rewardProcessingStartedAt).String(), "processed", len(rewardTips))

2
cmd/lotus-storage-miner/proving.go
View File

@ -302,7 +302,7 @@ var provingDeadlinesCmd = &cli.Command{
if di.Index == uint64(dlIdx) { if di.Index == uint64(dlIdx) {
cur += "\t(current)" cur += "\t(current)"
} }
_, _ = fmt.Fprintf(tw, "%d\t%d\t%d\t%d%s\n", dlIdx, len(partitions), provenPartitions) _, _ = fmt.Fprintf(tw, "%d\t%d\t%d%s\n", dlIdx, len(partitions), provenPartitions, cur)
} }
return tw.Flush() return tw.Flush()