From 86a30823c2fa78e7003e6654eecc33f7fddf3812 Mon Sep 17 00:00:00 2001
From: josh <josh@elixxir.io>
Date: Wed, 8 Jan 2020 13:24:56 -0800
Subject: [PATCH] Code cleanup, add edge case to ndf parsing
---
api/mockserver_test.go | 2 +-
api/ndf_test.go | 1 -
io/updateNdf.go | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/api/mockserver_test.go b/api/mockserver_test.go
index df8ccfa78..5b823f973 100644
--- a/api/mockserver_test.go
+++ b/api/mockserver_test.go
@@ -500,7 +500,7 @@ func getNDF() *ndf.NetworkDefinition {
func startServers() {
//func StartRegistrationServer(id, localServer string, handler Handler, certPEMblock, keyPEMblock []byte) *Comms {
- RegComms = registration.StartRegistrationServer( "testServer", def.Registration.Address, &RegHandler, nil, nil)
+ RegComms = registration.StartRegistrationServer("testServer", def.Registration.Address, &RegHandler, nil, nil)
def.Gateways = make([]ndf.Gateway, 0)
//Start up gateways
diff --git a/api/ndf_test.go b/api/ndf_test.go
index a9ec49175..7ee0a866a 100644
--- a/api/ndf_test.go
+++ b/api/ndf_test.go
@@ -56,7 +56,6 @@ var ExampleJSON = `{"Timestamp": "2019-06-04T20:48:48-07:00", "gateways": [{"Add
// }
//}
-
// Tests that VerifyNDF() panics when given the incorrect RSA public key.
func TestVerifyNDF_ErrPublicKey(t *testing.T) {
// Generate RSA private key and fake RSA public key
diff --git a/io/updateNdf.go b/io/updateNdf.go
index 427260b7f..2e4304f1d 100644
--- a/io/updateNdf.go
+++ b/io/updateNdf.go
@@ -40,7 +40,7 @@ func PollNdf(currentDef *ndf.NetworkDefinition, comms *client.Comms) (*ndf.Netwo
}
//If there was no error and the response is nil, client's ndf is up-to-date
- if response == nil {
+ if response == nil || response.Ndf == nil {
globals.Log.DEBUG.Printf("Client NDF up-to-date")
return nil, nil
}
--
GitLab