fix: conflict

Author: simlecode

miner/multiminer.go

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

node/modules/slashfilter/local.go

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