Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

app: add table tests for simnet #1390

Merged
merged 6 commits into from
Nov 9, 2022
Merged

app: add table tests for simnet #1390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3ec6a89
add table tests for simnet
dB2510 Nov 7, 2022
bca9b5d
add teku simnet tests
dB2510 Nov 7, 2022
52a8ae8
add verbose temporary to check logs
dB2510 Nov 8, 2022
e44f557
cleanup
dB2510 Nov 9, 2022
5e163bd
cleanup
dB2510 Nov 9, 2022
f6eeb8a
cleanup
dB2510 Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
261 changes: 137 additions & 124 deletions app/simnet_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,135 +54,142 @@ import (
//go:generate go test . -integration -v
var integration = flag.Bool("integration", false, "Enable docker based integration test")

func TestSimnetNoNetwork_WithAttesterTekuVC(t *testing.T) {
if !*integration {
t.Skip("Skipping Teku integration test")
}

args := newSimnetArgs(t)
args = startTeku(t, args, 0, tekuVC)
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoProposerDuties())
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoSyncCommitteeDuties())
expect := newSimnetExpect(args.N, core.DutyAttester /*core.DutyPrepareAggregator, core.DutyAggregator*/) // Teku doesn't support v2 attestation aggregation.
testSimnet(t, args, expect)
}

func TestSimnetNoNetwork_WithProposerTekuVC(t *testing.T) {
if !*integration {
t.Skip("Skipping Teku integration test")
}

args := newSimnetArgs(t)
args = startTeku(t, args, 0, tekuVC)
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoAttesterDuties())
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoSyncCommitteeDuties())
expect := newSimnetExpect(args.N, core.DutyProposer, core.DutyRandao)
testSimnet(t, args, expect)
}

func TestSimnetNoNetwork_WithSyncCommTekuVC(t *testing.T) {
if !*integration {
t.Skip("Skipping Teku integration test")
}

args := newSimnetArgs(t)
args = startTeku(t, args, 0, tekuVC)
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoAttesterDuties())
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoProposerDuties())
expect := newSimnetExpect(args.N, core.DutySyncMessage)
testSimnet(t, args, expect)
}

