diff --git a/cmix/address/addressSpace_test.go b/cmix/address/addressSpace_test.go
index a4622524077737286099d407aa6a4a5e74cfbd5b..1930a7121c1c2d21f5e5fc76318ffa325cea71ee 100644
--- a/cmix/address/addressSpace_test.go
+++ b/cmix/address/addressSpace_test.go
@@ -8,6 +8,8 @@ import (
"time"
)
+var initSize uint8 = 8
+
// Unit test of NewAddressSpace.
func TestNewAddressSpace(t *testing.T) {
expected := &space{
@@ -16,7 +18,7 @@ func TestNewAddressSpace(t *testing.T) {
cond: sync.NewCond(&sync.Mutex{}),
}
- as := NewAddressSpace()
+ as := NewAddressSpace(initSize)
if !reflect.DeepEqual(expected, as) {
t.Errorf("NewAddressSpace failed to return the expected Space."+
@@ -27,7 +29,7 @@ func TestNewAddressSpace(t *testing.T) {
// Test that Space.GetAddressSpace blocks when the address space size has not
// been set and that it does not block when it has been set.
func TestSpace_GetAddressSpace(t *testing.T) {
- as := NewAddressSpace()
+ as := NewAddressSpace(8)
expectedSize := uint8(42)
// Call get and error if it does not block
@@ -60,7 +62,7 @@ func TestSpace_GetAddressSpace(t *testing.T) {
// Test that Space.GetAddressSpace blocks until the condition broadcasts.
func TestSpace_GetAddressSpace_WaitBroadcast(t *testing.T) {
- as := NewAddressSpace()
+ as := NewAddressSpace(initSize)
wait := make(chan uint8)
go func() { wait <- as.GetAddressSpace() }()
@@ -84,7 +86,7 @@ func TestSpace_GetAddressSpace_WaitBroadcast(t *testing.T) {
// Unit test of Space.GetAddressSpaceWithoutWait.
func TestSpace_GetAddressSpaceWithoutWait(t *testing.T) {
- as := NewAddressSpace()
+ as := NewAddressSpace(initSize)
size := as.GetAddressSpaceWithoutWait()
if size != initSize {
@@ -95,7 +97,7 @@ func TestSpace_GetAddressSpaceWithoutWait(t *testing.T) {
// Tests that Space.UpdateAddressSpace only updates the size when it is larger.
func TestSpace_UpdateAddressSpace(t *testing.T) {
- as := NewAddressSpace()
+ as := NewAddressSpace(initSize)
expectedSize := uint8(42)
// Attempt to Update to larger size
@@ -116,7 +118,7 @@ func TestSpace_UpdateAddressSpace(t *testing.T) {
// Tests that Space.UpdateAddressSpace sends the new size to all registered
// channels.
func TestSpace_UpdateAddressSpace_GetAndChannels(t *testing.T) {
- as := NewAddressSpace()
+ as := NewAddressSpace(initSize)
var wg sync.WaitGroup
expectedSize := uint8(42)
@@ -230,7 +232,7 @@ func TestSpace_UpdateAddressSpace_GetAndChannels(t *testing.T) {
// Tests that a channel created by Space.RegisterAddressSpaceNotification
// receives the expected size when triggered.
func TestSpace_RegisterAddressSpaceNotification(t *testing.T) {
- as := NewAddressSpace()
+ as := NewAddressSpace(initSize)
expectedSize := uint8(42)
// Register channel
@@ -264,7 +266,7 @@ func TestSpace_RegisterAddressSpaceNotification(t *testing.T) {
// Tests that when Space.UnregisterAddressSpaceNotification unregisters a
// channel and that it no longer can be triggered from the map.
func TestSpace_UnregisterAddressSpaceNotification(t *testing.T) {
- as := NewAddressSpace()
+ as := NewAddressSpace(initSize)
expectedSize := uint8(42)
// Register channel and then unregister it
diff --git a/cmix/identity/receptionID/identity_test.go b/cmix/identity/receptionID/identity_test.go
index 61c038def3eb2e432ffa9bab4a7534f6d20b4c04..d1f26598684daad8550cf5476ba04b163023f956 100644
--- a/cmix/identity/receptionID/identity_test.go
+++ b/cmix/identity/receptionID/identity_test.go
@@ -12,7 +12,7 @@ import (
)
func TestIdentity_store_loadIdentity(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
r := Identity{
EphemeralIdentity: EphemeralIdentity{
EphId: ephemeral.Id{},
@@ -43,7 +43,7 @@ func TestIdentity_store_loadIdentity(t *testing.T) {
}
func TestIdentity_delete(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
r := Identity{
EphemeralIdentity: EphemeralIdentity{
EphId: ephemeral.Id{},
diff --git a/cmix/identity/receptionID/registration_test.go b/cmix/identity/receptionID/registration_test.go
index b93665dc29d7265c36a2f95391c6500826ca095b..2c9d16d3aa89fe5a3417e40af5fd72b0dd32310b 100644
--- a/cmix/identity/receptionID/registration_test.go
+++ b/cmix/identity/receptionID/registration_test.go
@@ -37,7 +37,7 @@ func Test_newRegistration_Ephemeral(t *testing.T) {
timestamp := time.Date(2009, 11, 17, 20, 34, 58, 651387237, time.UTC)
idu, _ := generateFakeIdentity(rng, 15, timestamp)
id := idu.Identity
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
id.End = netTime.Now().Add(1 * time.Hour)
id.ExtraChecks = 2
@@ -61,7 +61,7 @@ func Test_newRegistration_Persistent(t *testing.T) {
timestamp := time.Date(2009, 11, 17, 20, 34, 58, 651387237, time.UTC)
idu, _ := generateFakeIdentity(rng, 15, timestamp)
id := idu.Identity
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
id.End = netTime.Now().Add(1 * time.Hour)
id.ExtraChecks = 2
@@ -85,7 +85,7 @@ func Test_loadRegistration(t *testing.T) {
timestamp := time.Date(2009, 11, 17, 20, 34, 58, 651387237, time.UTC)
idu, _ := generateFakeIdentity(rng, 15, timestamp)
id := idu.Identity
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
id.End = netTime.Now().Add(1 * time.Hour)
id.ExtraChecks = 2
@@ -111,7 +111,7 @@ func Test_registration_Delete(t *testing.T) {
timestamp := time.Date(2009, 11, 17, 20, 34, 58, 651387237, time.UTC)
idu, _ := generateFakeIdentity(rng, 15, timestamp)
id := idu.Identity
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
id.End = netTime.Now().Add(1 * time.Hour)
id.ExtraChecks = 2
diff --git a/cmix/identity/receptionID/store/checkedRounds_test.go b/cmix/identity/receptionID/store/checkedRounds_test.go
index f3423efaa8868639df807efadd430ed3c8464530..5ddc5984d10dab0502982d0a1c98761bc13801ce 100644
--- a/cmix/identity/receptionID/store/checkedRounds_test.go
+++ b/cmix/identity/receptionID/store/checkedRounds_test.go
@@ -14,7 +14,7 @@ import (
// Happy path of NewCheckedRounds.
func TestNewCheckedRounds(t *testing.T) {
maxRounds := 230
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
// Create a new BlockStore for storing the round IDs to storage
store, err := utility.NewBlockStore(
@@ -46,7 +46,7 @@ func TestNewCheckedRounds(t *testing.T) {
// matches the original.
func TestCheckedRounds_SaveCheckedRounds_TestLoadCheckedRounds(t *testing.T) {
// Create new CheckedRounds and add rounds to it
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
cr, err := NewCheckedRounds(50, kv)
if err != nil {
t.Errorf("Failed to make new CheckedRounds: %+v", err)
diff --git a/cmix/identity/receptionID/store/unknownRounds_test.go b/cmix/identity/receptionID/store/unknownRounds_test.go
index 79cb737b7773e7a5fd958cd9fe6a9d377bfe1bab..f8beea3a7adbdd8c6fc52514ffb6950280014982 100644
--- a/cmix/identity/receptionID/store/unknownRounds_test.go
+++ b/cmix/identity/receptionID/store/unknownRounds_test.go
@@ -20,7 +20,7 @@ import (
// Happy path
func TestNewUnknownRounds(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
expectedStore := &UnknownRounds{
rounds: make(map[id.Round]*uint64),
kv: kv.Prefix(unknownRoundPrefix),
@@ -59,7 +59,7 @@ func TestNewUnknownRounds(t *testing.T) {
// Full test.
func TestUnknownRounds_Iterate(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
store := NewUnknownRounds(kv, DefaultUnknownRoundsParams())
// Return true only for rounds that are even
@@ -128,7 +128,7 @@ func TestUnknownRounds_Iterate(t *testing.T) {
// Unit test
func TestLoadUnknownRounds(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
store := NewUnknownRounds(kv, DefaultUnknownRoundsParams())
// Construct 3 lists of round IDs
diff --git a/cmix/identity/receptionID/store_test.go b/cmix/identity/receptionID/store_test.go
index cf5c4624f72d9c40e311eddd7a9f83d0d3527ecd..19a53f97b11a9e7abaef0ecf3c2c0c1698602105 100644
--- a/cmix/identity/receptionID/store_test.go
+++ b/cmix/identity/receptionID/store_test.go
@@ -13,7 +13,7 @@ import (
)
func TestNewOrLoadStore_New(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
expected := &Store{
active: make([]*registration, 0),
kv: kv,
@@ -43,7 +43,7 @@ func TestNewOrLoadStore_New(t *testing.T) {
}
func TestNewOrLoadStore_Load(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
s := NewOrLoadStore(kv)
prng := rand.New(rand.NewSource(42))
@@ -74,7 +74,7 @@ func TestNewOrLoadStore_Load(t *testing.T) {
}
func TestStore_save(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
s := NewOrLoadStore(kv)
prng := rand.New(rand.NewSource(42))
@@ -113,7 +113,7 @@ func TestStore_save(t *testing.T) {
}
func TestStore_makeStoredReferences(t *testing.T) {
- s := NewOrLoadStore(versioned.NewKV(make(ekv.Memstore)))
+ s := NewOrLoadStore(versioned.NewKV(ekv.MakeMemstore()))
prng := rand.New(rand.NewSource(42))
expected := make([]storedReference, 0)
@@ -142,7 +142,7 @@ func TestStore_makeStoredReferences(t *testing.T) {
}
func TestStore_GetIdentity(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
s := NewOrLoadStore(kv)
prng := rand.New(rand.NewSource(42))
testID, err := generateFakeIdentity(prng, 15, netTime.Now())
@@ -165,7 +165,7 @@ func TestStore_GetIdentity(t *testing.T) {
}
func TestStore_AddIdentity(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
s := NewOrLoadStore(kv)
prng := rand.New(rand.NewSource(42))
testID, err := generateFakeIdentity(prng, 15, netTime.Now())
@@ -185,7 +185,7 @@ func TestStore_AddIdentity(t *testing.T) {
}
func TestStore_RemoveIdentity(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
s := NewOrLoadStore(kv)
prng := rand.New(rand.NewSource(42))
testID, err := generateFakeIdentity(prng, 15, netTime.Now())
@@ -204,7 +204,7 @@ func TestStore_RemoveIdentity(t *testing.T) {
}
func TestStore_prune(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
s := NewOrLoadStore(kv)
prng := rand.New(rand.NewSource(42))
runs := 10
@@ -239,7 +239,7 @@ func TestStore_prune(t *testing.T) {
}
func TestStore_selectIdentity(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
s := NewOrLoadStore(kv)
prng := rand.New(rand.NewSource(42))
runs := 10
diff --git a/cmix/identity/tracker_test.go b/cmix/identity/tracker_test.go
index f8b28740d7e41a00bf66eb1b55e3a459a986ff2d..5324331e76b14f779f7c742a92df32bfae0a1267 100644
--- a/cmix/identity/tracker_test.go
+++ b/cmix/identity/tracker_test.go
@@ -18,9 +18,11 @@ import (
"time"
)
+var initSize uint8 = 8
+
func TestManager_processIdentities_expired(t *testing.T) {
// Initialization
- addrSpace := address.NewAddressSpace()
+ addrSpace := address.NewAddressSpace(initSize)
addrSpace.UpdateAddressSpace(18)
session := storage.InitTestingSession(t)
m := &manager{
@@ -60,7 +62,7 @@ func TestManager_processIdentities_expired(t *testing.T) {
func TestManager_processIdentities(t *testing.T) {
jww.SetStdoutThreshold(jww.LevelDebug)
// Initialization
- addrSpace := address.NewAddressSpace()
+ addrSpace := address.NewAddressSpace(initSize)
addrSpace.UpdateAddressSpace(18)
session := storage.InitTestingSession(t)
m := &manager{
diff --git a/cmix/message/fingerprints_test.go b/cmix/message/fingerprints_test.go
index 6740f3a0878b3fbafad189807d50891fff4a6973..813e48a5a4123dbff0995fbc1f51e1aa38b0848b 100644
--- a/cmix/message/fingerprints_test.go
+++ b/cmix/message/fingerprints_test.go
@@ -9,8 +9,8 @@ package message
import (
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/cmix/rounds"
"gitlab.com/elixxir/client/cmix/identity/receptionID"
+ "gitlab.com/elixxir/client/cmix/rounds"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/xx_network/primitives/id"
"reflect"
@@ -177,3 +177,7 @@ func (mock *MockMsgProcessor) Process(
format.Message, receptionID.EphemeralIdentity, rounds.Round) {
return
}
+
+func (mock *MockMsgProcessor) String() string {
+ return ""
+}
diff --git a/cmix/message/inProgress_test.go b/cmix/message/inProgress_test.go
index bca0c64bf04ab4fa5c3858f814626018c282c981..be0dd901c40191e3523defc02457e016555cbf8e 100644
--- a/cmix/message/inProgress_test.go
+++ b/cmix/message/inProgress_test.go
@@ -22,7 +22,7 @@ func TestMain(m *testing.M) {
}
func TestHandler_CheckInProgressMessages(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
h := NewHandler(Params{
MessageReceptionBuffLen: 20,
MessageReceptionWorkerPoolSize: 20,
diff --git a/cmix/message/meteredCmixMessageBuffer_test.go b/cmix/message/meteredCmixMessageBuffer_test.go
index 6fed4e9e84d84aa7b1993b33b3f3242329d478d1..3dbb7a65d2cb39232fd34abedf5a505b90056450 100644
--- a/cmix/message/meteredCmixMessageBuffer_test.go
+++ b/cmix/message/meteredCmixMessageBuffer_test.go
@@ -27,7 +27,7 @@ import (
func Test_meteredCmixMessageHandler_SaveMessage(t *testing.T) {
// Set up test values
mcmh := &meteredCmixMessageHandler{}
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
testMsgs, _ := makeTestMeteredCmixMessage(10)
for _, msg := range testMsgs {
@@ -64,7 +64,7 @@ func Test_meteredCmixMessageHandler_SaveMessage(t *testing.T) {
func Test_meteredCmixMessageHandler_LoadMessage(t *testing.T) {
// Set up test values
mcmh := &meteredCmixMessageHandler{}
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
testMsgs, _ := makeTestMeteredCmixMessage(10)
for i, msg := range testMsgs {
@@ -98,7 +98,7 @@ func Test_meteredCmixMessageHandler_LoadMessage(t *testing.T) {
func Test_meteredCmixMessageHandler_DeleteMessage(t *testing.T) {
// Set up test values
mcmh := &meteredCmixMessageHandler{}
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
testMsgs, _ := makeTestMeteredCmixMessage(10)
for _, msg := range testMsgs {
@@ -131,7 +131,7 @@ func Test_meteredCmixMessageHandler_Smoke(t *testing.T) {
// Create new buffer
mcmb, err := NewMeteredCmixMessageBuffer(
- versioned.NewKV(make(ekv.Memstore)), "testKey")
+ versioned.NewKV(ekv.MakeMemstore()), "testKey")
if err != nil {
t.Errorf("NewMeteredCmixMessageBuffer() returned an error."+
"\nexpected: %v\nrecieved: %v", nil, err)
diff --git a/cmix/pickup/store/uncheckedRounds_test.go b/cmix/pickup/store/uncheckedRounds_test.go
index 0e8ba1393ddadd70943ed08048885e33b28832f6..8e4dbe052e75d5eb98fb98863be92d91200c54b4 100644
--- a/cmix/pickup/store/uncheckedRounds_test.go
+++ b/cmix/pickup/store/uncheckedRounds_test.go
@@ -21,7 +21,7 @@ import (
// Unit test
func TestNewUncheckedStore(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
testStore := &UncheckedRoundStore{
list: make(map[roundIdentity]UncheckedRound),
@@ -75,7 +75,7 @@ func TestNewUncheckedStore(t *testing.T) {
// Unit test.
func TestLoadUncheckedStore(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
testStore, err := NewUncheckedStore(kv)
if err != nil {
@@ -116,7 +116,7 @@ func TestLoadUncheckedStore(t *testing.T) {
// Unit test.
func TestUncheckedRoundStore_AddRound(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
testStore, err := NewUncheckedStore(kv)
if err != nil {
@@ -141,7 +141,7 @@ func TestUncheckedRoundStore_AddRound(t *testing.T) {
// Unit test.
func TestUncheckedRoundStore_GetRound(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
testStore, err := NewUncheckedStore(kv)
if err != nil {
@@ -188,7 +188,7 @@ func TestUncheckedRoundStore_GetRound(t *testing.T) {
// Tests that two identifies for the same round can be retrieved separately.
func TestUncheckedRoundStore_GetRound_TwoIDs(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
s, err := NewUncheckedStore(kv)
if err != nil {
@@ -261,7 +261,7 @@ func TestUncheckedRoundStore_GetRound_TwoIDs(t *testing.T) {
// Unit test
func TestUncheckedRoundStore_GetList(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
testStore, err := NewUncheckedStore(kv)
if err != nil {
@@ -302,7 +302,7 @@ func TestUncheckedRoundStore_GetList(t *testing.T) {
// Unit test.
func TestUncheckedRoundStore_IncrementCheck(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
testStore, err := NewUncheckedStore(kv)
if err != nil {
@@ -359,7 +359,7 @@ func TestUncheckedRoundStore_IncrementCheck(t *testing.T) {
// Unit test
func TestUncheckedRoundStore_Remove(t *testing.T) {
- kv := versioned.NewKV(make(ekv.Memstore))
+ kv := versioned.NewKV(ekv.MakeMemstore())
testStore, err := NewUncheckedStore(kv)
if err != nil {
t.Fatalf("Failed to make new UncheckedRoundStore: %+v", err)