Finalize alternative user discovery

bindings/ud.go

@@ -46,11 +46,6 @@ func NewUserDiscovery(client *Client) (*UserDiscovery, error) {
 	}
 }
 
-// todo: docstring
-func (ud *UserDiscovery) SetAlternativeUserDiscovery(address, cert, id, dhPubKey []byte) error {
-	return ud.SetAlternativeUserDiscovery(id, cert, address, dhPubKey)
-}
-
 // Register registers a user with user discovery. Will return an error if the
 // network signatures are malformed or if the username is taken. Usernames
 // cannot be changed after registration at this time. Will fail if the user is
@@ -298,3 +293,17 @@ func (ud UserDiscovery) MultiLookup(ids *IdList, callback MultiLookupCallback,
 
 	return nil
 }
+
+// SetAlternativeUserDiscovery sets the alternativeUd object within manager.
+// Once set, any user discovery operation will go through the alternative
+// user discovery service.
+// To undo this operation, use UnsetAlternativeUserDiscovery.
+func (ud *UserDiscovery) SetAlternativeUserDiscovery(address, cert, id, dhPubKey []byte) error {
+	return ud.ud.SetAlternativeUserDiscovery(id, cert, address, dhPubKey)
+}
+
+// UnsetAlternativeUserDiscovery clears out the information from
+// the Manager object.
+func (ud *UserDiscovery) UnsetAlternativeUserDiscovery() error {
+	return ud.ud.UnsetAlternativeUserDiscovery()
+}

ud/manager.go

@@ -25,11 +25,6 @@ type SingleInterface interface {
 	StartProcesses() (stoppable.Stoppable, error)
 }
 
-type alternateUd struct {
-	host     *connect.Host
-	dhPubKey []byte
-}
-
 type Manager struct {
 	// External
 	client  *api.Client
@@ -53,6 +48,14 @@ type Manager struct {
 	registered *uint32
 }
 
+// alternateUd is an alternative user discovery service.
+// This is used for testing, so client can avoid using
+// the production server.
+type alternateUd struct {
+	host     *connect.Host
+	dhPubKey []byte
+}
+
 // NewManager builds a new user discovery manager. It requires that an updated
 // NDF is available and will error if one is not.
 func NewManager(client *api.Client, single *single.Manager) (*Manager, error) {
@@ -102,7 +105,11 @@ func NewManager(client *api.Client, single *single.Manager) (*Manager, error) {
 	return m, nil
 }
 
-func (m *Manager) SetAlternativeUserDiscovery(altId []byte, altCert []byte, altAddress string, dhPubKey []byte) error {
+// SetAlternativeUserDiscovery sets the alternativeUd object within manager.
+// Once set, any user discovery operation will go through the alternative
+// user discovery service.
+// To undo this operation, use UnsetAlternativeUserDiscovery.
+func (m *Manager) SetAlternativeUserDiscovery(altId, altCert, altAddress, dhPubKey []byte) error {
 	params := connect.GetDefaultHostParams()
 	params.AuthEnabled = false
 
@@ -112,7 +119,7 @@ func (m *Manager) SetAlternativeUserDiscovery(altId []byte, altCert []byte, altA
 	}
 
 	// Add a new host and return it if it does not already exist
-	host, err := m.comms.AddHost(udID, altAddress,
+	host, err := m.comms.AddHost(udID, string(altAddress),
 		altCert, params)
 	if err != nil {
 		return errors.WithMessage(err, "User Discovery host object could "+
@@ -127,6 +134,17 @@ func (m *Manager) SetAlternativeUserDiscovery(altId []byte, altCert []byte, altA
 	return nil
 }
 
+// UnsetAlternativeUserDiscovery clears out the information from
+// the Manager object.
+func (m *Manager) UnsetAlternativeUserDiscovery() error {
+	if m.alternativeUd == nil {
+		return errors.New("Alternative User Discovery is already unset.")
+	}
+
+	m.alternativeUd = nil
+	return nil
+}
+
 // getHost returns the current UD host for the UD ID found in the NDF. If the
 // host does not exist, then it is added and returned
 func (m *Manager) getHost() (*connect.Host, error) {
@@ -164,6 +182,7 @@ func (m *Manager) getHost() (*connect.Host, error) {
 
 // getContact returns the contact for UD as retrieved from the NDF.
 func (m *Manager) getContact() (contact.Contact, error) {
+	// Return alternative User discovery contact if set
 	if m.alternativeUd != nil {
 		// Unmarshal UD DH public key
 		alternativeDhPubKey := m.storage.E2e().GetGroup().NewInt(1)