From 8dc3a9e28f98a9d339d2c44eed1fb50e4c96e42b Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Mon, 4 Mar 2024 09:05:02 -0500 Subject: [PATCH] Remove getConnWithConfig unused parameter --- engine/connmanager.go | 6 +++--- engine/connmanager_test.go | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/engine/connmanager.go b/engine/connmanager.go index 87bcd8252..dcf54055b 100644 --- a/engine/connmanager.go +++ b/engine/connmanager.go @@ -96,7 +96,7 @@ func (cM *ConnManager) getConn(ctx *context.Context, connID string) (conn birpc. } } } - if conn, err = cM.getConnWithConfig(ctx, connID, connCfg, intChan, isInternalRPC); err != nil { + if conn, err = cM.getConnWithConfig(ctx, connID, connCfg, intChan); err != nil { return } err = Cache.Set(utils.CacheRPCConnections, connID, conn, nil, @@ -105,7 +105,7 @@ func (cM *ConnManager) getConn(ctx *context.Context, connID string) (conn birpc. } func (cM *ConnManager) getConnWithConfig(ctx *context.Context, connID string, connCfg *config.RPCConn, - intChan chan birpc.ClientConnector, isInternalRPC bool) (conn birpc.ClientConnector, err error) { + intChan chan birpc.ClientConnector) (conn birpc.ClientConnector, err error) { if connCfg.Strategy == rpcclient.PoolParallel { rpcConnCfg := connCfg.Conns[0] // for parallel we need only the first connection codec := rpcclient.GOBrpc @@ -219,7 +219,7 @@ func (cM *ConnManager) CallWithConnIDs(connIDs []string, subsHostIDs utils.Strin // skip this pool if no connection matches continue } - if conn, err = cM.getConnWithConfig(context.TODO(), connID, newCfg, nil, false); err != nil { + if conn, err = cM.getConnWithConfig(context.TODO(), connID, newCfg, nil); err != nil { continue } if err = conn.Call(context.TODO(), method, arg, reply); !rpcclient.IsNetworkError(err) { diff --git a/engine/connmanager_test.go b/engine/connmanager_test.go index 69e589b6c..b621ac147 100644 --- a/engine/connmanager_test.go +++ b/engine/connmanager_test.go @@ -166,7 +166,7 @@ func TestCMgetConnWithConfigUnsupportedTransport(t *testing.T) { } experr := fmt.Sprintf("Unsupported transport: <%+s>", "invalid") - rcv, err := cM.getConnWithConfig(context.Background(), connID, cfg.RPCConns()[connID], cc, true) + rcv, err := cM.getConnWithConfig(context.Background(), connID, cfg.RPCConns()[connID], cc) if err == nil || err.Error() != experr { t.Fatalf("expected: <%+v>, \nreceived: <%+v>", experr, err) @@ -201,7 +201,7 @@ func TestCMgetConnWithConfigUnsupportedCodec(t *testing.T) { experr := rpcclient.ErrUnsupportedCodec var exp *rpcclient.RPCParallelClientPool - rcv, err := cM.getConnWithConfig(context.Background(), connID, cfg.RPCConns()[connID], cc, true) + rcv, err := cM.getConnWithConfig(context.Background(), connID, cfg.RPCConns()[connID], cc) if err == nil || err != experr { t.Fatalf("expected: <%+v>, \nreceived: <%+v>", experr, err) @@ -236,7 +236,7 @@ func TestCMgetConnWithConfigEmptyTransport(t *testing.T) { cM.connCache.Set(connID, nil, nil) - rcv, err := cM.getConnWithConfig(context.Background(), connID, cfg.RPCConns()[connID], cc, true) + rcv, err := cM.getConnWithConfig(context.Background(), connID, cfg.RPCConns()[connID], cc) if err != nil { t.Fatalf("expected: <%+v>, \nreceived: <%+v>", nil, err) @@ -276,7 +276,7 @@ func TestCMgetConnWithConfigInternalRPCCodec(t *testing.T) { connCache: ltcache.NewCache(-1, 0, true, nil), } - rcv, err := cM.getConnWithConfig(context.Background(), connID, cfg.RPCConns()[connID], cc, true) + rcv, err := cM.getConnWithConfig(context.Background(), connID, cfg.RPCConns()[connID], cc) if err != nil { t.Fatalf("expected: <%+v>, \nreceived: <%+v>", nil, err) @@ -309,7 +309,7 @@ func TestCMgetConnWithConfigInternalBiRPCCodecUnsupported(t *testing.T) { } experr := rpcclient.ErrUnsupportedCodec - rcv, err := cM.getConnWithConfig(context.Background(), connID, cfg.RPCConns()[connID], cc, true) + rcv, err := cM.getConnWithConfig(context.Background(), connID, cfg.RPCConns()[connID], cc) if err == nil || err != experr { t.Fatalf("expected: <%+v>, \nreceived: <%+v>", experr, err)