Skip to content

Commit 2cf0fcf

Browse files
committed
Simply setting signer
GetClient() will never return nil since its always initialized in `from pkg/beholder/global.go` `init`
1 parent 08a8370 commit 2cf0fcf

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

pkg/loop/internal/relayer/relayer.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,8 @@ func (p *PluginRelayerClient) NewRelayer(ctx context.Context, config string, key
7272
}
7373
deps.Add(ksCSARes)
7474

75-
if bc := beholder.GetClient(); bc != nil && !bc.IsSignerSet() {
76-
bc.SetSigner(csaKeystore)
77-
p.Logger.Debug("Set beholder signer from CSA keystore")
78-
}
75+
beholder.GetClient().SetSigner(csaKeystore)
76+
p.Logger.Debug("Set beholder signer from CSA keystore")
7977

8078
capabilityRegistryID, capabilityRegistryResource, err := p.ServeNew("CapabilitiesRegistry", func(s *grpc.Server) {
8179
pb.RegisterCapabilitiesRegistryServer(s, capability.NewCapabilitiesRegistryServer(p.BrokerExt, capabilityRegistry))
@@ -142,10 +140,8 @@ func (p *pluginRelayerServer) NewRelayer(ctx context.Context, request *pb.NewRel
142140

143141
csaKeystore := ks.NewClient(ksCSAConn)
144142

145-
if bc := beholder.GetClient(); bc != nil && !bc.IsSignerSet() {
146-
bc.SetSigner(csaKeystore)
147-
p.Logger.Debug("Set beholder signer from CSA keystore")
148-
}
143+
beholder.GetClient().SetSigner(csaKeystore)
144+
p.Logger.Debug("Set beholder signer from CSA keystore")
149145

150146
r, err := p.impl.NewRelayer(ctx, request.Config, ks.NewClient(ksConn), csaKeystore, capRegistry)
151147
if err != nil {

0 commit comments

Comments
 (0)