From 8655b9251cdc706bfe1b5328988bf14bef35f59f Mon Sep 17 00:00:00 2001
From: Jono Wenger <jono@elixxir.io>
Date: Wed, 26 Oct 2022 09:59:04 -0700
Subject: [PATCH] Fix file transfer error print
---
fileTransfer/connect/utils_test.go | 10 ++++------
fileTransfer/e2e/utils_test.go | 10 ++++------
fileTransfer/groupChat/utils_test.go | 10 ++++------
fileTransfer/manager.go | 1 -
fileTransfer/store/received.go | 2 +-
fileTransfer/store/received_test.go | 6 +++---
fileTransfer/store/sent.go | 2 +-
fileTransfer/store/sent_test.go | 6 +++---
fileTransfer/utils_test.go | 10 ++++------
9 files changed, 24 insertions(+), 33 deletions(-)
diff --git a/fileTransfer/connect/utils_test.go b/fileTransfer/connect/utils_test.go
index 5910ac657..b707e548e 100644
--- a/fileTransfer/connect/utils_test.go
+++ b/fileTransfer/connect/utils_test.go
@@ -140,12 +140,10 @@ func (m *mockCmix) SendWithAssembler(*id.ID, cmix.MessageAssembler,
panic("implement me")
}
-func (m *mockCmix) AddIdentity(*id.ID, time.Time, bool) { panic("implement me") }
-func (m *mockCmix) AddIdentityWithHistory(id *id.ID, validUntil, beginning time.Time, persistent bool) {
- panic("implement me")
-}
-func (m *mockCmix) RemoveIdentity(*id.ID) { panic("implement me") }
-func (m *mockCmix) GetIdentity(*id.ID) (identity.TrackedID, error) { panic("implement me") }
+func (m *mockCmix) AddIdentity(*id.ID, time.Time, bool) { panic("implement me") }
+func (m *mockCmix) AddIdentityWithHistory(*id.ID, time.Time, time.Time, bool) { panic("implement me") }
+func (m *mockCmix) RemoveIdentity(*id.ID) { panic("implement me") }
+func (m *mockCmix) GetIdentity(*id.ID) (identity.TrackedID, error) { panic("implement me") }
func (m *mockCmix) AddFingerprint(_ *id.ID, fp format.Fingerprint, mp message.Processor) error {
m.Lock()
diff --git a/fileTransfer/e2e/utils_test.go b/fileTransfer/e2e/utils_test.go
index 1c33203a1..a7f50a195 100644
--- a/fileTransfer/e2e/utils_test.go
+++ b/fileTransfer/e2e/utils_test.go
@@ -142,12 +142,10 @@ func (m *mockCmix) SendWithAssembler(*id.ID, cmix.MessageAssembler,
panic("implement me")
}
-func (m *mockCmix) AddIdentity(*id.ID, time.Time, bool) { panic("implement me") }
-func (m *mockCmix) AddIdentityWithHistory(id *id.ID, validUntil, beginning time.Time, persistent bool) {
- panic("implement me")
-}
-func (m *mockCmix) RemoveIdentity(*id.ID) { panic("implement me") }
-func (m *mockCmix) GetIdentity(*id.ID) (identity.TrackedID, error) { panic("implement me") }
+func (m *mockCmix) AddIdentity(*id.ID, time.Time, bool) { panic("implement me") }
+func (m *mockCmix) AddIdentityWithHistory(*id.ID, time.Time, time.Time, bool) { panic("implement me") }
+func (m *mockCmix) RemoveIdentity(*id.ID) { panic("implement me") }
+func (m *mockCmix) GetIdentity(*id.ID) (identity.TrackedID, error) { panic("implement me") }
func (m *mockCmix) AddFingerprint(_ *id.ID, fp format.Fingerprint, mp message.Processor) error {
m.Lock()
diff --git a/fileTransfer/groupChat/utils_test.go b/fileTransfer/groupChat/utils_test.go
index b1f5f18d4..a616d65c1 100644
--- a/fileTransfer/groupChat/utils_test.go
+++ b/fileTransfer/groupChat/utils_test.go
@@ -137,12 +137,10 @@ func (m *mockCmix) SendWithAssembler(*id.ID, cmix.MessageAssembler,
panic("implement me")
}
-func (m *mockCmix) AddIdentity(*id.ID, time.Time, bool) { panic("implement me") }
-func (m *mockCmix) AddIdentityWithHistory(id *id.ID, validUntil, beginning time.Time, persistent bool) {
- panic("implement me")
-}
-func (m *mockCmix) RemoveIdentity(*id.ID) { panic("implement me") }
-func (m *mockCmix) GetIdentity(*id.ID) (identity.TrackedID, error) { panic("implement me") }
+func (m *mockCmix) AddIdentity(*id.ID, time.Time, bool) { panic("implement me") }
+func (m *mockCmix) AddIdentityWithHistory(*id.ID, time.Time, time.Time, bool) { panic("implement me") }
+func (m *mockCmix) RemoveIdentity(*id.ID) { panic("implement me") }
+func (m *mockCmix) GetIdentity(*id.ID) (identity.TrackedID, error) { panic("implement me") }
func (m *mockCmix) AddFingerprint(_ *id.ID, fp format.Fingerprint, mp message.Processor) error {
m.Lock()
diff --git a/fileTransfer/manager.go b/fileTransfer/manager.go
index f4ef20744..0e8a92694 100644
--- a/fileTransfer/manager.go
+++ b/fileTransfer/manager.go
@@ -170,7 +170,6 @@ type Storage interface {
// transfers already existed, they are loaded from storage and queued to resume
// once manager.startProcesses is called.
func NewManager(params Params, user FtE2e) (FileTransfer, error) {
-
kv := user.GetStorage().GetKV()
// Create a new list of sent file transfers or load one if it exists
diff --git a/fileTransfer/store/received.go b/fileTransfer/store/received.go
index 6ec51f2e0..189025a71 100644
--- a/fileTransfer/store/received.go
+++ b/fileTransfer/store/received.go
@@ -100,7 +100,7 @@ func (r *Received) AddTransfer(key *ftCrypto.TransferKey,
_, exists := r.transfers[*tid]
if exists {
- return nil, errors.Errorf(errAddExistingReceivedTransfer, *tid)
+ return nil, errors.Errorf(errAddExistingReceivedTransfer, tid)
}
rt, err := newReceivedTransfer(
diff --git a/fileTransfer/store/received_test.go b/fileTransfer/store/received_test.go
index 3bcba24b6..11d34d143 100644
--- a/fileTransfer/store/received_test.go
+++ b/fileTransfer/store/received_test.go
@@ -122,13 +122,13 @@ func TestReceived_AddTransfer(t *testing.T) {
// Tests that Received.AddTransfer returns an error when adding a transfer ID
// that already exists.
func TestReceived_AddTransfer_TransferAlreadyExists(t *testing.T) {
- tid := ftCrypto.TransferID{0}
+ tid := &ftCrypto.TransferID{0}
r := &Received{
- transfers: map[ftCrypto.TransferID]*ReceivedTransfer{tid: nil},
+ transfers: map[ftCrypto.TransferID]*ReceivedTransfer{*tid: nil},
}
expectedErr := fmt.Sprintf(errAddExistingReceivedTransfer, tid)
- _, err := r.AddTransfer(nil, &tid, "", nil, 0, 0, 0)
+ _, err := r.AddTransfer(nil, tid, "", nil, 0, 0, 0)
if err == nil || err.Error() != expectedErr {
t.Errorf("Received unexpected error when adding transfer that already "+
"exists.\nexpected: %s\nreceived: %+v", expectedErr, err)
diff --git a/fileTransfer/store/sent.go b/fileTransfer/store/sent.go
index d5e22ad8e..a7f89a598 100644
--- a/fileTransfer/store/sent.go
+++ b/fileTransfer/store/sent.go
@@ -108,7 +108,7 @@ func (s *Sent) AddTransfer(recipient *id.ID, key *ftCrypto.TransferKey,
_, exists := s.transfers[*tid]
if exists {
- return nil, errors.Errorf(errAddExistingSentTransfer, *tid)
+ return nil, errors.Errorf(errAddExistingSentTransfer, tid)
}
st, err := newSentTransfer(
diff --git a/fileTransfer/store/sent_test.go b/fileTransfer/store/sent_test.go
index f3f24e43e..f397569ee 100644
--- a/fileTransfer/store/sent_test.go
+++ b/fileTransfer/store/sent_test.go
@@ -141,13 +141,13 @@ func TestSent_AddTransfer(t *testing.T) {
// Tests that Sent.AddTransfer returns an error when adding a transfer ID that
// already exists.
func TestSent_AddTransfer_TransferAlreadyExists(t *testing.T) {
- tid := ftCrypto.TransferID{0}
+ tid := &ftCrypto.TransferID{0}
s := &Sent{
- transfers: map[ftCrypto.TransferID]*SentTransfer{tid: nil},
+ transfers: map[ftCrypto.TransferID]*SentTransfer{*tid: nil},
}
expectedErr := fmt.Sprintf(errAddExistingSentTransfer, tid)
- _, err := s.AddTransfer(nil, nil, &tid, "", 0, nil, 0)
+ _, err := s.AddTransfer(nil, nil, tid, "", 0, nil, 0)
if err == nil || err.Error() != expectedErr {
t.Errorf("Received unexpected error when adding transfer that already "+
"exists.\nexpected: %s\nreceived: %+v", expectedErr, err)
diff --git a/fileTransfer/utils_test.go b/fileTransfer/utils_test.go
index a885e4d82..daba7a064 100644
--- a/fileTransfer/utils_test.go
+++ b/fileTransfer/utils_test.go
@@ -193,12 +193,10 @@ func (m *mockCmix) SendWithAssembler(*id.ID, cmix.MessageAssembler,
panic("implement me")
}
-func (m *mockCmix) AddIdentity(*id.ID, time.Time, bool) { panic("implement me") }
-func (m *mockCmix) AddIdentityWithHistory(id *id.ID, validUntil, beginning time.Time, persistent bool) {
- panic("implement me")
-}
-func (m *mockCmix) RemoveIdentity(*id.ID) { panic("implement me") }
-func (m *mockCmix) GetIdentity(*id.ID) (identity.TrackedID, error) { panic("implement me") }
+func (m *mockCmix) AddIdentity(*id.ID, time.Time, bool) { panic("implement me") }
+func (m *mockCmix) AddIdentityWithHistory(*id.ID, time.Time, time.Time, bool) { panic("implement me") }
+func (m *mockCmix) RemoveIdentity(*id.ID) { panic("implement me") }
+func (m *mockCmix) GetIdentity(*id.ID) (identity.TrackedID, error) { panic("implement me") }
func (m *mockCmix) AddFingerprint(_ *id.ID, fp format.Fingerprint, mp message.Processor) error {
m.handler.Lock()
--
GitLab