Skip to content

Commit

Permalink
fix proposer test by fixing them to post-fork
Browse files Browse the repository at this point in the history
  • Loading branch information
y0sher committed Aug 11, 2024
1 parent 12b3d12 commit fb976c5
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions operator/duties/proposer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (

spectypes "github.com/ssvlabs/ssv-spec/types"

"github.com/ssvlabs/ssv/beacon/goclient"
"github.com/ssvlabs/ssv/operator/duties/dutystore"
"github.com/ssvlabs/ssv/protocol/v2/types"
)
Expand Down Expand Up @@ -70,7 +69,7 @@ func TestScheduler_Proposer_Same_Slot(t *testing.T) {
dutiesMap = hashmap.New[phase0.Epoch, []*eth2apiv1.ProposerDuty]()
)
currentSlot.Set(phase0.Slot(0))
scheduler, logger, ticker, timeout, cancel, schedulerPool, startFn := setupSchedulerAndMocks(t, []dutyHandler{handler}, currentSlot, goclient.FarFutureEpoch)
scheduler, logger, ticker, timeout, cancel, schedulerPool, startFn := setupSchedulerAndMocks(t, []dutyHandler{handler}, currentSlot, 0)
fetchDutiesCall, executeDutiesCall := setupProposerDutiesMock(scheduler, dutiesMap)
startFn()

Expand Down Expand Up @@ -103,7 +102,7 @@ func TestScheduler_Proposer_Diff_Slots(t *testing.T) {
dutiesMap = hashmap.New[phase0.Epoch, []*eth2apiv1.ProposerDuty]()
)
currentSlot.Set(phase0.Slot(0))
scheduler, logger, ticker, timeout, cancel, schedulerPool, startFn := setupSchedulerAndMocks(t, []dutyHandler{handler}, currentSlot, goclient.FarFutureEpoch)
scheduler, logger, ticker, timeout, cancel, schedulerPool, startFn := setupSchedulerAndMocks(t, []dutyHandler{handler}, currentSlot, 0)
fetchDutiesCall, executeDutiesCall := setupProposerDutiesMock(scheduler, dutiesMap)
startFn()

Expand Down Expand Up @@ -146,7 +145,7 @@ func TestScheduler_Proposer_Indices_Changed(t *testing.T) {
dutiesMap = hashmap.New[phase0.Epoch, []*eth2apiv1.ProposerDuty]()
)
currentSlot.Set(phase0.Slot(0))
scheduler, logger, ticker, timeout, cancel, schedulerPool, startFn := setupSchedulerAndMocks(t, []dutyHandler{handler}, currentSlot, goclient.FarFutureEpoch)
scheduler, logger, ticker, timeout, cancel, schedulerPool, startFn := setupSchedulerAndMocks(t, []dutyHandler{handler}, currentSlot, 0)
fetchDutiesCall, executeDutiesCall := setupProposerDutiesMock(scheduler, dutiesMap)
startFn()

Expand Down Expand Up @@ -209,7 +208,7 @@ func TestScheduler_Proposer_Multiple_Indices_Changed_Same_Slot(t *testing.T) {
dutiesMap = hashmap.New[phase0.Epoch, []*eth2apiv1.ProposerDuty]()
)
currentSlot.Set(phase0.Slot(0))
scheduler, logger, ticker, timeout, cancel, schedulerPool, startFn := setupSchedulerAndMocks(t, []dutyHandler{handler}, currentSlot, goclient.FarFutureEpoch)
scheduler, logger, ticker, timeout, cancel, schedulerPool, startFn := setupSchedulerAndMocks(t, []dutyHandler{handler}, currentSlot, 0)
fetchDutiesCall, executeDutiesCall := setupProposerDutiesMock(scheduler, dutiesMap)
startFn()

Expand Down Expand Up @@ -290,7 +289,7 @@ func TestScheduler_Proposer_Reorg_Current(t *testing.T) {
dutiesMap = hashmap.New[phase0.Epoch, []*eth2apiv1.ProposerDuty]()
)
currentSlot.Set(phase0.Slot(34))
scheduler, logger, ticker, timeout, cancel, schedulerPool, startFn := setupSchedulerAndMocks(t, []dutyHandler{handler}, currentSlot, goclient.FarFutureEpoch)
scheduler, logger, ticker, timeout, cancel, schedulerPool, startFn := setupSchedulerAndMocks(t, []dutyHandler{handler}, currentSlot, 0)
fetchDutiesCall, executeDutiesCall := setupProposerDutiesMock(scheduler, dutiesMap)
startFn()

Expand Down Expand Up @@ -366,7 +365,7 @@ func TestScheduler_Proposer_Reorg_Current_Indices_Changed(t *testing.T) {
dutiesMap = hashmap.New[phase0.Epoch, []*eth2apiv1.ProposerDuty]()
)
currentSlot.Set(phase0.Slot(34))
scheduler, logger, ticker, timeout, cancel, schedulerPool, startFn := setupSchedulerAndMocks(t, []dutyHandler{handler}, currentSlot, goclient.FarFutureEpoch)
scheduler, logger, ticker, timeout, cancel, schedulerPool, startFn := setupSchedulerAndMocks(t, []dutyHandler{handler}, currentSlot, 0)
fetchDutiesCall, executeDutiesCall := setupProposerDutiesMock(scheduler, dutiesMap)
startFn()

Expand Down

0 comments on commit fb976c5

Please sign in to comment.