Removes deferred beholder signer wire up

Removes wire up

Removes code refactor

Author: hendoxc

pkg/loop/internal/relayer/relayer.go

@@ -13,7 +13,6 @@ import (
 	"google.golang.org/protobuf/types/known/emptypb"
 	"google.golang.org/protobuf/types/known/structpb"
 
-	"github.com/smartcontractkit/chainlink-common/pkg/beholder"
 	evmpb "github.com/smartcontractkit/chainlink-common/pkg/chains/evm"
 	tonpb "github.com/smartcontractkit/chainlink-common/pkg/chains/ton"
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
@@ -72,9 +71,6 @@ func (p *PluginRelayerClient) NewRelayer(ctx context.Context, config string, key
 		}
 		deps.Add(ksCSARes)
 
-		beholder.GetClient().SetSigner(csaKeystore)
-		p.Logger.Debug("Set beholder signer from CSA keystore")
-
 		capabilityRegistryID, capabilityRegistryResource, err := p.ServeNew("CapabilitiesRegistry", func(s *grpc.Server) {
 			pb.RegisterCapabilitiesRegistryServer(s, capability.NewCapabilitiesRegistryServer(p.BrokerExt, capabilityRegistry))
 		})
@@ -138,12 +134,7 @@ func (p *pluginRelayerServer) NewRelayer(ctx context.Context, request *pb.NewRel
 	crRes := net.Resource{Closer: capRegistryConn, Name: "CapabilityRegistry"}
 	capRegistry := capability.NewCapabilitiesRegistryClient(capRegistryConn, p.BrokerExt)
 
-	csaKeystore := ks.NewClient(ksCSAConn)
-
-	beholder.GetClient().SetSigner(csaKeystore)
-	p.Logger.Debug("Set beholder signer from CSA keystore")
-
-	r, err := p.impl.NewRelayer(ctx, request.Config, ks.NewClient(ksConn), csaKeystore, capRegistry)
+	r, err := p.impl.NewRelayer(ctx, request.Config, ks.NewClient(ksConn), ks.NewClient(ksCSAConn), capRegistry)
 	if err != nil {
 		p.CloseAll(ksRes, ksCSARes, crRes)
 		return nil, err

pkg/loop/relayer_service.go

@@ -6,7 +6,6 @@ import (
 	"math/big"
 	"os/exec"
 
-	"github.com/smartcontractkit/chainlink-common/pkg/beholder"
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/goplugin"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
@@ -33,10 +32,6 @@ func NewRelayerService(lggr logger.Logger, grpcOpts GRPCOpts, cmd func() *exec.C
 		if err != nil {
 			return nil, nil, fmt.Errorf("failed to create Relayer: %w", err)
 		}
-		if bc := beholder.GetClient(); bc != nil && !bc.IsSignerSet() {
-			bc.SetSigner(csaKeystore)
-			lggr.Debug("Set beholder signer from CSA keystore")
-		}
 		return r, plug, nil
 	}
 	stopCh := make(chan struct{})