diff --git a/bindings/fileTransfer.go b/bindings/fileTransfer.go index 3e5e458b50a3eb644d53df174397c3b04904e442..ec59deff6f4d6c294d61df1d14452404a0d3b50b 100644 --- a/bindings/fileTransfer.go +++ b/bindings/fileTransfer.go @@ -163,7 +163,7 @@ func InitFileTransfer(e2eID int, receiveFileCallback ReceiveFileCallback, e2eFil })) } - w, err := e2e.NewWrapper(rcb, e2eFileTransferParams, m, myID, messenger.api.GetE2E(), messenger.api.GetCmix()) + w, err := e2e.NewWrapper(rcb, e2eFileTransferParams, m, myID, user.api.GetE2E(), user.api.GetCmix()) if err != nil { return nil, err } diff --git a/cmd/root.go b/cmd/root.go index 1e10cd3c7eaa8b419d0f43f60ee90767dc3469c7..837b68e1af7d13f8476844c3bb0f525be4bcbd63 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -122,11 +122,6 @@ var rootCmd = &cobra.Command{ }) waitUntilConnected(connected) - // err = user.RegisterForNotifications("dJwuGGX3KUyKldWK5PgQH8:APA91bFjuvimRc4LqOyMDiy124aLedifA8DhldtaB_b76ggphnFYQWJc_fq0hzQ-Jk4iYp2wPpkwlpE1fsOjs7XWBexWcNZoU-zgMiM0Mso9vTN53RhbXUferCbAiEylucEOacy9pniN") - // if err != nil { - // jww.FATAL.Panicf("Failed to register for notifications: %+v", err) - // } - // After connection, make sure we have registered with at least // 85% of the nodes numReg := 1 diff --git a/cmd/ud.go b/cmd/ud.go index f317814b79baac648dded1c0255400d6a2f76338..22c4c918727be7491dc2d2d9ab43aeffb62281a8 100644 --- a/cmd/ud.go +++ b/cmd/ud.go @@ -127,8 +127,8 @@ var udCmd = &cobra.Command{ udContact, err := userDiscoveryMgr.GetContact() if err != nil { - fmt.Printf("Failed to get identity discovery contact object: %+v", err) - jww.FATAL.Printf("Failed to get identity discovery contact object: %+v", err) + fmt.Printf("Failed to get user discovery contact object: %+v", err) + jww.FATAL.Printf("Failed to get user discovery contact object: %+v", err) } // Handle lookup (verification) process @@ -213,13 +213,13 @@ var udCmd = &cobra.Command{ } err = userDiscoveryMgr.PermanentDeleteAccount(f) if err != nil { - fmt.Printf("Couldn't remove identity %s\n", + fmt.Printf("Couldn't remove user %s\n", userToRemove) jww.FATAL.Panicf( - "Failed to remove identity %s: %+v", + "Failed to remove user %s: %+v", userToRemove, err) } - fmt.Printf("Removed identity from discovery: %s\n", + fmt.Printf("Removed user from discovery: %s\n", userToRemove) } diff --git a/ud/lookup.go b/ud/lookup.go index d87d68218cdf1e9b15560b413d4011d0efd96bcb..cce461a9d0cb4676cb4f35cf9fdb4e175b9fd00c 100644 --- a/ud/lookup.go +++ b/ud/lookup.go @@ -22,15 +22,15 @@ type lookupCallback func(contact.Contact, error) // Lookup returns the public key of the passed ID as known by the user discovery // system or returns by the timeout. -func Lookup(messenger udE2e, +func Lookup(user udE2e, udContact contact.Contact, callback lookupCallback, uid *id.ID, p single.RequestParams) ([]id.Round, receptionID.EphemeralIdentity, error) { - // Extract information from messenger - net := messenger.GetCmix() - grp := messenger.GetE2E().GetGroup() - rng := messenger.GetRng().GetStream() + // Extract information from user + net := user.GetCmix() + grp := user.GetE2E().GetGroup() + rng := user.GetRng().GetStream() defer rng.Close() jww.INFO.Printf("ud.Lookup(%s, %s)", uid, p.Timeout) diff --git a/ud/lookup_test.go b/ud/lookup_test.go index d6ce2dada08d8d76cb8ca5809d9e429b66709aa8..de7fd3f3d488bf5867d9df84a16e18ca897deea9 100644 --- a/ud/lookup_test.go +++ b/ud/lookup_test.go @@ -87,7 +87,7 @@ func TestManager_Lookup(t *testing.T) { } // Run the lookup - _, _, err = Lookup(m.messenger, udContact, callback, uid, p) + _, _, err = Lookup(m.user, udContact, callback, uid, p) if err != nil { t.Errorf("Lookup() returned an error: %+v", err) } diff --git a/ud/search.go b/ud/search.go index e04acde7cda71782e95394faa1bb6018eccbe0b5..dee22789df5cd285bd31835f00c134eac8bdbee3 100644 --- a/ud/search.go +++ b/ud/search.go @@ -27,7 +27,7 @@ type searchCallback func([]contact.Contact, error) // used to search for multiple users at once; that can have a privacy reduction. // Instead, it is intended to be used to search for a user where multiple pieces // of information is known. -func Search(messenger udE2e, +func Search(user udE2e, udContact contact.Contact, callback searchCallback, list fact.FactList, params single.RequestParams) ([]id.Round, @@ -44,11 +44,11 @@ func Search(messenger udE2e, errors.WithMessage(err, "Failed to form outgoing search request.") } - // Extract information from messenger - net := messenger.GetCmix() - events := messenger.GetEventReporter() - grp := messenger.GetE2E().GetGroup() - rng := messenger.GetRng().GetStream() + // Extract information from user + net := user.GetCmix() + events := user.GetEventReporter() + grp := user.GetE2E().GetGroup() + rng := user.GetRng().GetStream() defer rng.Close() // Build response handler