Skip to content
Snippets Groups Projects
Commit 8992b2f5 authored by Jake Taylor's avatar Jake Taylor
Browse files

some test fixes

parent 8871ebf8
No related branches found
No related tags found
2 merge requests!510Release,!207WIP: Client Restructure
...@@ -104,7 +104,7 @@ func TestGroup_DeepCopy(t *testing.T) { ...@@ -104,7 +104,7 @@ func TestGroup_DeepCopy(t *testing.T) {
// Unit test of Group.store. // Unit test of Group.store.
func TestGroup_store(t *testing.T) { func TestGroup_store(t *testing.T) {
kv := versioned.NewKV(make(ekv.Memstore)) kv := versioned.NewKV(ekv.MakeMemstore())
g := createTestGroup(rand.New(rand.NewSource(42)), t) g := createTestGroup(rand.New(rand.NewSource(42)), t)
err := g.store(kv) err := g.store(kv)
...@@ -130,7 +130,7 @@ func TestGroup_store(t *testing.T) { ...@@ -130,7 +130,7 @@ func TestGroup_store(t *testing.T) {
// Unit test of Group.loadGroup. // Unit test of Group.loadGroup.
func Test_loadGroup(t *testing.T) { func Test_loadGroup(t *testing.T) {
kv := versioned.NewKV(make(ekv.Memstore)) kv := versioned.NewKV(ekv.MakeMemstore())
g := createTestGroup(rand.New(rand.NewSource(42)), t) g := createTestGroup(rand.New(rand.NewSource(42)), t)
err := g.store(kv) err := g.store(kv)
...@@ -151,7 +151,7 @@ func Test_loadGroup(t *testing.T) { ...@@ -151,7 +151,7 @@ func Test_loadGroup(t *testing.T) {
// Error path: an error is returned when no group with the ID exists in storage. // Error path: an error is returned when no group with the ID exists in storage.
func Test_loadGroup_InvalidGroupIdError(t *testing.T) { func Test_loadGroup_InvalidGroupIdError(t *testing.T) {
kv := versioned.NewKV(make(ekv.Memstore)) kv := versioned.NewKV(ekv.MakeMemstore())
g := createTestGroup(rand.New(rand.NewSource(42)), t) g := createTestGroup(rand.New(rand.NewSource(42)), t)
expectedErr := strings.SplitN(kvGetGroupErr, "%", 2)[0] expectedErr := strings.SplitN(kvGetGroupErr, "%", 2)[0]
...@@ -164,7 +164,7 @@ func Test_loadGroup_InvalidGroupIdError(t *testing.T) { ...@@ -164,7 +164,7 @@ func Test_loadGroup_InvalidGroupIdError(t *testing.T) {
// Unit test of Group.removeGroup. // Unit test of Group.removeGroup.
func Test_removeGroup(t *testing.T) { func Test_removeGroup(t *testing.T) {
kv := versioned.NewKV(make(ekv.Memstore)) kv := versioned.NewKV(ekv.MakeMemstore())
g := createTestGroup(rand.New(rand.NewSource(42)), t) g := createTestGroup(rand.New(rand.NewSource(42)), t)
err := g.store(kv) err := g.store(kv)
......
...@@ -22,7 +22,7 @@ import ( ...@@ -22,7 +22,7 @@ import (
// Unit test of Manager.newManager. // Unit test of Manager.newManager.
func Test_newManager(t *testing.T) { func Test_newManager(t *testing.T) {
kv := versioned.NewKV(make(ekv.Memstore)) kv := versioned.NewKV(ekv.MakeMemstore())
user := group.Member{ user := group.Member{
ID: id.NewIdFromString("userID", id.User, t), ID: id.NewIdFromString("userID", id.User, t),
DhKey: randCycInt(rand.New(rand.NewSource(42))), DhKey: randCycInt(rand.New(rand.NewSource(42))),
...@@ -66,7 +66,7 @@ func Test_newManager(t *testing.T) { ...@@ -66,7 +66,7 @@ func Test_newManager(t *testing.T) {
// Tests that Manager.newManager loads a group storage when it exists. // Tests that Manager.newManager loads a group storage when it exists.
func Test_newManager_LoadStorage(t *testing.T) { func Test_newManager_LoadStorage(t *testing.T) {
prng := rand.New(rand.NewSource(42)) prng := rand.New(rand.NewSource(42))
kv := versioned.NewKV(make(ekv.Memstore)) kv := versioned.NewKV(ekv.MakeMemstore())
user := group.Member{ user := group.Member{
ID: id.NewIdFromString("userID", id.User, t), ID: id.NewIdFromString("userID", id.User, t),
DhKey: randCycInt(rand.New(rand.NewSource(42))), DhKey: randCycInt(rand.New(rand.NewSource(42))),
...@@ -98,7 +98,7 @@ func Test_newManager_LoadStorage(t *testing.T) { ...@@ -98,7 +98,7 @@ func Test_newManager_LoadStorage(t *testing.T) {
// Error path: an error is returned when a group cannot be loaded from storage. // Error path: an error is returned when a group cannot be loaded from storage.
func Test_newManager_LoadError(t *testing.T) { func Test_newManager_LoadError(t *testing.T) {
prng := rand.New(rand.NewSource(42)) prng := rand.New(rand.NewSource(42))
kv := versioned.NewKV(make(ekv.Memstore)) kv := versioned.NewKV(ekv.MakeMemstore())
user := group.Member{ user := group.Member{
ID: id.NewIdFromString("userID", id.User, t), ID: id.NewIdFromString("userID", id.User, t),
DhKey: randCycInt(rand.New(rand.NewSource(42))), DhKey: randCycInt(rand.New(rand.NewSource(42))),
......
...@@ -57,7 +57,7 @@ func newTestManager(rng *rand.Rand, t *testing.T) (*Manager, gs.Group) { ...@@ -57,7 +57,7 @@ func newTestManager(rng *rand.Rand, t *testing.T) (*Manager, gs.Group) {
g := newTestGroupWithUser(m.grp, user.ID, user.DhKey, g := newTestGroupWithUser(m.grp, user.ID, user.DhKey,
m.e2e.GetHistoricalDHPrivkey(), rng, t) m.e2e.GetHistoricalDHPrivkey(), rng, t)
gStore, err := gs.NewStore(versioned.NewKV(make(ekv.Memstore)), user) gStore, err := gs.NewStore(versioned.NewKV(ekv.MakeMemstore()), user)
if err != nil { if err != nil {
t.Fatalf("Failed to create new group store: %+v", err) t.Fatalf("Failed to create new group store: %+v", err)
} }
...@@ -92,7 +92,7 @@ func newTestManagerWithStore(rng *rand.Rand, numGroups int, sendErr int, ...@@ -92,7 +92,7 @@ func newTestManagerWithStore(rng *rand.Rand, numGroups int, sendErr int,
DhKey: m.e2e.GetHistoricalDHPubkey(), DhKey: m.e2e.GetHistoricalDHPubkey(),
} }
gStore, err := gs.NewStore(versioned.NewKV(make(ekv.Memstore)), user) gStore, err := gs.NewStore(versioned.NewKV(ekv.MakeMemstore()), user)
if err != nil { if err != nil {
t.Fatalf("Failed to create new group store: %+v", err) t.Fatalf("Failed to create new group store: %+v", err)
} }
......
...@@ -11,8 +11,6 @@ import ( ...@@ -11,8 +11,6 @@ import (
"gitlab.com/elixxir/primitives/format" "gitlab.com/elixxir/primitives/format"
) )
const responseProcessorName = "responseProcessorName"
type callbackWrapper func(payload []byte, type callbackWrapper func(payload []byte,
receptionID receptionID.EphemeralIdentity, rounds []rounds.Round, err error) receptionID receptionID.EphemeralIdentity, rounds []rounds.Round, err error)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment