From e87a5c66dac2d77f7a31c14f980a3fca7d90d0ae Mon Sep 17 00:00:00 2001
From: David Stainton <dstainton@elixxir.io>
Date: Sat, 8 Jan 2022 13:19:53 -0500
Subject: [PATCH] fix addPartErr
---
storage/fileTransfer/receiveFileTransfers.go | 4 ++--
storage/fileTransfer/receiveFileTransfers_test.go | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/storage/fileTransfer/receiveFileTransfers.go b/storage/fileTransfer/receiveFileTransfers.go
index a504676a6..0c7bffdc6 100644
--- a/storage/fileTransfer/receiveFileTransfers.go
+++ b/storage/fileTransfer/receiveFileTransfers.go
@@ -35,7 +35,7 @@ const (
getReceivedTransferErr = "received transfer with ID %s not found"
addTransferNewIdErr = "could not generate new transfer ID: %+v"
noFingerprintErr = "no part found with fingerprint %s"
- addPartErr = "failed to add part number %d/%d to transfer %s: %+v"
+ addPartErr = "failed to add part to transfer %s: %+v"
deleteReceivedTransferErr = "failed to delete received transfer with ID %s from store: %+v"
)
@@ -201,7 +201,7 @@ func (rft *ReceivedFileTransfersStore) AddPart(cmixMsg format.Message) (*Receive
completed, err := transfer.AddPart(cmixMsg, info.fpNum)
if err != nil {
return transfer, info.id, false, errors.Errorf(
- addPartErr, transfer.numParts, info.id, err)
+ addPartErr, info.id, err)
}
// Remove the part info from the map
diff --git a/storage/fileTransfer/receiveFileTransfers_test.go b/storage/fileTransfer/receiveFileTransfers_test.go
index 4c8799f9b..1bbbbd826 100644
--- a/storage/fileTransfer/receiveFileTransfers_test.go
+++ b/storage/fileTransfer/receiveFileTransfers_test.go
@@ -478,7 +478,7 @@ func TestReceivedFileTransfersStore_AddPart_AddPartError(t *testing.T) {
fp := ftCrypto.GenerateFingerprint(key, fpNum)
// Add encrypted part
- expectedErr := fmt.Sprintf(addPartErr, partNum, numParts, tid, "")
+ expectedErr := fmt.Sprintf(addPartErr, tid, "")
cmixMsg := format.NewMessage(format.MinimumPrimeSize)
@@ -490,7 +490,6 @@ func TestReceivedFileTransfersStore_AddPart_AddPartError(t *testing.T) {
cmixMsg.SetContents(partData.Marshal())
cmixMsg.SetMac(mac)
-
_, _, _, err = rft.AddPart(cmixMsg)
if err == nil || !strings.Contains(err.Error(), expectedErr) {
t.Errorf("AddPart did not return the expected error when the "+
--
GitLab