Skip to content

Commit

Permalink
Get passing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidNix committed Sep 11, 2023
1 parent 0b98d31 commit 0244933
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 16 deletions.
14 changes: 6 additions & 8 deletions privval/load_balancer.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func (lb *RemoteSignerLoadBalancer) SendRequest(request privvalproto.Message) (*
resCh := make(chan signerListenerEndpointResponse)

for _, listener := range lb.listeners {
go lb.sendRequest(listener, reqCh, resCh)
go lb.send(listener, reqCh, resCh)
}
reqCh <- request
res := <-resCh
Expand All @@ -44,25 +44,23 @@ func (lb *RemoteSignerLoadBalancer) Start() error {
}

func (lb *RemoteSignerLoadBalancer) Stop() error {
var errs []error
var err error
for _, listener := range lb.listeners {
if err := listener.Stop(); err != nil {
errs = append(errs, err)
}
err = errors.Join(err, listener.Stop())
}
return errors.Join(errs...)
return err
}

type signerListenerEndpointResponse struct {
res *privvalproto.Message
err error
}

func (lb *RemoteSignerLoadBalancer) sendRequest(listener SignerListener, reqCh <-chan privvalproto.Message, resCh chan<- signerListenerEndpointResponse) {
func (lb *RemoteSignerLoadBalancer) send(listener SignerListener, reqCh <-chan privvalproto.Message, resCh chan<- signerListenerEndpointResponse) {
for req := range reqCh {
var res signerListenerEndpointResponse
lb.logger.Debug("Sent request to listener", "address", listener.address)
res.res, res.err = listener.SendRequestLocked(req)
res.res, res.err = listener.SendRequest(req)
resCh <- res
}
}
10 changes: 2 additions & 8 deletions privval/load_balancer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ func TestLoadBalancer(t *testing.T) {
"tcp://127.0.0.1:37324",
}

//// get open port
//l, err := net.Listen("tcp", ":0")

logger := log.NewTMJSONLogger(io.Discard)

listeners := make([]privval.SignerListener, len(listenAddrs))
Expand All @@ -35,13 +32,11 @@ func TestLoadBalancer(t *testing.T) {

lb := privval.NewRemoteSignerLoadBalancer(logger, listeners)

err := lb.Start()

t.Cleanup(func() {
_ = lb.Stop()
})

require.NoError(t, err)
require.NoError(t, lb.Start())

remoteSigners := make([]*MockRemoteSigner, len(listenAddrs))

Expand All @@ -68,8 +63,7 @@ func TestLoadBalancer(t *testing.T) {
})
}

err = eg.Wait()
require.NoError(t, err)
require.NoError(t, eg.Wait())

total := 0
for i := range listenAddrs {
Expand Down

0 comments on commit 0244933

Please sign in to comment.