From 7eb97e6fc7506a017e0495c4473944f5180218f2 Mon Sep 17 00:00:00 2001 From: Jake Taylor <jake@elixxir.io> Date: Thu, 18 Aug 2022 17:28:39 -0500 Subject: [PATCH] fix tests --- client/ud_test.go | 5 ----- gateway/handler.go | 7 +++---- go.mod | 2 +- go.sum | 2 ++ network/instance_test.go | 2 -- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/client/ud_test.go b/client/ud_test.go index 679e6c1a..997a8ff3 100644 --- a/client/ud_test.go +++ b/client/ud_test.go @@ -12,7 +12,6 @@ import ( func TestComms_SendRegisterUser(t *testing.T) { udAddr := getNextAddress() ud := udb.StartServer(&id.UDB, udAddr, udb.NewImplementation(), nil, nil) - _ = ud.Id defer ud.Shutdown() c, err := NewClientComms(&id.DummyUser, nil, nil, nil) if err != nil { @@ -37,7 +36,6 @@ func TestComms_SendRegisterUser(t *testing.T) { func TestComms_SendRegisterFact(t *testing.T) { udAddr := getNextAddress() ud := udb.StartServer(&id.UDB, udAddr, udb.NewImplementation(), nil, nil) - _ = ud.Id defer ud.Shutdown() c, err := NewClientComms(&id.DummyUser, nil, nil, nil) if err != nil { @@ -62,7 +60,6 @@ func TestComms_SendRegisterFact(t *testing.T) { func TestComms_SendConfirmFact(t *testing.T) { udAddr := getNextAddress() ud := udb.StartServer(&id.UDB, udAddr, udb.NewImplementation(), nil, nil) - _ = ud.Id defer ud.Shutdown() c, err := NewClientComms(&id.DummyUser, nil, nil, nil) if err != nil { @@ -87,7 +84,6 @@ func TestComms_SendConfirmFact(t *testing.T) { func TestComms_SendRemoveFact(t *testing.T) { udAddr := getNextAddress() ud := udb.StartServer(&id.UDB, udAddr, udb.NewImplementation(), nil, nil) - _ = ud.Id defer ud.Shutdown() c, err := NewClientComms(&id.DummyUser, nil, nil, nil) if err != nil { @@ -112,7 +108,6 @@ func TestComms_SendRemoveFact(t *testing.T) { func TestComms_SendRemoveUser(t *testing.T) { udAddr := getNextAddress() ud := udb.StartServer(&id.UDB, udAddr, udb.NewImplementation(), nil, nil) - _ = ud.Id defer ud.Shutdown() c, err := NewClientComms(&id.DummyUser, nil, nil, nil) if err != nil { diff --git a/gateway/handler.go b/gateway/handler.go index 82dcf2c0..b99271af 100644 --- a/gateway/handler.go +++ b/gateway/handler.go @@ -12,7 +12,6 @@ package gateway import ( - "github.com/pkg/errors" jww "github.com/spf13/jwalterweatherman" pb "gitlab.com/elixxir/comms/mixmessages" "gitlab.com/xx_network/comms/connect" @@ -46,13 +45,13 @@ type Handler interface { // and a callback interface for gateway operations // with given path to public and private key for TLS connection. func StartGateway(id *id.ID, localServer string, handler Handler, - certPem, keyPem []byte, gossipFlags gossip.ManagerFlags) (*Comms, error) { + certPem, keyPem []byte, gossipFlags gossip.ManagerFlags) *Comms { // Initialize the low-level comms listeners pc, err := connect.StartCommServer(id, localServer, certPem, keyPem, nil) if err != nil { - return nil, errors.Errorf("Unable to StartCommServer: %+v", err) + jww.FATAL.Panicf("Unable to StartCommServer: %+v", err) } gatewayServer := Comms{ handler: handler, @@ -67,7 +66,7 @@ func StartGateway(id *id.ID, localServer string, handler Handler, gossip.RegisterGossipServer(grpcServer, gatewayServer.Manager) pc.ServeWithWeb() - return &gatewayServer, nil + return &gatewayServer } // implementationFunctions for the Handler interface. diff --git a/go.mod b/go.mod index 20d3289f..2551fdd2 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 gitlab.com/elixxir/crypto v0.0.7-0.20220818194137-973a70947df4 gitlab.com/elixxir/primitives v0.0.3-0.20220810173935-592f34a88326 - gitlab.com/xx_network/comms v0.0.4-0.20220818222009-13fefcbe92a1 + gitlab.com/xx_network/comms v0.0.4-0.20220818222659-ff2c9d9f0b80 gitlab.com/xx_network/crypto v0.0.5-0.20220729193517-1e5e96f39f6e gitlab.com/xx_network/primitives v0.0.4-0.20220712193914-aebd8544396e gitlab.com/xx_network/ring v0.0.3-0.20220222211904-da613960ad93 diff --git a/go.sum b/go.sum index a92e4f40..dc4c95bb 100644 --- a/go.sum +++ b/go.sum @@ -363,6 +363,8 @@ gitlab.com/xx_network/comms v0.0.4-0.20220818221319-05c99b7d9349 h1:6mRuhq/4mbM5 gitlab.com/xx_network/comms v0.0.4-0.20220818221319-05c99b7d9349/go.mod h1:Gc2HGvbkUUCOndbQqZ9lP9G6Xh3R8oWa8UvsRcpKssE= gitlab.com/xx_network/comms v0.0.4-0.20220818222009-13fefcbe92a1 h1:kDlDNsojLodnt6kNv09rjf5lLV+6TJbUR+yZVcxElUw= gitlab.com/xx_network/comms v0.0.4-0.20220818222009-13fefcbe92a1/go.mod h1:Gc2HGvbkUUCOndbQqZ9lP9G6Xh3R8oWa8UvsRcpKssE= +gitlab.com/xx_network/comms v0.0.4-0.20220818222659-ff2c9d9f0b80 h1:4SKDQPIZOwORdqUx/W0zYyTvn2KSVqDI8PN5b1iqUrs= +gitlab.com/xx_network/comms v0.0.4-0.20220818222659-ff2c9d9f0b80/go.mod h1:Gc2HGvbkUUCOndbQqZ9lP9G6Xh3R8oWa8UvsRcpKssE= gitlab.com/xx_network/crypto v0.0.3/go.mod h1:DF2HYvvCw9wkBybXcXAgQMzX+MiGbFPjwt3t17VRqRE= gitlab.com/xx_network/crypto v0.0.4/go.mod h1:+lcQEy+Th4eswFgQDwT0EXKp4AXrlubxalwQFH5O0Mk= gitlab.com/xx_network/crypto v0.0.5-0.20220606200528-3f886fe49e81/go.mod h1:/SJf+R75E+QepdTLh0H1/udsovxx2Q5ru34q1v0umKk= diff --git a/network/instance_test.go b/network/instance_test.go index e407a021..8531717a 100644 --- a/network/instance_test.go +++ b/network/instance_test.go @@ -274,7 +274,6 @@ func setupComm(t *testing.T) (*Instance, *mixmessages.NDF) { } testManager := connect.NewManagerTesting(t) pc := &connect.ProtoComms{ - Id: id.NewIdFromString("User", id.User, t), Manager: testManager, } i, err := NewInstance(pc, baseNDF, baseNDF, nil, 0, false) @@ -491,7 +490,6 @@ func TestInstance_UpdateGatewayConnections(t *testing.T) { secured, _ := NewSecuredNdf(testutils.NDF) testManager := connect.NewManagerTesting(t) pc := &connect.ProtoComms{ - Id: id.NewIdFromString("User", id.User, t), Manager: testManager, } i := Instance{ -- GitLab