Skip to content

Commit 9c14b6c

Browse files
Ruteriavalonche
authored andcommitted
Run builder even if cannot connect to remote relay (ethereum#12)
1 parent 37b6b83 commit 9c14b6c

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

builder/relay.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ type RemoteRelay struct {
4444
validatorSlotMap map[uint64]ValidatorData
4545
}
4646

47-
func NewRemoteRelay(endpoint string, localRelay *LocalRelay) (*RemoteRelay, error) {
47+
func NewRemoteRelay(endpoint string, localRelay *LocalRelay) *RemoteRelay {
4848
r := &RemoteRelay{
4949
endpoint: endpoint,
5050
client: http.Client{Timeout: time.Second},
@@ -55,7 +55,10 @@ func NewRemoteRelay(endpoint string, localRelay *LocalRelay) (*RemoteRelay, erro
5555
}
5656

5757
err := r.updateValidatorsMap(0, 3)
58-
return r, err
58+
if err != nil {
59+
log.Error("could not connect to remote relay, continuing anyway", "err", err)
60+
}
61+
return r
5962
}
6063

6164
type GetValidatorRelayResponse []struct {

builder/relay_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ func TestRemoteRelay(t *testing.T) {
4545
}
4646

4747
srv := httptest.NewServer(r)
48-
relay, err := NewRemoteRelay(srv.URL, nil)
49-
require.NoError(t, err)
48+
relay := NewRemoteRelay(srv.URL, nil)
5049
vd, found := relay.validatorSlotMap[123]
5150
require.True(t, found)
5251
expectedValidator_123 := ValidatorData{
@@ -57,7 +56,7 @@ func TestRemoteRelay(t *testing.T) {
5756
}
5857
require.Equal(t, expectedValidator_123, vd)
5958

60-
vd, err = relay.GetValidatorForSlot(123)
59+
vd, err := relay.GetValidatorForSlot(123)
6160
require.NoError(t, err)
6261
require.Equal(t, expectedValidator_123, vd)
6362

builder/service.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,7 @@ func Register(stack *node.Node, backend *eth.Ethereum, cfg *BuilderConfig) error
114114

115115
var relay IRelay
116116
if cfg.RemoteRelayEndpoint != "" {
117-
relay, err = NewRemoteRelay(cfg.RemoteRelayEndpoint, localRelay)
118-
if err != nil {
119-
return err
120-
}
117+
relay = NewRemoteRelay(cfg.RemoteRelayEndpoint, localRelay)
121118
} else {
122119
relay = localRelay
123120
}

0 commit comments

Comments
 (0)