Fix file transfer error print

fileTransfer/connect/utils_test.go

@@ -141,9 +141,7 @@ func (m *mockCmix) SendWithAssembler(*id.ID, cmix.MessageAssembler,
 }
 
 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) 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") }
 

fileTransfer/e2e/utils_test.go

@@ -143,9 +143,7 @@ func (m *mockCmix) SendWithAssembler(*id.ID, cmix.MessageAssembler,
 }
 
 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) 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") }
 

fileTransfer/groupChat/utils_test.go

@@ -138,9 +138,7 @@ func (m *mockCmix) SendWithAssembler(*id.ID, cmix.MessageAssembler,
 }
 
 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) 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") }
 

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

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(

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)

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(

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)

fileTransfer/utils_test.go

@@ -194,9 +194,7 @@ func (m *mockCmix) SendWithAssembler(*id.ID, cmix.MessageAssembler,
 }
 
 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) 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") }