fix TestEquivocation

config/config.go

@@ -70,7 +70,8 @@ func (cfg *Config) DataDir() string {
 }
 
 type TestConfig struct {
-	SmesherKey string `mapstructure:"testing-smesher-key"`
+	SmesherKey      string `mapstructure:"testing-smesher-key"`
+	MinerGoodAtxPct int
 }
 
 // BaseConfig defines the default configuration options for spacemesh app.

config/presets/fastnet.go

@@ -22,6 +22,8 @@ func fastnet() config.Config {
 	types.SetNetworkHRP(conf.NetworkHRP) // set to generate coinbase
 	conf.BaseConfig.OptFilterThreshold = 90
 
+	conf.BaseConfig.TestConfig.MinerGoodAtxPct = 50
+
 	conf.HARE.N = 800
 	conf.HARE.ExpectedLeaders = 10
 	conf.HARE.LimitConcurrent = 5

miner/oracle.go

@@ -180,7 +180,7 @@ func (o *Oracle) activeSet(targetEpoch types.EpochID) (uint64, uint64, types.ATX
 
 	if total := numOmitted + len(atxids); total == 0 {
 		return 0, 0, types.EmptyATXID, nil, errEmptyActiveSet
-	} else if numOmitted*100/total > 100-o.cfg.syncedPct {
+	} else if numOmitted*100/total > 100-o.cfg.goodAtxPct {
 		// if the node is not synced during `targetEpoch-1`, it doesn't have the correct receipt timestamp
 		// for all the atx and malfeasance proof. this active set is not usable.
 		// TODO: change after timing info of ATXs and malfeasance proofs is sync'ed from peers as well
@@ -198,6 +198,7 @@ func (o *Oracle) activeSet(targetEpoch types.EpochID) (uint64, uint64, types.ATX
 		o.log.With().Info("active set selected for proposal",
 			log.Int("num atx", len(atxids)),
 			log.Int("num omitted", numOmitted),
+			log.Int("min atx good pct", o.cfg.goodAtxPct),
 		)
 	}
 	return ownWeight, totalWeight, ownAtx, atxids, nil

miner/oracle_test.go

@@ -375,7 +375,7 @@ func TestOracle_NewNode(t *testing.T) {
 			avgLayerSize := uint32(10)
 			lyrsPerEpoch := uint32(20)
 			o := createTestOracle(t, avgLayerSize, lyrsPerEpoch, 0)
-			o.cfg.syncedPct = 90
+			o.cfg.goodAtxPct = 90
 			lid := types.LayerID(lyrsPerEpoch * 3)
 			o.mClock.EXPECT().LayerToTime(gomock.Any()).Return(time.Now())
 			common := types.RandomActiveSet(100)

miner/proposal_builder.go

@@ -69,7 +69,7 @@ type config struct {
 	networkDelay       time.Duration
 
 	// used to determine whether a node has enough information on the active set this epoch
-	syncedPct int
+	goodAtxPct int
 }
 
 type defaultFetcher struct {
@@ -133,6 +133,12 @@ func WithNetworkDelay(delay time.Duration) Opt {
 	}
 }
 
+func WithMinGoodAtxPct(pct int) Opt {
+	return func(pb *ProposalBuilder) {
+		pb.cfg.goodAtxPct = pct
+	}
+}
+
 func withOracle(o proposalOracle) Opt {
 	return func(pb *ProposalBuilder) {
 		pb.proposalOracle = o
@@ -176,7 +182,6 @@ func NewProposalBuilder(
 	for _, opt := range opts {
 		opt(pb)
 	}
-	pb.cfg.syncedPct = 90
 	if pb.proposalOracle == nil {
 		pb.proposalOracle = newMinerOracle(pb.cfg, clock, cdb, vrfSigner, syncer, pb.logger)
 	}

node/node.go

@@ -763,6 +763,11 @@ func (app *App) initServices(ctx context.Context) error {
 		app.addLogger(HareLogger, lg),
 	)
 
+	minerGoodAtxPct := 90
+	if app.Config.TestConfig.MinerGoodAtxPct > 0 {
+		// only set this for systest TestEquivocation.
+		minerGoodAtxPct = app.Config.TestConfig.MinerGoodAtxPct
+	}
 	proposalBuilder := miner.NewProposalBuilder(
 		ctx,
 		app.clock,
@@ -780,6 +785,7 @@ func (app *App) initServices(ctx context.Context) error {
 		miner.WithMinimalActiveSetWeight(app.Config.Tortoise.MinimalActiveSetWeight),
 		miner.WithHdist(app.Config.Tortoise.Hdist),
 		miner.WithNetworkDelay(app.Config.HARE.WakeupDelta),
+		miner.WithMinGoodAtxPct(minerGoodAtxPct),
 		miner.WithLogger(app.addLogger(ProposalBuilderLogger, lg)),
 	)