diff --git a/storage/fileTransfer/receiveFileTransfers.go b/storage/fileTransfer/receiveFileTransfers.go index a504676a604ab30e2ba30b34992cbf6778e70dc8..0c7bffdc6881e96fd79026deb58c98195b05dfbf 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 4c8799f9bc644ad0b6eb5eb7c16eac40d48dbcbf..1bbbbd826c3f65142143ab4186400d559fe45bd7 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 "+