diff --git a/cmix/identity/receptionID/registration_test.go b/cmix/identity/receptionID/registration_test.go index 2c9d16d3aa89fe5a3417e40af5fd72b0dd32310b..cd8d608ac725c1750c99b723c3528f46719020fe 100644 --- a/cmix/identity/receptionID/registration_test.go +++ b/cmix/identity/receptionID/registration_test.go @@ -16,7 +16,7 @@ import ( // 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 = time.Time{} // id.ExtraChecks = 0 diff --git a/fileTransfer/manager_test.go b/fileTransfer/manager_test.go index c92e79481516b1966344ff9c3a29b3a7316cd145..7245028f3b15f5ceff44bcfa2e527ec3c10088a9 100644 --- a/fileTransfer/manager_test.go +++ b/fileTransfer/manager_test.go @@ -100,7 +100,7 @@ func Test_FileTransfer_Smoke(t *testing.T) { tid, fileName, fileType, sender, size, preview} } myID1 := id.NewIdFromString("myID1", id.User, t) - kv1 := versioned.NewKV(make(ekv.Memstore)) + kv1 := versioned.NewKV(ekv.MakeMemstore()) endE2eChan1 := make(chan receive.Message, 3) e2e1 := newMockE2e(myID1, e2eHandler) e2e1.RegisterListener( @@ -125,7 +125,7 @@ func Test_FileTransfer_Smoke(t *testing.T) { tid, fileName, fileType, sender, size, preview} } myID2 := id.NewIdFromString("myID2", id.User, t) - kv2 := versioned.NewKV(make(ekv.Memstore)) + kv2 := versioned.NewKV(ekv.MakeMemstore()) endE2eChan2 := make(chan receive.Message, 3) e2e2 := newMockE2e(myID1, e2eHandler) e2e2.RegisterListener( diff --git a/fileTransfer/store/cypher/manager_test.go b/fileTransfer/store/cypher/manager_test.go index ea86d1baba7eece93b3ed26116efa252e54b1e78..c1857b7ae4920b0c26decdfb98752b0fc59acf74 100644 --- a/fileTransfer/store/cypher/manager_test.go +++ b/fileTransfer/store/cypher/manager_test.go @@ -21,7 +21,7 @@ import ( // Tests that NewManager returns a new Manager that matches the expected // manager. func TestNewManager(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) numFps := uint16(64) fpv, _ := utility.NewStateVector(kv.Prefix(cypherManagerPrefix), cypherManagerFpVectorKey, uint32(numFps)) @@ -134,7 +134,7 @@ func TestManager_Delete(t *testing.T) { // Tests that a transfer key saved via saveKey can be loaded via loadKey. func Test_saveKey_loadKey(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) key := &ftCrypto.TransferKey{42} err := saveKey(key, kv) @@ -160,7 +160,7 @@ func newTestManager(numFps uint16, t *testing.T) (*Manager, *versioned.KV) { t.Errorf("Failed to generate transfer key: %+v", err) } - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) m, err := NewManager(&key, numFps, kv) if err != nil { t.Errorf("Failed to make new Manager: %+v", err) diff --git a/fileTransfer/store/receivedTransfer_test.go b/fileTransfer/store/receivedTransfer_test.go index 0f2c16cca43a883a2515e6c77363daded6c1bc3c..81c3f4ced87d415c4bd61262854e9eb6bdfa453c 100644 --- a/fileTransfer/store/receivedTransfer_test.go +++ b/fileTransfer/store/receivedTransfer_test.go @@ -23,7 +23,7 @@ import ( // Tests that newReceivedTransfer returns a new ReceivedTransfer with the // expected values. func Test_newReceivedTransfer(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) key, _ := ftCrypto.NewTransferKey(csprng.NewSystemRNG()) tid, _ := ftCrypto.NewTransferID(csprng.NewSystemRNG()) numFps := uint16(24) @@ -320,7 +320,7 @@ func TestReceivedTransfer_save(t *testing.T) { // newTestReceivedTransfer creates a new ReceivedTransfer for testing. func newTestReceivedTransfer(numParts uint16, t *testing.T) ( *ReceivedTransfer, *ftCrypto.TransferKey, uint16, *versioned.KV) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) key, _ := ftCrypto.NewTransferKey(csprng.NewSystemRNG()) tid, _ := ftCrypto.NewTransferID(csprng.NewSystemRNG()) transferMAC := []byte("I am a transfer MAC") @@ -382,7 +382,7 @@ func TestReceivedTransfer_marshal_unmarshalReceivedTransfer(t *testing.T) { // Tests that the part saved to storage via savePart can be loaded. func Test_savePart_loadPart(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) part := []byte("I am a part.") partNum := 18 diff --git a/fileTransfer/store/received_test.go b/fileTransfer/store/received_test.go index 83134227235484bee889d6c4a1a1a433450caa3a..83aa45f90e6fb2250ca26d1cbc5c7f28c34d73a3 100644 --- a/fileTransfer/store/received_test.go +++ b/fileTransfer/store/received_test.go @@ -23,7 +23,7 @@ import ( // Tests that NewOrLoadReceived returns a new Received when none exist in // storage and that the list of incomplete transfers is nil. func TestNewOrLoadReceived_New(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) expected := &Received{ transfers: make(map[ftCrypto.TransferID]*ReceivedTransfer), kv: kv.Prefix(receivedTransfersStorePrefix), @@ -48,7 +48,7 @@ func TestNewOrLoadReceived_New(t *testing.T) { // Tests that NewOrLoadReceived returns a loaded Received when one exist in // storage and that the list of incomplete transfers is correct. func TestNewOrLoadReceived_Load(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) r, _, err := NewOrLoadReceived(kv) if err != nil { t.Errorf("Failed to make new Received: %+v", err) @@ -101,7 +101,7 @@ func TestNewOrLoadReceived_Load(t *testing.T) { // Tests that Received.AddTransfer makes a new transfer and adds it to the list. func TestReceived_AddTransfer(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) r, _, _ := NewOrLoadReceived(kv) key, _ := ftCrypto.NewTransferKey(csprng.NewSystemRNG()) @@ -137,7 +137,7 @@ func TestReceived_AddTransfer_TransferAlreadyExists(t *testing.T) { // Tests that Received.GetTransfer returns the expected transfer. func TestReceived_GetTransfer(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) r, _, _ := NewOrLoadReceived(kv) key, _ := ftCrypto.NewTransferKey(csprng.NewSystemRNG()) @@ -163,7 +163,7 @@ func TestReceived_GetTransfer(t *testing.T) { // Tests that Sent.RemoveTransfer removes the transfer from the list. func TestReceived_RemoveTransfer(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) r, _, _ := NewOrLoadReceived(kv) key, _ := ftCrypto.NewTransferKey(csprng.NewSystemRNG()) @@ -201,7 +201,7 @@ func TestReceived_RemoveTransfer(t *testing.T) { // Tests that Received.save saves the transfer ID list to storage by trying to // load it after a save. func TestReceived_save(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) r, _, _ := NewOrLoadReceived(kv) r.transfers = map[ftCrypto.TransferID]*ReceivedTransfer{ ftCrypto.TransferID{0}: nil, ftCrypto.TransferID{1}: nil, diff --git a/fileTransfer/store/sentTransfer_test.go b/fileTransfer/store/sentTransfer_test.go index e2999646b85cc334642da0a7289ed699c5a7eb5b..7d44dd65b883844f4778693362108bc58994e76c 100644 --- a/fileTransfer/store/sentTransfer_test.go +++ b/fileTransfer/store/sentTransfer_test.go @@ -27,7 +27,7 @@ import ( // Tests that newSentTransfer returns a new SentTransfer with the expected // values. func Test_newSentTransfer(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) key, _ := ftCrypto.NewTransferKey(csprng.NewSystemRNG()) tid, _ := ftCrypto.NewTransferID(csprng.NewSystemRNG()) numFps := uint16(24) @@ -439,7 +439,7 @@ const numPrimeBytes = 512 // newTestSentTransfer creates a new SentTransfer for testing. func newTestSentTransfer(numParts uint16, t *testing.T) ( *SentTransfer, [][]byte, *ftCrypto.TransferKey, uint16, *versioned.KV) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) recipient := id.NewIdFromString("recipient", id.User, t) key, _ := ftCrypto.NewTransferKey(csprng.NewSystemRNG()) tid, _ := ftCrypto.NewTransferID(csprng.NewSystemRNG()) diff --git a/fileTransfer/store/sent_test.go b/fileTransfer/store/sent_test.go index 9a25c329c3398fa5c13b885bd8f9856e0883c0d2..b6debe981429ccc40ff1898dfdb4cef47c185441 100644 --- a/fileTransfer/store/sent_test.go +++ b/fileTransfer/store/sent_test.go @@ -24,7 +24,7 @@ import ( // Tests that NewOrLoadSent returns a new Sent when none exist in storage and // that the list of unsent parts is nil. func TestNewOrLoadSent_New(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) expected := &Sent{ transfers: make(map[ftCrypto.TransferID]*SentTransfer), kv: kv.Prefix(sentTransfersStorePrefix), @@ -49,7 +49,7 @@ func TestNewOrLoadSent_New(t *testing.T) { // Tests that NewOrLoadSent returns a loaded Sent when one exist in storage and // that the list of unsent parts is correct. func TestNewOrLoadSent_Load(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) s, _, err := NewOrLoadSent(kv) if err != nil { t.Errorf("Failed to make new Sent: %+v", err) @@ -118,7 +118,7 @@ func TestNewOrLoadSent_Load(t *testing.T) { // Tests that Sent.AddTransfer makes a new transfer and adds it to the list. func TestSent_AddTransfer(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) s, _, _ := NewOrLoadSent(kv) key, _ := ftCrypto.NewTransferKey(csprng.NewSystemRNG()) @@ -154,7 +154,7 @@ func TestSent_AddTransfer_TransferAlreadyExists(t *testing.T) { // Tests that Sent.GetTransfer returns the expected transfer. func TestSent_GetTransfer(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) s, _, _ := NewOrLoadSent(kv) key, _ := ftCrypto.NewTransferKey(csprng.NewSystemRNG()) @@ -180,7 +180,7 @@ func TestSent_GetTransfer(t *testing.T) { // Tests that Sent.RemoveTransfer removes the transfer from the list. func TestSent_RemoveTransfer(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) s, _, _ := NewOrLoadSent(kv) key, _ := ftCrypto.NewTransferKey(csprng.NewSystemRNG()) @@ -218,7 +218,7 @@ func TestSent_RemoveTransfer(t *testing.T) { // Tests that Sent.save saves the transfer ID list to storage by trying to load // it after a save. func TestSent_save(t *testing.T) { - kv := versioned.NewKV(make(ekv.Memstore)) + kv := versioned.NewKV(ekv.MakeMemstore()) s, _, _ := NewOrLoadSent(kv) s.transfers = map[ftCrypto.TransferID]*SentTransfer{ ftCrypto.TransferID{0}: nil, ftCrypto.TransferID{1}: nil, diff --git a/storage/utility/knownRounds_test.go b/storage/utility/knownRounds_test.go index 80f8b43582c44c156e6af64536b64f55714521aa..e7a3a25f8ec33b7d11886b457863e90f48819109 100644 --- a/storage/utility/knownRounds_test.go +++ b/storage/utility/knownRounds_test.go @@ -12,7 +12,7 @@ package utility func TestNewKnownRounds(t *testing.T) { // Set up expected value size := 10 - rootKv := versioned.NewKV(make(ekv.Memstore)) + rootKv := versioned.NewKV(ekv.MakeMemstore()) expectedKR := &KnownRounds{ rounds: knownRounds.NewKnownRound(size), kv: rootKv.Prefix(knownRoundsPrefix), @@ -37,7 +37,7 @@ func TestNewKnownRounds(t *testing.T) { func TestLoadKnownRounds(t *testing.T) { // Set up expected value size := 10 - rootKv := versioned.NewKV(make(ekv.Memstore)) + rootKv := versioned.NewKV(ekv.MakeMemstore()) expectedKR := &KnownRounds{ rounds: knownRounds.NewKnownRound(size), kv: rootKv.Prefix(knownRoundsPrefix), @@ -76,7 +76,7 @@ func TestKnownRounds_save(t *testing.T) { size := 10 expectedKR := &KnownRounds{ rounds: knownRounds.NewKnownRound(size), - kv: versioned.NewKV(make(ekv.Memstore)), + kv: versioned.NewKV(ekv.MakeMemstore()), key: "testKey", } for i := 0; i < (size * 64); i++ { @@ -116,7 +116,7 @@ func TestKnownRounds_save(t *testing.T) { // size := 10 // expectedKR := &KnownRounds{ // rounds: knownRounds.NewKnownRound(size), -// kv: versioned.NewKV(make(ekv.Memstore)), +// kv: versioned.NewKV(ekv.MakeMemstore()), // key: "testKey", // } // for i := 0; i < (size * 64); i++ { @@ -148,7 +148,7 @@ func TestKnownRounds_save(t *testing.T) { func TestKnownRounds_Smoke(t *testing.T) { k := knownRounds.NewKnownRound(10) - kr, err := NewKnownRounds(versioned.NewKV(make(ekv.Memstore)), "testKey", k) + kr, err := NewKnownRounds(versioned.NewKV(ekv.MakeMemstore()), "testKey", k) if err != nil { t.Fatalf("Failed to create new KnownRounds: %v", err) }