From e4656230673828a72d3452c20d5ccc0bd2cff955 Mon Sep 17 00:00:00 2001 From: josh <josh@elixxir.io> Date: Fri, 3 Jan 2020 14:14:27 -0800 Subject: [PATCH] Clean up code --- api/register_test.go | 55 ----------------------------------------- bindings/client_test.go | 1 - bots/userDiscovery.go | 4 ++- 3 files changed, 3 insertions(+), 57 deletions(-) diff --git a/api/register_test.go b/api/register_test.go index 8cab5c728..be2e0e95d 100644 --- a/api/register_test.go +++ b/api/register_test.go @@ -119,61 +119,6 @@ func VerifyRegisterGobKeys(session user.Session, topology *connect.Circuit, t *t } -/* -//TODO: Fix this test -//Error path: register with udb, but udb is not set up to return a message -func TestClient_RegisterWithUDB_NoUDB(t *testing.T) { - // Get a Client - testClient, err := NewClient(&globals.RamStorage{}, "", "", def) - if err != nil { - t.Error(err) - } - - err = testClient.InitNetwork() - if err != nil { - t.Error(err) - } - - err = testClient.GenerateKeys(nil, "password") - if err != nil { - t.Errorf("Failed to generate keys: %+v", err) - } - - // populate a gob in the store - _, err = testClient.RegisterWithPermissioning(true, ValidRegCode) - if err != nil { - t.Error(err) - } - - err = testClient.RegisterWithNodes() - if err != nil { - t.Error(err.Error()) - } - - // Login to gateway - _, err = testClient.Login("password") - - if err != nil { - t.Errorf("Login failed: %s", err.Error()) - } - cb := func(err error) { - t.Log(err) - } - - err = testClient.StartMessageReceiver(cb) - - if err != nil { - t.Errorf("Could not start message reception: %+v", err) - } - - err = testClient.RegisterWithUDB("test", 1 * time.Second) - if err != nil { - return - } - t.Errorf("Expected error path: should not successfully register with udb") -} -*/ - // Verify that a valid precanned user can register func TestRegister_ValidRegParams___(t *testing.T) { // Initialize client with dummy storage diff --git a/bindings/client_test.go b/bindings/client_test.go index d1b851bb8..305edea53 100644 --- a/bindings/client_test.go +++ b/bindings/client_test.go @@ -269,7 +269,6 @@ func TestClient_GetRegState(t *testing.T) { if err != nil { t.Errorf("Register with nodes failed: %v", err.Error()) } - } //Happy path: send unencrypted message diff --git a/bots/userDiscovery.go b/bots/userDiscovery.go index 327c4b1f0..de35ed218 100644 --- a/bots/userDiscovery.go +++ b/bots/userDiscovery.go @@ -46,7 +46,9 @@ func Register(valueType, value string, publicKey []byte, regStatus func(int), ti keyFP := fingerprint(publicKey) regStatus(globals.UDB_REG_PUSHKEY) - + fmt.Println("keyFp ", keyFP) + fmt.Println("udbId ", UdbID) + fmt.Println("pubLey ", publicKey) // push key and error if it already exists err = pushKey(UdbID, keyFP, publicKey) -- GitLab