From 4ae8e899bdfa146adb4e8d153db1367b8c107eda Mon Sep 17 00:00:00 2001
From: David Stainton <dstainton@elixxir.io>
Date: Sat, 8 Jan 2022 13:13:29 -0500
Subject: [PATCH] Fix tests in storage/fileTransfer/sentTransfer_test.go
---
storage/fileTransfer/sentTransfer_test.go | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/storage/fileTransfer/sentTransfer_test.go b/storage/fileTransfer/sentTransfer_test.go
index da835f58a..0885552c7 100644
--- a/storage/fileTransfer/sentTransfer_test.go
+++ b/storage/fileTransfer/sentTransfer_test.go
@@ -803,7 +803,6 @@ func TestSentTransfer_AddProgressCB(t *testing.T) {
func TestSentTransfer_GetEncryptedPart(t *testing.T) {
kv := versioned.NewKV(make(ekv.Memstore))
_, st := newRandomSentTransfer(16, 24, kv, t)
- prng := NewPrng(42)
// Create and fill fingerprint map used to check fingerprint validity
// The first item in the uint16 slice is the fingerprint number and the
@@ -816,7 +815,7 @@ func TestSentTransfer_GetEncryptedPart(t *testing.T) {
for i := uint16(0); i < st.numFps; i++ {
partNum := i % st.numParts
- encPart, mac, padding, fp, err := st.GetEncryptedPart(partNum, 16, prng)
+ encPart, mac, fp, err := st.GetEncryptedPart(partNum, 16)
if err != nil {
t.Fatalf("GetEncryptedPart returned an error for part number "+
"%d (%d): %+v", partNum, i, err)
@@ -836,7 +835,7 @@ func TestSentTransfer_GetEncryptedPart(t *testing.T) {
}
// Attempt to decrypt the part
- part, err := ftCrypto.DecryptPart(st.key, encPart, padding, mac, fpNum[0])
+ part, err := ftCrypto.DecryptPart(st.key, encPart, mac, fpNum[0], fp)
if err != nil {
t.Errorf("Failed to decrypt file part number %d (%d): %+v",
partNum, i, err)
@@ -856,12 +855,11 @@ func TestSentTransfer_GetEncryptedPart(t *testing.T) {
func TestSentTransfer_GetEncryptedPart_NoPartError(t *testing.T) {
kv := versioned.NewKV(make(ekv.Memstore))
_, st := newRandomSentTransfer(16, 24, kv, t)
- prng := NewPrng(42)
partNum := st.numParts + 1
expectedErr := fmt.Sprintf(noPartNumErr, partNum)
- _, _, _, _, err := st.GetEncryptedPart(partNum, 16, prng)
+ _, _, _, err := st.GetEncryptedPart(partNum, 16)
if err == nil || err.Error() != expectedErr {
t.Errorf("GetEncryptedPart did not return the expected error for a "+
"nonexistent part number %d.\nexpected: %s\nreceived: %+v",
@@ -874,12 +872,11 @@ func TestSentTransfer_GetEncryptedPart_NoPartError(t *testing.T) {
func TestSentTransfer_GetEncryptedPart_NoFingerprintsError(t *testing.T) {
kv := versioned.NewKV(make(ekv.Memstore))
_, st := newRandomSentTransfer(16, 24, kv, t)
- prng := NewPrng(42)
// Use up all the fingerprints
for i := uint16(0); i < st.numFps; i++ {
partNum := i % st.numParts
- _, _, _, _, err := st.GetEncryptedPart(partNum, 16, prng)
+ _, _, _, err := st.GetEncryptedPart(partNum, 16)
if err != nil {
t.Errorf("Error when encyrpting part number %d (%d): %+v",
partNum, i, err)
@@ -887,7 +884,7 @@ func TestSentTransfer_GetEncryptedPart_NoFingerprintsError(t *testing.T) {
}
// Try to encrypt without any fingerprints
- _, _, _, _, err := st.GetEncryptedPart(5, 16, prng)
+ _, _, _, err := st.GetEncryptedPart(5, 16)
if err != MaxRetriesErr {
t.Errorf("GetEncryptedPart did not return MaxRetriesErr when all "+
"fingerprints have been used.\nexpected: %s\nreceived: %+v",
@@ -900,7 +897,6 @@ func TestSentTransfer_GetEncryptedPart_NoFingerprintsError(t *testing.T) {
func TestSentTransfer_GetEncryptedPart_EncryptPartError(t *testing.T) {
kv := versioned.NewKV(make(ekv.Memstore))
_, st := newRandomSentTransfer(16, 24, kv, t)
- prng := NewPrngErr()
// Create and fill fingerprint map used to check fingerprint validity
// The first item in the uint16 slice is the fingerprint number and the
@@ -913,7 +909,7 @@ func TestSentTransfer_GetEncryptedPart_EncryptPartError(t *testing.T) {
partNum := uint16(0)
expectedErr := fmt.Sprintf(encryptPartErr, partNum, "")
- _, _, _, _, err := st.GetEncryptedPart(partNum, 16, prng)
+ _, _, _, err := st.GetEncryptedPart(partNum, 16)
if err == nil || !strings.Contains(err.Error(), expectedErr) {
t.Errorf("GetEncryptedPart did not return the expected error when "+
"the PRNG should have errored.\nexpected: %s\nreceived: %+v",
--
GitLab