func TestSimnetNoNetwork_WithExitTekuVC(t *testing.T) {
if !*integration {
t.Skip("Skipping Teku integration test")
}

args := newSimnetArgs(t)
for i := 0; i < args.N; i++ {
args = startTeku(t, args, i, tekuExit)
func TestSimnetDuties(t *testing.T) {
tests := []struct {
name string
bmockOpts []beaconmock.Option
duties []core.DutyType
builderAPI bool
builderRegistration bool
exit bool
teku bool
}{
{
name: "attester with mock VCs",
bmockOpts: []beaconmock.Option{
beaconmock.WithNoProposerDuties(),
beaconmock.WithNoSyncCommitteeDuties(),
},
duties: []core.DutyType{core.DutyPrepareAggregator, core.DutyAttester, core.DutyAggregator}, // Teku doesn't support beacon committee selection.
},
{
name: "attester with teku",
bmockOpts: []beaconmock.Option{
beaconmock.WithNoProposerDuties(),
beaconmock.WithNoSyncCommitteeDuties(),
},
duties: []core.DutyType{core.DutyAttester},
teku: true,
},
{
name: "proposer with mock VCs",
bmockOpts: []beaconmock.Option{
beaconmock.WithNoAttesterDuties(),
beaconmock.WithNoSyncCommitteeDuties(),
},
duties: []core.DutyType{core.DutyProposer, core.DutyRandao},
},
{
name: "proposer with teku",
bmockOpts: []beaconmock.Option{
beaconmock.WithNoAttesterDuties(),
beaconmock.WithNoSyncCommitteeDuties(),
},
duties: []core.DutyType{core.DutyProposer, core.DutyRandao},
teku: true,
},
{
name: "builder proposer with mock VCs",
bmockOpts: []beaconmock.Option{
beaconmock.WithNoAttesterDuties(),
beaconmock.WithNoSyncCommitteeDuties(),
},
duties: []core.DutyType{core.DutyBuilderProposer, core.DutyRandao},
builderAPI: true,
},
{
name: "builder proposer with teku",
bmockOpts: []beaconmock.Option{
beaconmock.WithNoAttesterDuties(),
beaconmock.WithNoSyncCommitteeDuties(),
},
duties: []core.DutyType{core.DutyBuilderProposer, core.DutyRandao},
builderAPI: true,
teku: true,
},
{
name: "builder registration with mock VCs",
bmockOpts: []beaconmock.Option{
beaconmock.WithNoAttesterDuties(),
beaconmock.WithNoProposerDuties(),
beaconmock.WithNoSyncCommitteeDuties(),
},
duties: []core.DutyType{core.DutyBuilderRegistration},
builderRegistration: true,
},
{
name: "builder registration with teku",
bmockOpts: []beaconmock.Option{
beaconmock.WithNoAttesterDuties(),
beaconmock.WithNoProposerDuties(),
beaconmock.WithNoSyncCommitteeDuties(),
},
duties: []core.DutyType{core.DutyBuilderRegistration},
builderRegistration: true,
teku: true,
},
{
name: "sync committee with mock VCs",
bmockOpts: []beaconmock.Option{
beaconmock.WithNoAttesterDuties(),
beaconmock.WithNoProposerDuties(),
},
duties: []core.DutyType{core.DutyPrepareSyncContribution, core.DutySyncMessage, core.DutySyncContribution},
},
{
name: "sync committee with teku",
bmockOpts: []beaconmock.Option{
beaconmock.WithNoAttesterDuties(),
beaconmock.WithNoProposerDuties(),
},
duties: []core.DutyType{core.DutySyncMessage}, // Teku doesn't support sync committee selection.
teku: true,
},
{
name: "voluntary exit with teku",
bmockOpts: []beaconmock.Option{
beaconmock.WithNoAttesterDuties(),
beaconmock.WithNoProposerDuties(),
beaconmock.WithNoSyncCommitteeDuties(),
},
duties: []core.DutyType{core.DutyExit},
exit: true,
teku: true,
},
}
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoAttesterDuties())
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoProposerDuties())
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoSyncCommitteeDuties())
expect := newSimnetExpect(args.N, core.DutyExit)
testSimnet(t, args, expect)
}

func TestSimnetNoNetwork_WithBuilderRegistrationTekuVC(t *testing.T) {
if !*integration {
t.Skip("Skipping Teku integration test")
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
if test.teku && !*integration {
t.Skip("Skipping Teku integration test")
}

args := newSimnetArgs(t)
args.BuilderRegistration = true
for i := 0; i < args.N; i++ {
args = startTeku(t, args, i, tekuVC)
}
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoAttesterDuties())
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoProposerDuties())
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoSyncCommitteeDuties())
expect := newSimnetExpect(args.N, core.DutyBuilderRegistration)
testSimnet(t, args, expect)
}
args := newSimnetArgs(t)
args.BuilderRegistration = test.builderRegistration
args.BuilderAPI = test.builderAPI
args.VoluntaryExit = test.exit

func TestSimnetNoNetwork_WithBuilderProposerTekuVC(t *testing.T) {
if !*integration {
t.Skip("Skipping Teku integration test")
}
if test.teku {
for i := 0; i < args.N; i++ {
args = startTeku(t, args, i)
}
}

args := newSimnetArgs(t)
args.BuilderAPI = true
for i := 0; i < args.N; i++ {
args = startTeku(t, args, i, tekuVC)
args.BMockOpts = test.bmockOpts
expect := newSimnetExpect(args.N, test.duties...)
testSimnet(t, args, expect)
})
}
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoAttesterDuties())
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoSyncCommitteeDuties())
expect := newSimnetExpect(args.N, core.DutyBuilderProposer, core.DutyRandao)
testSimnet(t, args, expect)
}

