Skip to content

Commit

Permalink
fix: conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
simlecode committed Oct 23, 2023
1 parent 7effbb6 commit 84ea2e4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion miner/multiminer.go
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ func (m *Miner) broadCastBlock(ctx context.Context, base MiningBase, bm *sharedT

if !(errors.Is(err, slashfilter.ParentGrindingFaults) &&
os.Getenv("SOPHON_MINER_NO_SLASHFILTER") != "_yes_i_know_and_i_accept_that_may_loss_my_fil") {
if err = m.sf.PutBlock(ctx, bm.Header, base.TipSet.Height()+base.NullRounds, time.Time{}, slashfilter.Error); err != nil {
if err = m.sf.PutBlock(ctx, bm.Header, base.TipSet.Height()+base.NullRounds, time.Time{}, types.Error); err != nil {
log.Errorf("failed to put block: %s", err)
}

Expand Down
2 changes: 1 addition & 1 deletion node/modules/slashfilter/local.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func (f *localSlashFilter) ListBlock(ctx context.Context, params *types.BlocksQu
return nil, fmt.Errorf("you are using levelDB, List Block is not supported")
}

func checkFault(ctx context.Context, t datastore.Datastore, key datastore.Key, bh *vtypes.BlockHeader, faultType string) error {
func checkFault(ctx context.Context, t datastore.Datastore, key datastore.Key, bh *vtypes.BlockHeader, faultType error) error {
fault, err := t.Has(ctx, key)
if err != nil {
return err
Expand Down

0 comments on commit 84ea2e4

Please sign in to comment.