@@ -15,6 +15,7 @@ import (
1515 ragetypes "github.com/smartcontractkit/libocr/ragep2p/types"
1616
1717 "github.com/smartcontractkit/chainlink-common/pkg/capabilities"
18+ "github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
1819
1920 capabilitiespb "github.com/smartcontractkit/chainlink-common/pkg/capabilities/pb"
2021 "github.com/smartcontractkit/chainlink-protos/cre/go/values"
@@ -345,7 +346,13 @@ func TestLauncher_RemoteTriggerModeAggregatorShim(t *testing.T) {
345346 baseCapability , err := registry .Get (ctx , fullTriggerCapID )
346347 require .NoError (t , err )
347348
348- remoteTriggerSubscriber , ok := baseCapability .(remote.TriggerSubscriber )
349+ loader , ok := baseCapability .(interface {
350+ Load () * capabilities.TriggerCapability
351+ })
352+ require .True (t , ok )
353+ loaded := loader .Load ()
354+ require .NotNil (t , loaded )
355+ remoteTriggerSubscriber , ok := (* loaded ).(remote.TriggerSubscriber )
349356 require .True (t , ok , "remote trigger capability" )
350357
351358 // Register trigger
@@ -887,8 +894,7 @@ func TestLauncher_V2CapabilitiesAddViaCombinedClient(t *testing.T) {
887894 & mockDonNotifier {},
888895 )
889896 require .NoError (t , err )
890- require .NoError (t , launcher .Start (t .Context ()))
891- defer launcher .Close ()
897+ servicetest .Run (t , launcher )
892898
893899 dispatcher .On ("SetReceiverForMethod" , fullTriggerCapID , capDonID , "StreamsTrigger" , mock .AnythingOfType ("*remote.triggerSubscriber" )).Return (nil )
894900 dispatcher .On ("SetReceiverForMethod" , fullExecutableCapID , capDonID , "Write" , mock .AnythingOfType ("*executable.client" )).Return (nil )
@@ -899,8 +905,14 @@ func TestLauncher_V2CapabilitiesAddViaCombinedClient(t *testing.T) {
899905
900906 trigCap , err := registry .Get (t .Context (), fullTriggerCapID )
901907 require .NoError (t , err )
902- trigCC , ok := trigCap .(remote.CombinedClient )
903- assert .True (t , ok , "expected CombinedClient object" )
908+ atomCC , ok := trigCap .(interface {
909+ Load () * capabilities.ExecutableAndTriggerCapability
910+ })
911+ require .True (t , ok , "expected CombinedClient object but got: %T" , atomCC )
912+ loaded := atomCC .Load ()
913+ require .NotNil (t , loaded )
914+ trigCC , ok := (* loaded ).(remote.CombinedClient )
915+ require .True (t , ok , "expected CombinedClient object" )
904916 subscriber := trigCC .GetTriggerSubscriber ("StreamsTrigger" )
905917 capInfo , err := subscriber .Info (t .Context ())
906918 require .NoError (t , err )
@@ -909,8 +921,14 @@ func TestLauncher_V2CapabilitiesAddViaCombinedClient(t *testing.T) {
909921
910922 execCap , err := registry .Get (t .Context (), fullExecutableCapID )
911923 require .NoError (t , err )
912- execCC , ok := execCap .(remote.CombinedClient )
913- assert .True (t , ok , "expected CombinedClient object" )
924+ atomCC , ok = execCap .(interface {
925+ Load () * capabilities.ExecutableAndTriggerCapability
926+ })
927+ require .True (t , ok , "expected CombinedClient object but got: %T" , atomCC )
928+ loaded = atomCC .Load ()
929+ require .NotNil (t , loaded )
930+ execCC , ok := (* loaded ).(remote.CombinedClient )
931+ require .True (t , ok , "expected CombinedClient object" )
914932 require .NotNil (t , execCC .GetExecutableClient ("Write" ))
915933
916934 // Now update config for one capability and verify it's propagated correctly (DON size)
0 commit comments