Skip to content

Commit b0235fb

Browse files
committed
fix
1 parent 3261d6a commit b0235fb

2 files changed

Lines changed: 0 additions & 39 deletions

File tree

epochStart/shardchain/trigger.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,10 +1349,6 @@ func (t *trigger) handleWatchdogTimeout() {
13491349
return
13501350
}
13511351

1352-
if !t.enableEpochsHandler.IsFlagEnabledInEpoch(common.AndromedaFlag, epoch) {
1353-
return
1354-
}
1355-
13561352
log.Debug("watchdog: no metablock received for too long, requesting epoch start metablock",
13571353
"current epoch", epoch,
13581354
"requesting epoch", epoch+1,

epochStart/shardchain/trigger_test.go

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,41 +1183,6 @@ func TestTrigger_WatchdogRequestEpochStartMetaBlock(t *testing.T) {
11831183
require.Equal(t, int32(0), called.Load())
11841184
})
11851185

1186-
t.Run("skips when Andromeda disabled", func(t *testing.T) {
1187-
t.Parallel()
1188-
1189-
var called atomic.Int32
1190-
args := createMockShardEpochStartTriggerArguments()
1191-
args.RoundHandler = &mock.RoundHandlerStub{
1192-
TimeDurationCalled: func() time.Duration {
1193-
return 10 * time.Millisecond
1194-
},
1195-
IndexCalled: func() int64 {
1196-
return 100
1197-
},
1198-
}
1199-
args.RequestHandler = &testscommon.RequestHandlerStub{
1200-
RequestStartOfEpochMetaBlockCalled: func(epoch uint32) {
1201-
called.Add(1)
1202-
},
1203-
}
1204-
args.EnableEpochsHandler = &enableEpochsHandlerMock.EnableEpochsHandlerStub{
1205-
IsFlagEnabledInEpochCalled: func(flag core.EnableEpochFlag, epoch uint32) bool {
1206-
return false
1207-
},
1208-
}
1209-
1210-
et, err := NewEpochStartTrigger(args)
1211-
require.Nil(t, err)
1212-
defer func() {
1213-
_ = et.Close()
1214-
}()
1215-
1216-
time.Sleep(200 * time.Millisecond)
1217-
1218-
require.Equal(t, int32(0), called.Load())
1219-
})
1220-
12211186
t.Run("stops on context cancellation", func(t *testing.T) {
12221187
t.Parallel()
12231188

0 commit comments

Comments
 (0)