diff --git a/network/gateway/hostpool_test.go b/network/gateway/hostpool_test.go index fdc97982767e3d555b8dc4169e21f70101cfe150..0ecb6784ad74c134cd55ff41311086164195828d 100644 --- a/network/gateway/hostpool_test.go +++ b/network/gateway/hostpool_test.go @@ -12,6 +12,7 @@ import ( jww "github.com/spf13/jwalterweatherman" "gitlab.com/elixxir/client/storage" "gitlab.com/elixxir/comms/network" + "gitlab.com/elixxir/crypto/fastRNG" "gitlab.com/xx_network/comms/connect" "gitlab.com/xx_network/crypto/csprng" "gitlab.com/xx_network/primitives/id" @@ -23,7 +24,7 @@ import ( // Unit test func TestNewHostPool(t *testing.T) { manager := newMockManager() - rng := csprng.NewSystemRNG() + rng := fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG) testNdf := getTestNdf(t) testStorage := storage.InitTestingSession(t) addGwChan := make(chan network.NodeGateway) @@ -57,7 +58,7 @@ func TestNewHostPool(t *testing.T) { // Unit test func TestHostPool_ManageHostPool(t *testing.T) { manager := newMockManager() - rng := csprng.NewSystemRNG() + rng := fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG) testNdf := getTestNdf(t) testStorage := storage.InitTestingSession(t) addGwChan := make(chan network.NodeGateway) @@ -254,7 +255,7 @@ func TestHostPool_ReplaceHost_Error(t *testing.T) { // Unit test func TestHostPool_ForceReplace(t *testing.T) { manager := newMockManager() - rng := csprng.NewSystemRNG() + rng := fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG) testNdf := getTestNdf(t) testStorage := storage.InitTestingSession(t) addGwChan := make(chan network.NodeGateway) @@ -323,7 +324,7 @@ func TestHostPool_ForceReplace(t *testing.T) { // Unit test func TestHostPool_CheckReplace(t *testing.T) { manager := newMockManager() - rng := csprng.NewSystemRNG() + rng := fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG) testNdf := getTestNdf(t) testStorage := storage.InitTestingSession(t) addGwChan := make(chan network.NodeGateway) @@ -377,7 +378,7 @@ func TestHostPool_CheckReplace(t *testing.T) { // Check that an error not in the global list results in a no-op goodGatewayIndex := 0 goodGateway := testPool.hostList[goodGatewayIndex] - unexpectedErr := fmt.Errorf("Not in global error list") + unexpectedErr := fmt.Errorf("not in global error list") err = testPool.checkReplace(oldHost.GetId(), unexpectedErr) if err != nil { t.Errorf("Failed to check replace: %v", err) @@ -433,7 +434,7 @@ func TestHostPool_UpdateNdf(t *testing.T) { // Full test func TestHostPool_GetPreferred(t *testing.T) { manager := newMockManager() - rng := csprng.NewSystemRNG() + rng := fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG) testNdf := getTestNdf(t) testStorage := storage.InitTestingSession(t) addGwChan := make(chan network.NodeGateway) @@ -504,7 +505,7 @@ func TestHostPool_GetPreferred(t *testing.T) { // Unit test func TestHostPool_GetAny(t *testing.T) { manager := newMockManager() - rng := csprng.NewSystemRNG() + rng := fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG) testNdf := getTestNdf(t) testStorage := storage.InitTestingSession(t) addGwChan := make(chan network.NodeGateway) @@ -560,7 +561,7 @@ func TestHostPool_GetAny(t *testing.T) { // Unit test func TestHostPool_ForceAdd(t *testing.T) { manager := newMockManager() - rng := csprng.NewSystemRNG() + rng := fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG) testNdf := getTestNdf(t) testStorage := storage.InitTestingSession(t) addGwChan := make(chan network.NodeGateway) @@ -620,7 +621,7 @@ func TestHostPool_ForceAdd(t *testing.T) { // Unit test which only adds information to ndf func TestHostPool_UpdateConns_AddGateways(t *testing.T) { manager := newMockManager() - rng := csprng.NewSystemRNG() + rng := fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG) testNdf := getTestNdf(t) testStorage := storage.InitTestingSession(t) addGwChan := make(chan network.NodeGateway) @@ -694,7 +695,7 @@ func TestHostPool_UpdateConns_AddGateways(t *testing.T) { // Unit test which only adds information to ndf func TestHostPool_UpdateConns_RemoveGateways(t *testing.T) { manager := newMockManager() - rng := csprng.NewSystemRNG() + rng := fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG) testNdf := getTestNdf(t) testStorage := storage.InitTestingSession(t) addGwChan := make(chan network.NodeGateway) @@ -813,6 +814,7 @@ func TestHostPool_RemoveGateway(t *testing.T) { ndf: testNdf, addGatewayChan: make(chan network.NodeGateway), storage: storage.InitTestingSession(t), + rng: fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG), } ndfIndex := 0 diff --git a/network/gateway/sender_test.go b/network/gateway/sender_test.go index 4d67ef98029b0b70ca2a2e661ad60b39be9b7557..9ce8155b9f3af7e70ebe4c7054859cae34b1ea5a 100644 --- a/network/gateway/sender_test.go +++ b/network/gateway/sender_test.go @@ -10,6 +10,7 @@ package gateway import ( "gitlab.com/elixxir/client/storage" "gitlab.com/elixxir/comms/network" + "gitlab.com/elixxir/crypto/fastRNG" "gitlab.com/xx_network/comms/connect" "gitlab.com/xx_network/crypto/csprng" "gitlab.com/xx_network/primitives/id" @@ -20,7 +21,7 @@ import ( // Unit test func TestNewSender(t *testing.T) { manager := newMockManager() - rng := csprng.NewSystemRNG() + rng := fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG) testNdf := getTestNdf(t) testStorage := storage.InitTestingSession(t) addGwChan := make(chan network.NodeGateway) @@ -36,7 +37,7 @@ func TestNewSender(t *testing.T) { // Unit test func TestSender_SendToAny(t *testing.T) { manager := newMockManager() - rng := csprng.NewSystemRNG() + rng := fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG) testNdf := getTestNdf(t) testStorage := storage.InitTestingSession(t) addGwChan := make(chan network.NodeGateway) @@ -103,7 +104,7 @@ func TestSender_SendToAny(t *testing.T) { // Unit test func TestSender_SendToPreferred(t *testing.T) { manager := newMockManager() - rng := csprng.NewSystemRNG() + rng := fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG) testNdf := getTestNdf(t) testStorage := storage.InitTestingSession(t) addGwChan := make(chan network.NodeGateway) @@ -189,7 +190,7 @@ func TestSender_SendToPreferred(t *testing.T) { func TestSender_SendToSpecific(t *testing.T) { manager := newMockManager() - rng := csprng.NewSystemRNG() + rng := fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG) testNdf := getTestNdf(t) testStorage := storage.InitTestingSession(t) addGwChan := make(chan network.NodeGateway) diff --git a/network/message/garbled_test.go b/network/message/garbled_test.go index f9609c60a25902009ece4161f082fd3523863f5d..d82448cdda7440f77352d5d9ad4cf06eeaa3ded7 100644 --- a/network/message/garbled_test.go +++ b/network/message/garbled_test.go @@ -60,7 +60,7 @@ func TestManager_CheckGarbledMessages(t *testing.T) { } p := gateway.DefaultPoolParams() p.PoolSize = 1 - sender, err := gateway.NewSender(p, i.Rng.GetStream(), getNDF(), &MockSendCMIXComms{t: t}, i.Session, nil) + sender, err := gateway.NewSender(p, i.Rng, getNDF(), &MockSendCMIXComms{t: t}, i.Session, nil) if err != nil { t.Errorf(err.Error()) } diff --git a/network/message/sendCmix_test.go b/network/message/sendCmix_test.go index 6d9e2ef2402ee651c50deb4e578e53b8715f3b6e..3d038538add21ce7d86913d4c83277324d3ce787 100644 --- a/network/message/sendCmix_test.go +++ b/network/message/sendCmix_test.go @@ -129,7 +129,7 @@ func Test_attemptSendCmix(t *testing.T) { } p := gateway.DefaultPoolParams() p.PoolSize = 1 - sender, err := gateway.NewSender(p, i.Rng.GetStream(), getNDF(), &MockSendCMIXComms{t: t}, i.Session, nil) + sender, err := gateway.NewSender(p, i.Rng, getNDF(), &MockSendCMIXComms{t: t}, i.Session, nil) if err != nil { t.Errorf("%+v", errors.New(err.Error())) return diff --git a/network/rounds/retrieve_test.go b/network/rounds/retrieve_test.go index 7e5e28b57995a08862355b6939c89d00a9f254ea..f7529f3eafe5dd47da3e1c66a190dd017b6e5a00 100644 --- a/network/rounds/retrieve_test.go +++ b/network/rounds/retrieve_test.go @@ -38,7 +38,7 @@ func TestManager_ProcessMessageRetrieval(t *testing.T) { p := gateway.DefaultPoolParams() p.PoolSize = 1 testManager.sender, _ = gateway.NewSender(p, - fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG).GetStream(), + fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG), testNdf, mockComms, testManager.Session, nil) // Create a local channel so reception is possible (testManager.messageBundles is @@ -129,7 +129,7 @@ func TestManager_ProcessMessageRetrieval_NoRound(t *testing.T) { testNdf.Gateways = []ndf.Gateway{{ID: gwId.Marshal()}} testManager.sender, _ = gateway.NewSender(p, - fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG).GetStream(), + fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG), testNdf, mockComms, testManager.Session, nil) quitChan := make(chan struct{}) @@ -207,7 +207,7 @@ func TestManager_ProcessMessageRetrieval_FalsePositive(t *testing.T) { p := gateway.DefaultPoolParams() p.PoolSize = 1 testManager.sender, _ = gateway.NewSender(p, - fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG).GetStream(), + fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG), testNdf, mockComms, testManager.Session, nil) // Create a local channel so reception is possible (testManager.messageBundles is @@ -352,7 +352,7 @@ func TestManager_ProcessMessageRetrieval_MultipleGateways(t *testing.T) { p := gateway.DefaultPoolParams() p.PoolSize = 1 testManager.sender, _ = gateway.NewSender(p, - fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG).GetStream(), + fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG), testNdf, mockComms, testManager.Session, nil) // Create a local channel so reception is possible (testManager.messageBundles is