Skip to content

Commit

Permalink
gomod: downgrade go-eth2-client to v0.17.0 (#2474)
Browse files Browse the repository at this point in the history
Downgrades `go-eth2-client` to v0.17.0 to remain compatible with lighthouse because of this issue: sigp/lighthouse#4525

category: misc
ticket: none
  • Loading branch information
dB2510 authored Jul 26, 2023
1 parent b86344c commit dab31bd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 18 deletions.
22 changes: 8 additions & 14 deletions core/validatorapi/router_internal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (
"github.com/obolnetwork/charon/app/eth2wrap"
"github.com/obolnetwork/charon/eth2util/eth2exp"
"github.com/obolnetwork/charon/testutil"
"github.com/obolnetwork/charon/testutil/beaconmock"
)

const (
Expand Down Expand Up @@ -613,23 +614,16 @@ func TestRouter(t *testing.T) {
})

t.Run("get validators with no validator ids provided", func(t *testing.T) {
handler := testHandler{}
handler := testHandler{
ValidatorsFunc: func(_ context.Context, stateID string, indices []eth2p0.ValidatorIndex) (map[eth2p0.ValidatorIndex]*eth2v1.Validator, error) {
return beaconmock.ValidatorSetA, nil
},
}

callback := func(ctx context.Context, cl *eth2http.Service) {
// Querying validators without any index returns the validators in the beacon state.
validators, err := cl.Validators(ctx, "head", nil)
res, err := cl.Validators(ctx, "head", nil)
require.NoError(t, err)

state, err := cl.BeaconState(ctx, "head")
require.NoError(t, err)
expectedVals, err := state.Validators()
require.NoError(t, err)

for valIdx := range expectedVals {
delete(validators, eth2p0.ValidatorIndex(valIdx))
}

require.Empty(t, validators)
require.EqualValues(t, beaconmock.ValidatorSetA, res)
}

testRouter(t, handler, callback)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/obolnetwork/charon
go 1.20

require (
github.com/attestantio/go-eth2-client v0.18.0
github.com/attestantio/go-eth2-client v0.17.0
github.com/bufbuild/buf v1.25.0
github.com/coinbase/kryptology v1.5.6-0.20220316191335-269410e1b06b
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0
Expand Down
6 changes: 3 additions & 3 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
github.com/attestantio/go-eth2-client v0.18.0 h1:W8/d6Fa0SvgwO6ybcEwBiRZP1yaUCq7JlvMHHAx3O6Q=
github.com/attestantio/go-eth2-client v0.18.0/go.mod h1:KSVlZSW1A3jUg5H8O89DLtqxgJprRfTtI7k89fLdhu0=
github.com/attestantio/go-eth2-client v0.17.0 h1:Rvn/tmLHRRztoS2c/6AmsslGucyytWMvnQlAUz4EvYY=
github.com/attestantio/go-eth2-client v0.17.0/go.mod h1:N+BNIxaHmul44d0tTjwFrUJU/g6MIblFP67oagm1Lwo=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o=
Expand Down Expand Up @@ -518,7 +518,7 @@ github.com/r3labs/sse/v2 v2.10.0/go.mod h1:Igau6Whc+F17QUgML1fYe1VPZzTV6EMCnYktE
github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtBsk=
github.com/raulk/go-watchdog v1.3.0/go.mod h1:fIvOnLbF0b0ZwkB9YU4mOW9Did//4vPZtDqv66NfsMU=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE=
github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
Expand Down

0 comments on commit dab31bd

Please sign in to comment.