Merge branch 'xx-4276/ud-backup' into 'release'

Trigger backup on UD register, confirm fact, delete fact

See merge request !436

fileTransfer/store/received.go

@@ -73,7 +73,7 @@ func NewOrLoadReceived(kv *versioned.KV) (*Received, []*ReceivedTransfer, error)
 		tid := tidList[i]
 		s.transfers[tid], err = loadReceivedTransfer(&tid, s.kv)
 		if err != nil {
-			jww.WARN.Print(warnLoadReceivedTransfer, i, len(tidList), tid, err)
+			jww.WARN.Printf(warnLoadReceivedTransfer, i, len(tidList), tid, err)
 			errCount++
 		}
 

ud/confirmFact.go

@@ -41,6 +41,7 @@ func (m *Manager) confirmFact(confirmationID, code string, comm confirmFactComm)
 			"Failed to confirm fact in storage with confirmation ID: %q",
 			confirmationID)
 	}
+	m.user.GetBackupContainer().TriggerBackup("Fact confirmed")
 
 	return nil
 }

ud/interfaces.go

@@ -39,6 +39,7 @@ type udE2e interface {
 	GetRng() *fastRNG.StreamGenerator
 	GetStorage() storage.Session
 	GetTransmissionIdentity() xxdk.TransmissionIdentity
+	GetBackupContainer() *xxdk.Container
 }
 
 // udNetworkStatus is an interface for the xxdk.Cmix's

ud/mockE2e_test.go

@@ -46,6 +46,10 @@ type mockE2e struct {
 	key       *rsa.PrivateKey
 }
 
+func (m mockE2e) GetBackupContainer() *xxdk.Container {
+	return &xxdk.Container{}
+}
+
 func (m mockE2e) GetE2E() e2e.Handler {
 	return mockE2eHandler{}
 }

ud/register.go

@@ -95,6 +95,7 @@ func (m *Manager) register(username string, networkSignature []byte,
 		m.getEventReporter().Report(1, "UserDiscovery", "Registration",
 			fmt.Sprintf("User Registered with UD: %+v",
 				username))
+		m.user.GetBackupContainer().TriggerBackup("User registered with UD")
 	}
 
 	return err

ud/remove.go

@@ -26,8 +26,13 @@ import (
 func (m *Manager) RemoveFact(f fact.Fact) error {
 	jww.INFO.Printf("ud.RemoveFact(%s)", f.Stringify())
 	m.factMux.Lock()
-	defer m.factMux.Unlock()
-	return m.removeFact(f, m.comms)
+	err := m.removeFact(f, m.comms)
+	m.factMux.Unlock()
+	if err != nil {
+		return err
+	}
+	m.user.GetBackupContainer().TriggerBackup("Removed fact")
+	return nil
 }
 
 // removeFact is a helper function which contacts the UD service