From 2b243d52056157d2fb34a12392ce65c1490cdf0f Mon Sep 17 00:00:00 2001
From: benjamin <ben@elixxir.io>
Date: Wed, 5 Oct 2022 10:01:55 -0700
Subject: [PATCH] fixed tests
---
channels/manager.go | 2 +-
channels/sendTracker_test.go | 24 ++++++++++++++++++------
channels/send_test.go | 20 +++++++++++++++-----
3 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/channels/manager.go b/channels/manager.go
index cfede7fdf..f3de1b863 100644
--- a/channels/manager.go
+++ b/channels/manager.go
@@ -143,7 +143,7 @@ func setupManager(identity cryptoChannel.PrivateIdentity, kv *versioned.KV,
m.events = initEvents(model)
m.st = loadSendTracker(net, kv, m.events.triggerEvent,
- m.events.triggerAdminEvent, model.UpdateSentStatus)
+ m.events.triggerAdminEvent, model.UpdateSentStatus, rng)
m.loadChannels()
diff --git a/channels/sendTracker_test.go b/channels/sendTracker_test.go
index 5210b20e6..c2062c6d8 100644
--- a/channels/sendTracker_test.go
+++ b/channels/sendTracker_test.go
@@ -7,8 +7,10 @@ import (
"gitlab.com/elixxir/client/cmix/rounds"
"gitlab.com/elixxir/client/storage/versioned"
cryptoChannel "gitlab.com/elixxir/crypto/channel"
+ "gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/ekv"
"gitlab.com/elixxir/primitives/states"
+ "gitlab.com/xx_network/crypto/csprng"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/id/ephemeral"
"gitlab.com/xx_network/primitives/netTime"
@@ -67,7 +69,9 @@ func TestSendTracker_MessageReceive(t *testing.T) {
cid := id.NewIdFromString("channel", id.User, t)
- st := loadSendTracker(&mockClient{}, kv, trigger, nil, updateStatus)
+ crng := fastRNG.NewStreamGenerator(100, 5, csprng.NewSystemRNG)
+
+ st := loadSendTracker(&mockClient{}, kv, trigger, nil, updateStatus, crng)
mid := cryptoChannel.MakeMessageID([]byte("hello"), cid)
process := st.MessageReceive(mid, r)
@@ -140,7 +144,9 @@ func TestSendTracker_failedSend(t *testing.T) {
triggerCh <- status
}
- st := loadSendTracker(&mockClient{}, kv, nil, adminTrigger, updateStatus)
+ crng := fastRNG.NewStreamGenerator(100, 5, csprng.NewSystemRNG)
+
+ st := loadSendTracker(&mockClient{}, kv, nil, adminTrigger, updateStatus, crng)
cid := id.NewIdFromString("channel", id.User, t)
mid := cryptoChannel.MakeMessageID([]byte("hello"), cid)
@@ -206,7 +212,9 @@ func TestSendTracker_send(t *testing.T) {
triggerCh <- true
}
- st := loadSendTracker(&mockClient{}, kv, trigger, nil, updateStatus)
+ crng := fastRNG.NewStreamGenerator(100, 5, csprng.NewSystemRNG)
+
+ st := loadSendTracker(&mockClient{}, kv, trigger, nil, updateStatus, crng)
cid := id.NewIdFromString("channel", id.User, t)
mid := cryptoChannel.MakeMessageID([]byte("hello"), cid)
@@ -265,7 +273,9 @@ func TestSendTracker_send(t *testing.T) {
func TestSendTracker_load_store(t *testing.T) {
kv := versioned.NewKV(ekv.MakeMemstore())
- st := loadSendTracker(&mockClient{}, kv, nil, nil, nil)
+ crng := fastRNG.NewStreamGenerator(100, 5, csprng.NewSystemRNG)
+
+ st := loadSendTracker(&mockClient{}, kv, nil, nil, nil, crng)
cid := id.NewIdFromString("channel", id.User, t)
mid := cryptoChannel.MakeMessageID([]byte("hello"), cid)
rid := id.Round(2)
@@ -275,7 +285,7 @@ func TestSendTracker_load_store(t *testing.T) {
t.Fatalf("Failed to store byRound: %+v", err)
}
- st2 := loadSendTracker(&mockClient{}, kv, nil, nil, nil)
+ st2 := loadSendTracker(&mockClient{}, kv, nil, nil, nil, crng)
if len(st2.byRound) != len(st.byRound) {
t.Fatalf("byRound was not properly loaded")
}
@@ -294,7 +304,9 @@ func TestRoundResult_callback(t *testing.T) {
return 0, nil
}
- st := loadSendTracker(&mockClient{}, kv, trigger, nil, update)
+ crng := fastRNG.NewStreamGenerator(100, 5, csprng.NewSystemRNG)
+
+ st := loadSendTracker(&mockClient{}, kv, trigger, nil, update, crng)
cid := id.NewIdFromString("channel", id.User, t)
mid := cryptoChannel.MakeMessageID([]byte("hello"), cid)
diff --git a/channels/send_test.go b/channels/send_test.go
index 5da301092..c3c8114c8 100644
--- a/channels/send_test.go
+++ b/channels/send_test.go
@@ -152,6 +152,8 @@ func TestSendGeneric(t *testing.T) {
t.Fatalf(err.Error())
}
+ crng := fastRNG.NewStreamGenerator(100, 5, csprng.NewSystemRNG)
+
m := &manager{
me: pi,
channels: make(map[id.ID]*joinedChannel),
@@ -173,7 +175,7 @@ func TestSendGeneric(t *testing.T) {
return 0, nil
}, func(uuid uint64, messageID cryptoChannel.MessageID,
timestamp time.Time, round rounds.Round, status SentStatus) {
- }),
+ }, crng),
}
channelID := new(id.ID)
@@ -240,6 +242,8 @@ func TestAdminGeneric(t *testing.T) {
t.Fatalf(err.Error())
}
+ crng := fastRNG.NewStreamGenerator(100, 5, csprng.NewSystemRNG)
+
m := &manager{
channels: make(map[id.ID]*joinedChannel),
nicknameManager: &nicknameManager{
@@ -260,7 +264,7 @@ func TestAdminGeneric(t *testing.T) {
return 0, nil
}, func(uuid uint64, messageID cryptoChannel.MessageID,
timestamp time.Time, round rounds.Round, status SentStatus) {
- }),
+ }, crng),
}
messageType := Text
@@ -330,6 +334,8 @@ func TestSendMessage(t *testing.T) {
t.Fatalf(err.Error())
}
+ crng := fastRNG.NewStreamGenerator(100, 5, csprng.NewSystemRNG)
+
m := &manager{
me: pi,
channels: make(map[id.ID]*joinedChannel),
@@ -350,7 +356,7 @@ func TestSendMessage(t *testing.T) {
return 0, nil
}, func(uuid uint64, messageID cryptoChannel.MessageID,
timestamp time.Time, round rounds.Round, status SentStatus) {
- }),
+ }, crng),
}
channelID := new(id.ID)
@@ -425,6 +431,8 @@ func TestSendReply(t *testing.T) {
t.Fatalf(err.Error())
}
+ crng := fastRNG.NewStreamGenerator(100, 5, csprng.NewSystemRNG)
+
m := &manager{
me: pi,
channels: make(map[id.ID]*joinedChannel),
@@ -445,7 +453,7 @@ func TestSendReply(t *testing.T) {
return 0, nil
}, func(uuid uint64, messageID cryptoChannel.MessageID,
timestamp time.Time, round rounds.Round, status SentStatus) {
- }),
+ }, crng),
}
channelID := new(id.ID)
@@ -520,6 +528,8 @@ func TestSendReaction(t *testing.T) {
t.Fatalf(err.Error())
}
+ crng := fastRNG.NewStreamGenerator(100, 5, csprng.NewSystemRNG)
+
m := &manager{
me: pi,
nicknameManager: &nicknameManager{
@@ -540,7 +550,7 @@ func TestSendReaction(t *testing.T) {
return 0, nil
}, func(uuid uint64, messageID cryptoChannel.MessageID,
timestamp time.Time, round rounds.Round, status SentStatus) {
- }),
+ }, crng),
}
channelID := new(id.ID)
--
GitLab