func TestSimnetNoNetwork_WithAttesterMockVCs(t *testing.T) {
args := newSimnetArgs(t)
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoProposerDuties())
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoSyncCommitteeDuties())
expect := newSimnetExpect(args.N, core.DutyPrepareAggregator, core.DutyAttester, core.DutyAggregator)
testSimnet(t, args, expect)
}

func TestSimnetNoNetwork_WithProposerMockVCs(t *testing.T) {
args := newSimnetArgs(t)
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoAttesterDuties())
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoSyncCommitteeDuties())
expect := newSimnetExpect(args.N, core.DutyProposer, core.DutyRandao)
testSimnet(t, args, expect)
}

func TestSimnetNoNetwork_WithBuilderProposerMockVCs(t *testing.T) {
args := newSimnetArgs(t)
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoAttesterDuties())
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoSyncCommitteeDuties())
args.BuilderAPI = true
expect := newSimnetExpect(args.N, core.DutyBuilderProposer, core.DutyRandao)
testSimnet(t, args, expect)
}

func TestSimnetNoNetwork_WithBuilderRegistrationMockVCs(t *testing.T) {
args := newSimnetArgs(t)
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoAttesterDuties())
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoProposerDuties())
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoSyncCommitteeDuties())
args.BuilderRegistration = true
expect := newSimnetExpect(args.N, core.DutyBuilderRegistration)
testSimnet(t, args, expect)
}

func TestSimnetNoNetwork_WithSyncCommitteeMockVCs(t *testing.T) {
args := newSimnetArgs(t)
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoAttesterDuties())
args.BMockOpts = append(args.BMockOpts, beaconmock.WithNoProposerDuties())
expect := newSimnetExpect(args.N, core.DutyPrepareSyncContribution, core.DutySyncMessage, core.DutySyncContribution)
testSimnet(t, args, expect)
}

type simnetArgs struct {
Expand All @@ -196,6 +203,7 @@ type simnetArgs struct {
ErrChan chan error
BuilderAPI bool
BuilderRegistration bool
VoluntaryExit bool
}

// newSimnetArgs defines the default simnet test args.
Expand Down Expand Up @@ -434,12 +442,17 @@ var (

// startTeku starts a teku validator client for the provided node and returns updated args.
// See https://docs.teku.consensys.net/en/latest/Reference/CLI/CLI-Syntax/.
func startTeku(t *testing.T, args simnetArgs, node int, cmd tekuCmd) simnetArgs {
func startTeku(t *testing.T, args simnetArgs, node int) simnetArgs {
t.Helper()

// Configure teku as VC for node0
args.VMocks[node] = false

cmd := tekuVC
if args.VoluntaryExit {
cmd = tekuExit
}

// Write private share keystore and password
tempDir, err := os.MkdirTemp("", "")
require.NoError(t, err)
Expand Down
6 changes: 3 additions & 3 deletions testutil/beaconmock/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,11 +347,11 @@ func WithNoSyncCommitteeDuties() Option {
}

// WithDeterministicSyncCommDuties configures the mock to override SyncCommitteeDutiesFunc to return sync committee
// duties for all validators with epoch number not divisible by 3.
// duties for all validators for first 2 epochs in every 4 epochs.
func WithDeterministicSyncCommDuties() Option {
return func(mock *Mock) {
mock.SyncCommitteeDutiesFunc = func(ctx context.Context, epoch eth2p0.Epoch, indices []eth2p0.ValidatorIndex) ([]*eth2v1.SyncCommitteeDuty, error) {
if epoch%3 == 0 {
if epoch%4 >= 2 {
return nil, nil
}

Expand Down Expand Up @@ -380,7 +380,7 @@ func WithDeterministicSyncCommDuties() Option {
mock.overrides = append(mock.overrides, staticOverride{
Endpoint: "/eth/v1/config/spec",
Key: "EPOCHS_PER_SYNC_COMMITTEE_PERIOD",
Value: "1",
Value: "2",
})
}
}
Expand Down