Skip to content

Commit

Permalink
fix: Pass transport protocol as an argument
Browse files Browse the repository at this point in the history
  • Loading branch information
michaljurecko committed Sep 3, 2024
1 parent cb6fe7c commit feb5746
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,15 @@ func NewManager(d dependencies, cfg network.Config, nodeID string) (*Manager, er
nodeID: nodeID,
}

// Create transport client
var err error
m.client, err = transport.NewClient(m.logger.WithComponent("client"), cfg, nodeID)
// Create transport
tr, err := transport.NewProtocol(cfg)
if err != nil {
return nil, err
}

// Create transport client
m.client = transport.NewClient(m.logger.WithComponent("client"), cfg, nodeID, tr)

// Graceful shutdown
wg := &sync.WaitGroup{}
ctx, cancel := context.WithCancel(context.Background())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,15 @@ type Client struct {
connections map[string]*ClientConnection
}

func NewClient(logger log.Logger, config network.Config, nodeID string) (*Client, error) {
transport, err := NewProtocol(config)
if err != nil {
return nil, err
}

func NewClient(logger log.Logger, config network.Config, nodeID string, transport Protocol) *Client {
return &Client{
logger: logger.WithComponent("transport"),
config: config,
nodeID: nodeID,
transport: transport,
closed: make(chan struct{}),
connections: make(map[string]*ClientConnection),
}, nil
}
}

// OpenConnection starts a connection dial loop to the target address.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ func testTransportSmallData(t *testing.T, transportFactory func(cfg network.Conf
// Setup client
clientLogger := log.NewDebugLogger()
clientLogger.ConnectTo(os.Stdout)
client, err := transport.NewClient(clientLogger, cfg, "client-node")
require.NoError(t, err)
client := transport.NewClient(clientLogger, cfg, "client-node", tr)
conn, err := client.OpenConnectionOrErr(ctx, "srv", addr)
require.NoError(t, err)

Expand Down Expand Up @@ -164,8 +163,7 @@ func testTransportBiggerData(t *testing.T, transportFactory func(cfg network.Con

// Setup client
clientLogger := log.NewDebugLogger()
client, err := transport.NewClient(clientLogger, cfg, "client-node")
require.NoError(t, err)
client := transport.NewClient(clientLogger, cfg, "client-node", tr)
conn, err := client.OpenConnectionOrErr(ctx, "srv", addr)
require.NoError(t, err)

Expand Down

0 comments on commit feb5746

Please sign in to comment.