Skip to content

Commit b3dd92b

Browse files
committed
chore(simple_client): Add explicit ServiceUnavailable error type - address PR comment
1 parent 68a6979 commit b3dd92b

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

server/config.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,20 @@ func (cfg *Config) Check() error {
4747

4848
// provide dummy values to eigenda client config. Since the client won't be called in this
4949
// mode it doesn't matter.
50-
if cfg.MemstoreEnabled || !cfg.VerifierConfig.VerifyCerts {
50+
if cfg.MemstoreEnabled {
5151
cfg.EdaClientConfig.SvcManagerAddr = "0x0000000000000000000000000000000000000000"
5252
cfg.EdaClientConfig.EthRpcUrl = "http://0.0.0.0:666"
5353
}
5454

55+
if !cfg.MemstoreEnabled {
56+
if cfg.EdaClientConfig.SvcManagerAddr == "" {
57+
return fmt.Errorf("service manager address is required for communication with EigenDA")
58+
}
59+
if cfg.EdaClientConfig.EthRpcUrl == "" {
60+
return fmt.Errorf("eth prc url is required for communication with EigenDA")
61+
}
62+
}
63+
5564
// cert verification is enabled
5665
// TODO: move this verification logic to verify/cli.go
5766
if cfg.VerifierConfig.VerifyCerts {

server/config_test.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ func TestConfigVerification(t *testing.T) {
9090
require.Error(t, err)
9191
})
9292

93-
t.Run("EigenDAClientFieldsAreDefaultSetWhenCertVerifierDisabled", func(t *testing.T) {
94-
// 1 - memstore
93+
t.Run("EigenDAClientFieldsAreDefaultSetWhenMemStoreEnabled", func(t *testing.T) {
9594
cfg := validCfg()
9695
cfg.MemstoreEnabled = true
9796
cfg.VerifierConfig.VerifyCerts = false
@@ -102,18 +101,16 @@ func TestConfigVerification(t *testing.T) {
102101
require.NoError(t, err)
103102
require.True(t, len(cfg.EdaClientConfig.EthRpcUrl) > 1)
104103
require.True(t, len(cfg.EdaClientConfig.SvcManagerAddr) > 1)
104+
})
105105

106-
// 2 - cert verification disabled
107-
cfg = validCfg()
106+
t.Run("FailWhenEigenDAClientFieldsAreUnsetAndMemStoreDisabled", func(t *testing.T) {
107+
cfg := validCfg()
108108
cfg.MemstoreEnabled = false
109-
cfg.VerifierConfig.VerifyCerts = false
110109
cfg.VerifierConfig.RPCURL = ""
111110
cfg.VerifierConfig.SvcManagerAddr = ""
112111

113-
err = cfg.Check()
114-
require.NoError(t, err)
115-
require.True(t, len(cfg.EdaClientConfig.EthRpcUrl) > 1)
116-
require.True(t, len(cfg.EdaClientConfig.SvcManagerAddr) > 1)
112+
err := cfg.Check()
113+
require.Error(t, err)
117114
})
118115
})
119116

0 commit comments

Comments
 (0)