From ad08cd8d2771a9bebe5af4a76399cf93ce639918 Mon Sep 17 00:00:00 2001
From: joshemb <josh@elixxir.io>
Date: Mon, 8 Aug 2022 14:56:47 -0700
Subject: [PATCH] Remove UnsetAlternativeUserDiscovery call
---
bindings/ud.go | 7 -------
ud/alternate.go | 14 --------------
ud/register.go | 2 +-
3 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/bindings/ud.go b/bindings/ud.go
index da1b196a2..89ffcc061 100644
--- a/bindings/ud.go
+++ b/bindings/ud.go
@@ -314,13 +314,6 @@ func (ud *UserDiscovery) RemoveFact(factJson []byte) error {
return ud.api.RemoveFact(f)
}
-// UnsetAlternativeUserDiscovery clears out the information from the Manager
-// object.
-// todo: should this be removed as well?
-func (ud *UserDiscovery) UnsetAlternativeUserDiscovery() error {
- return ud.api.UnsetAlternativeUserDiscovery()
-}
-
////////////////////////////////////////////////////////////////////////////////
// User Discovery Lookup //
////////////////////////////////////////////////////////////////////////////////
diff --git a/ud/alternate.go b/ud/alternate.go
index 4f0013bfc..7fe78e696 100644
--- a/ud/alternate.go
+++ b/ud/alternate.go
@@ -51,17 +51,3 @@ func (m *Manager) setAlternateUserDiscovery(altCert, altAddress,
return nil
}
-
-// UnsetAlternativeUserDiscovery clears out the information from
-// the Manager object.
-// fixme: I think this should be removed to avoid creating a Manager object
-// which has never been registered to production, and can't be w/o exporting
-// the Manger.register method.
-func (m *Manager) UnsetAlternativeUserDiscovery() error {
- if m.alternativeUd == nil {
- return errors.New("Alternative User Discovery is already unset.")
- }
-
- m.alternativeUd = nil
- return nil
-}
diff --git a/ud/register.go b/ud/register.go
index e59e378c1..3708ee079 100644
--- a/ud/register.go
+++ b/ud/register.go
@@ -17,7 +17,7 @@ import (
func (m *Manager) register(username string, networkSignature []byte,
rng csprng.Source, comm registerUserComms) error {
- // Initialize/Get host
+ // Initialize or get host
udHost, err := m.getOrAddUdHost()
if err != nil {
return errors.WithMessage(err,
--
GitLab