merge load functions

modules/gateway/gateway.go

@@ -249,10 +249,6 @@ func New(addr string, bootstrap bool, persistDir string) (*Gateway, error) {
 	if loadErr := g.load(); loadErr != nil && !os.IsNotExist(loadErr) {
 		return nil, loadErr
 	}
-	// Do the same for the blacklist.
-	if loadErr := g.loadBlacklist(); loadErr != nil && !os.IsNotExist(loadErr) {
-		return nil, loadErr
-	}
 	// Spawn the thread to periodically save the gateway.
 	go g.threadedSaveLoop()
 	// Make sure that the gateway saves after shutdown.

modules/gateway/persist.go

@@ -52,22 +52,23 @@ func (g *Gateway) persistDataBlacklist() (ips []string) {
 
 // load loads the Gateway's persistent data from disk.
 func (g *Gateway) load() error {
+	// load nodes
 	var nodes []*node
 	err := persist.LoadJSON(persistMetadata, &nodes, filepath.Join(g.persistDir, nodesFile))
 	if err != nil {
 		// COMPATv1.3.0
-		return g.loadv033persist()
+		err = g.loadv033persist()
+		if err != nil {
+			return err
+		}
 	}
 	for i := range nodes {
 		g.nodes[nodes[i].NetAddress] = nodes[i]
 	}
-	return nil
-}
 
-// load loads the Gateway's blacklisted ips from disk.
-func (g *Gateway) loadBlacklist() error {
+	// load blacklist
 	var ips []string
-	err := persist.LoadJSON(persistMetadataBlacklist, &ips, filepath.Join(g.persistDir, blacklistFile))
+	err = persist.LoadJSON(persistMetadataBlacklist, &ips, filepath.Join(g.persistDir, blacklistFile))
 	if err != nil {
 		return err
 	}

modules/gateway/persist_test.go

@@ -2,6 +2,7 @@ package gateway
 
 import (
 	"bytes"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -41,7 +42,7 @@ func TestLoadv033(t *testing.T) {
 		persistDir: filepath.Join("testdata", t.Name()),
 		log:        log,
 	}
-	if err := g.load(); err != nil {
+	if err := g.load(); err != nil && !os.IsNotExist(err) {
 		t.Fatal(err)
 	}