Skip to content

Commit

Permalink
Merge branch 'stage' into gm/adjust_duty_executer_to_genesis
Browse files Browse the repository at this point in the history
  • Loading branch information
@moshe-blox
moshe-blox committed Aug 11, 2024
2 parents ad457df + 6ec5987 commit 7e78fc6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
13 changes: 6 additions & 7 deletions operator/duties/proposer_test.go
View file
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
2 changes: 1 addition & 1 deletion scripts/spec-alignment/differ.config.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ApprovedChanges: ["50e5bb7eda99594e", "870a3a66aeccd737","4e22a08543b079b","56ceb03cd44ff702","188adfe8914e04c1","2438f9c5b82b69a3","1a716ee3bdb3170","90b166f78390af18","68219b82a1d9d829","c4c4caa5d0938b85","dfe99ce1d27b6cb1","35f5dab1f128d193","9a3973b64d7e8932","f33f07301a770d03","3e9e0dddfad3b302","d4fef6512374c1f5","b49f54cb45787e4b","59b2375130aef5df","f094cd0460432170","8e51881e527dd603","a7d6d58d9fa06379","1d124224ca4d0fe3","39ea06bfd1477d2d","7e2550bab51f22b2","87ebd29bd49fc52f","ef39dd5223e0d080","fe14e7f0503ea188","6146023d4d5708a2","aebb8e4348b6d667","973a2e6704dbf3","fb4cac598a68c592","257c7eb81d6eb245","2a8e94fe037e13fd","5e7eb878de54eec6","960a9c64cd4ec93c","57dfd255520bd849","ec333ff8a708db69","1cc1ff39ad91ee69","5714652b88e2d44f","7a53b3b037c56325","8c02ef1964464c30","19a268910a20da3d","af6e01ed565029f3","318b5169ac4dabb6","372c6b332e8ba699","c0d8a364c0db855a","4287381be4fb1841","b1614afc1da7794f","c214975412f3fd7","8bbf7eba3fa0cf7e","8e4ec8debe331b36","7a671d8fcefc3793","e2b0e9c6454c1c08","6707ecfefa5fec21","d5a7389d730464f1","8dfae3b3223d2de0","a81c092c985de728","968df5082c727ed6","9e53c73ee60b1cc2","9d265e99dd31d4f5","a34619e078d2e42f","17e8cec4f0625d53","e913f373aa88f333","cfc1e05c372d88dc","e5de6901d78b8833","57c1885b43dd8d19","e8a49856a5edd893","22ea21d10a2f861c","954e4fce01631c4e","108b9575f7c1d4bc","1f8d076449068f64","5a7ad98296703f6","159536003eeddac8","8ca8f82e67ddd3dd","16ebe47404323cc1","48bfe5cf1e578b47","dd83182b693a7216","308d21d9830f7047","6dde03147e012b1a","730c3e5e59393b7d","5b44a4b425ecc397","df5debc50ec8babc","92a41554b2910bb8","c36c680554dde59f","447feaa5cdc1a010","fda90c61f44cb149","cdbb4930eced584c","274336ec1127e6c0","2a496f5b3ad542d2","6b395912dde33b0e","cac56ec14994216b","8850900b5d9bcc65","15e7706486c6359e","cc22f28953b787ea","3bad6ae11596a574","8f84422a240d889c","5b265432dfbbaac7","43794bf5953db193","7975821460ebe1e7","173c505e12aabb8f","47ee0d148148a56f","8cc38593ebe049b6","bda3aec7157b095a","248712911696a851","f4d9c910f1dbaef7","1a2146fcad37acb8","b0b146f9bdab64b6","edfd442b4d725fbb","122f053573538a32","d720d714a20833e1"]
ApprovedChanges: ["50e5bb7eda99594e", "870a3a66aeccd737","4e22a08543b079b","56ceb03cd44ff702","188adfe8914e04c1","2438f9c5b82b69a3","1a716ee3bdb3170","90b166f78390af18","68219b82a1d9d829","c4c4caa5d0938b85","dfe99ce1d27b6cb1","35f5dab1f128d193","9a3973b64d7e8932","f33f07301a770d03","3e9e0dddfad3b302","d4fef6512374c1f5","b49f54cb45787e4b","59b2375130aef5df","f094cd0460432170","8e51881e527dd603","a7d6d58d9fa06379","1d124224ca4d0fe3","39ea06bfd1477d2d","7e2550bab51f22b2","87ebd29bd49fc52f","ef39dd5223e0d080","fe14e7f0503ea188","6146023d4d5708a2","aebb8e4348b6d667","973a2e6704dbf3","fb4cac598a68c592","257c7eb81d6eb245","2a8e94fe037e13fd","5e7eb878de54eec6","960a9c64cd4ec93c","57dfd255520bd849","ec333ff8a708db69","1cc1ff39ad91ee69","5714652b88e2d44f","7a53b3b037c56325","8c02ef1964464c30","19a268910a20da3d","af6e01ed565029f3","318b5169ac4dabb6","372c6b332e8ba699","c0d8a364c0db855a","4287381be4fb1841","b1614afc1da7794f","c214975412f3fd7","8bbf7eba3fa0cf7e","8e4ec8debe331b36","7a671d8fcefc3793","e2b0e9c6454c1c08","6707ecfefa5fec21","d5a7389d730464f1","8dfae3b3223d2de0","a81c092c985de728","968df5082c727ed6","9e53c73ee60b1cc2","9d265e99dd31d4f5","a34619e078d2e42f","17e8cec4f0625d53","e913f373aa88f333","cfc1e05c372d88dc","e5de6901d78b8833","57c1885b43dd8d19","e8a49856a5edd893","22ea21d10a2f861c","954e4fce01631c4e","108b9575f7c1d4bc","1f8d076449068f64","5a7ad98296703f6","159536003eeddac8","8ca8f82e67ddd3dd","16ebe47404323cc1","48bfe5cf1e578b47","dd83182b693a7216","308d21d9830f7047","6dde03147e012b1a","730c3e5e59393b7d","5b44a4b425ecc397","df5debc50ec8babc","92a41554b2910bb8","c36c680554dde59f","447feaa5cdc1a010","fda90c61f44cb149","cdbb4930eced584c","274336ec1127e6c0","2a496f5b3ad542d2","6b395912dde33b0e","cac56ec14994216b","8850900b5d9bcc65","15e7706486c6359e","cc22f28953b787ea","3bad6ae11596a574","8f84422a240d889c","5b265432dfbbaac7","43794bf5953db193","7975821460ebe1e7","173c505e12aabb8f","47ee0d148148a56f","8cc38593ebe049b6","bda3aec7157b095a","248712911696a851","f4d9c910f1dbaef7","1a2146fcad37acb8","b0b146f9bdab64b6","edfd442b4d725fbb","122f053573538a32","d720d714a20833e1", "717bef26105c733f","2f70630c27062353","2f70337ba7566a69","dd607a44e1341e6b","5210501625ac3de5","f786bf475b5085aa","18a66ed6e613d9c1","e8943e7741f6843d","276a489bd5a00032","ba3bba59f10bf6b","3c50ce0c8089d871","89ee72f6c610ab84","c92b95a85da2cb11","927ea6aed3f98f20","9338904026a0ce37","9683cfa19dc544a3","4d3fa2b8dfcb5f5b"]

