Skip to content

Commit 1945475

Browse files
committed
build
1 parent 7ffa611 commit 1945475

4 files changed

Lines changed: 38 additions & 8 deletions

File tree

devenv/http/handler.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,11 @@ func (h *handler) Start(ctx context.Context) error {
7777
}
7878

7979
h.logger.Info("initialising capabilities service")
80-
if err := h.svc.Service.Initialise(ctx, "", nil, h.kvstore, h.capabilityRegistry, nil, nil, nil, nil, nil, nil); err != nil {
80+
if err := h.svc.Service.Initialise(ctx, core.StandardCapabilitiesDependencies{
81+
Config: "",
82+
Store: h.kvstore,
83+
CapabilityRegistry: h.capabilityRegistry,
84+
}); err != nil {
8185
h.logger.Errorf("Failed to initialise service: %v", err)
8286
return err
8387
}

http_action/action/action_test.go

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,10 @@ func TestInitialise_NilConfig(t *testing.T) {
273273
srv := NewService(lggr, limits.Factory{})
274274
gc := gcmocks.NewGatewayConnector(t)
275275

276-
err := srv.Initialise(context.Background(), "", nil, nil, nil, nil, nil, nil, gc, nil)
276+
err := srv.Initialise(context.Background(), core.StandardCapabilitiesDependencies{
277+
Config: "",
278+
GatewayConnector: gc,
279+
})
277280
require.Error(t, err)
278281
assert.Contains(t, err.Error(), "unexpected end of JSON input")
279282
})
@@ -283,7 +286,10 @@ func TestInitialise_NilConfig(t *testing.T) {
283286
srv := NewService(lggr, limits.Factory{})
284287
gc := gcmocks.NewGatewayConnector(t)
285288

286-
err := srv.Initialise(context.Background(), "invalid json", nil, nil, nil, nil, nil, nil, gc, nil)
289+
err := srv.Initialise(context.Background(), core.StandardCapabilitiesDependencies{
290+
Config: "invalid json",
291+
GatewayConnector: gc,
292+
})
287293
require.Error(t, err)
288294
assert.Contains(t, err.Error(), "invalid character")
289295
})
@@ -293,7 +299,10 @@ func TestInitialise_NilConfig(t *testing.T) {
293299
srv := NewService(lggr, limits.Factory{})
294300
gc := gcmocks.NewGatewayConnector(t)
295301

296-
err := srv.Initialise(context.Background(), "{}", nil, nil, nil, nil, nil, nil, gc, nil)
302+
err := srv.Initialise(context.Background(), core.StandardCapabilitiesDependencies{
303+
Config: "{}",
304+
GatewayConnector: gc,
305+
})
297306
require.Error(t, err)
298307
assert.Contains(t, err.Error(), "invalid proxy mode")
299308
})
@@ -303,7 +312,10 @@ func TestInitialise_NilConfig(t *testing.T) {
303312
srv := NewService(lggr, limits.Factory{})
304313
gc := gcmocks.NewGatewayConnector(t)
305314

306-
err := srv.Initialise(context.Background(), "null", nil, nil, nil, nil, nil, nil, gc, nil)
315+
err := srv.Initialise(context.Background(), core.StandardCapabilitiesDependencies{
316+
Config: "null",
317+
GatewayConnector: gc,
318+
})
307319
require.Error(t, err)
308320
assert.Contains(t, err.Error(), "invalid proxy mode")
309321
})

http_trigger/trigger/trigger_test.go

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/triggers/http"
1515
"github.com/smartcontractkit/chainlink-common/pkg/logger"
1616
"github.com/smartcontractkit/chainlink-common/pkg/settings/limits"
17+
"github.com/smartcontractkit/chainlink-common/pkg/types/core"
1718
gcmocks "github.com/smartcontractkit/chainlink-common/pkg/types/core/mocks"
1819
gateway_common "github.com/smartcontractkit/chainlink-common/pkg/types/gateway"
1920
)
@@ -58,7 +59,10 @@ func TestService_RegisterTrigger(t *testing.T) {
5859
svc := NewService(logger.Test(t), limits.Factory{Logger: logger.Test(t)})
5960
cfgStr := fmt.Sprintf(`{"sendChannelBufferSize": %d}`, tc.sendChannelBufSize)
6061
gc := mockedGatewayConnector(t)
61-
err := svc.Initialise(t.Context(), cfgStr, nil, nil, nil, nil, nil, nil, gc, nil)
62+
err := svc.Initialise(t.Context(), core.StandardCapabilitiesDependencies{
63+
Config: cfgStr,
64+
GatewayConnector: gc,
65+
})
6266
require.NoError(t, err)
6367
svc.connectorHandler = mockHandler
6468
ctx := context.Background()
@@ -104,7 +108,10 @@ func TestService_UnregisterTrigger(t *testing.T) {
104108
svc := NewService(logger.Test(t), limits.Factory{Logger: logger.Test(t)})
105109
cfg := "{}"
106110
gc := mockedGatewayConnector(t)
107-
err := svc.Initialise(t.Context(), cfg, nil, nil, nil, nil, nil, nil, gc, nil)
111+
err := svc.Initialise(t.Context(), core.StandardCapabilitiesDependencies{
112+
Config: cfg,
113+
GatewayConnector: gc,
114+
})
108115
require.NoError(t, err)
109116
svc.connectorHandler = mockHandler
110117

@@ -125,7 +132,10 @@ func TestService_Start_HealthReport_Ready_Close(t *testing.T) {
125132
svc := NewService(logger.Test(t), limits.Factory{Logger: logger.Test(t)})
126133
cfg := "{}"
127134
gc := mockedGatewayConnector(t)
128-
err := svc.Initialise(t.Context(), cfg, nil, nil, nil, nil, nil, nil, gc, nil)
135+
err := svc.Initialise(t.Context(), core.StandardCapabilitiesDependencies{
136+
Config: cfg,
137+
GatewayConnector: gc,
138+
})
129139
require.NoError(t, err)
130140
svc.connectorHandler = mockHandler
131141

libs/testutils/capabilities_registry.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,3 +149,7 @@ func (r *capabilitiesRegistry) Contains(capabilityIDs []string) error {
149149
func (r *capabilitiesRegistry) NodeByPeerID(ctx context.Context, peerID types.PeerID) (capabilities.Node, error) {
150150
return capabilities.Node{}, errors.New("unimplemented")
151151
}
152+
153+
func (r *capabilitiesRegistry) DONsForCapability(ctx context.Context, capabilityID string) ([]capabilities.DONWithNodes, error) {
154+
return []capabilities.DONWithNodes{}, nil
155+
}

0 commit comments

Comments
 (0)