IgnoredIdentifiers:
- logger
Expand Down
2 changes: 1 addition & 1 deletion scripts/spec-alignment/genesis_differ.config.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ApprovedChanges: ["52b93267ba812308","9f2881f9e89b4c3","f8718ef9598a2d28","ea4da0c78bc1e930","11481543a56b03e7","4bc55d173976f499","5a326429bd7d816a","57938492d36e5b72","ea83b3555f29e44e","39a395cc56c381d8","2092a46a009de5e9","f9e12bb821abda59","74490095cad1f871","fef6a577794897e9","e243efb1fef8baca","b612f4f4bee5726c","b4072ece06d92c84","487d349a6296651e","1329fd2f0f7101e5","6ea163caa000821c","cb2a3fac03c9f70d","c155c7005d298b8a","5462556ab33327ae","66591f5d3e9c299d","ef530512222fa3a3","54f7ee00c5223d56","136792991a713119","519dec1f394a29bb","c16537938b23bb1c","930f8003cc73658a","b4d4b7c288d15580","8e871e3dc302502c","264f6c3cb6c044e","73b442121276436f","a5d665260b9545e7","e76da25dcc1b8b7b","3021b027e65343dc","37abca362396de40","10331350bdd5cea5","ff66465e82a0bce","7008ba0e5fb3bc50","17d86fc521251084","60ee89aed3dca274","cfb5a31338393004","774c67a1117bb600","bbbac3fd539c9da","4120ef6224cd7653","c13c14ac8b912a99","e34eb83c1de17e7b","d60440779e512dda","8b474f07634c3b5b","ac42b9ed129f763c","67809ff9e1f78fba","436d37b16e59e851","d201c716184904d6","422221ab59ac4658","30ed9a822232b7e1","c08c6d84582b86c1","c07315929c5bfdae","751997d95ea9340","7715acc5b4c5aa2","14d6cdfdf92136fc","c9db895746d32d2","a0a0164bd2ecb327","c0cb3984d0a20d8","1c8beb7d60ffa18a","b44005e951042d3","45749213deaece88","6afb57c28a55854c","5619c6b724070584","81385e7b399b3235","856eb69df47300bc","68ab7316969c38b","c8f63fe574c9cd3","a1dd0a169df78d67","4bb11f08323af914","466839f492add207","6c3507bea504fcc","560bb093d1aea569","a13eb5088003f50b","9f5f0eff2dca5e9"]
ApprovedChanges: ["52b93267ba812308","9f2881f9e89b4c3","f8718ef9598a2d28","ea4da0c78bc1e930","11481543a56b03e7","4bc55d173976f499","5a326429bd7d816a","57938492d36e5b72","ea83b3555f29e44e","39a395cc56c381d8","2092a46a009de5e9","f9e12bb821abda59","74490095cad1f871","fef6a577794897e9","e243efb1fef8baca","b612f4f4bee5726c","b4072ece06d92c84","487d349a6296651e","1329fd2f0f7101e5","6ea163caa000821c","cb2a3fac03c9f70d","c155c7005d298b8a","5462556ab33327ae","66591f5d3e9c299d","ef530512222fa3a3","54f7ee00c5223d56","136792991a713119","519dec1f394a29bb","c16537938b23bb1c","930f8003cc73658a","b4d4b7c288d15580","8e871e3dc302502c","264f6c3cb6c044e","73b442121276436f","a5d665260b9545e7","e76da25dcc1b8b7b","3021b027e65343dc","37abca362396de40","10331350bdd5cea5","ff66465e82a0bce","7008ba0e5fb3bc50","17d86fc521251084","60ee89aed3dca274","cfb5a31338393004","774c67a1117bb600","bbbac3fd539c9da","4120ef6224cd7653","c13c14ac8b912a99","e34eb83c1de17e7b","d60440779e512dda","8b474f07634c3b5b","ac42b9ed129f763c","67809ff9e1f78fba","436d37b16e59e851","d201c716184904d6","422221ab59ac4658","30ed9a822232b7e1","c08c6d84582b86c1","c07315929c5bfdae","751997d95ea9340","7715acc5b4c5aa2","14d6cdfdf92136fc","c9db895746d32d2","a0a0164bd2ecb327","c0cb3984d0a20d8","1c8beb7d60ffa18a","b44005e951042d3","45749213deaece88","6afb57c28a55854c","5619c6b724070584","81385e7b399b3235","856eb69df47300bc","68ab7316969c38b","c8f63fe574c9cd3","a1dd0a169df78d67","4bb11f08323af914","466839f492add207","6c3507bea504fcc","560bb093d1aea569","a13eb5088003f50b","9f5f0eff2dca5e9", "2015d5566f6182e1","9f0799ecd4426e43","20a0cfb49029370f","b5ae2491e369931a","94800037492ba19a","57f89a48ccc5bdb0","a825ac16288e518f","1a8754cea558330e","837449174a662384"]

IgnoredIdentifiers:
- logger
Expand Down

0 comments on commit 7e78fc6

Please sign in to comment.