Merge pull request #52 from renproject/release/v3.0.6

v3.0.6

Author: Yunshi Sun

VERSION

@@ -1 +1 @@
-3.0.5
+3.0.6

cmd/list.go

@@ -4,7 +4,9 @@ import (
 	"fmt"
 	"io/ioutil"
 	"path/filepath"
+	"sync/atomic"
 
+	"github.com/fatih/color"
 	"github.com/renproject/darknode-cli/cmd/provider"
 	"github.com/renproject/darknode-cli/util"
 	"github.com/renproject/phi"
@@ -20,7 +22,7 @@ func listAllNodes(ctx *cli.Context) error {
 	}
 
 	nodes := make([][]string, len(nodesNames))
-	errs := map[string]error{}
+	var errs int64
 	phi.ParForAll(nodesNames, func(i int) {
 		name := nodesNames[i]
 		var err error
@@ -49,10 +51,13 @@ func listAllNodes(ctx *cli.Context) error {
 			return []string{name, id.String(), ip, provider, string(tags), ethAddr.Hex()}, nil
 		}()
 		if err != nil {
-			errs[name] = err
+			color.Red("[%v] cannot get detail of the darknode, err = %v", name, err)
+			atomic.AddInt64(&errs, 1)
 		}
 	})
-	if len(errs) == len(nodesNames) {
+
+	// Check if we can find any valid nodes.
+	if atomic.LoadInt64(&errs) == int64(len(nodesNames)) {
 		return fmt.Errorf("cannot find any node")
 	}
 

cmd/main.go

@@ -190,7 +190,6 @@ func checkUpdates(curVer string) {
 	client := github.NewClient(nil)
 	release, _, err := client.Repositories.GetLatestRelease(ctx, "renproject", "darknode-cli")
 	if err != nil {
-		color.Red("cannot check latest release, err = %v", err)
 		return
 	}
 

darknode/config.go

@@ -76,8 +76,7 @@ func NewConfig(network Network) (Config, error) {
 // all versions of darknode configs.
 type GeneralConfig struct {
 	// Private configuration
-	Keystore          keystore.Keystore `json:"keystore"`
-	ECDSADistKeyShare ECDSADistKeyShare `json:"ecdsaDistKeyShare"`
+	Keystore keystore.Keystore `json:"keystore"`
 
 	// Public configuration
 	Network    Network             `json:"network"`

util/node.go

@@ -56,7 +56,7 @@ func ValidateNodeName(name string) error {
 }
 
 // Config returns the config of the node with given name.
-func Config(name string) (darknode.GeneralConfig, error){
+func Config(name string) (darknode.GeneralConfig, error) {
 	path := filepath.Join(NodePath(name), "config.json")
 	return darknode.NewConfigFromJSONFile(path)
 }
@@ -118,21 +118,14 @@ func GetNodesByTags(tags string) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
-	ts := strings.Split(strings.TrimSpace(tags), ",")
 	nodes := make([]string, 0)
 	for _, f := range files {
-		tagFile := filepath.Join(Directory, "darknodes", f.Name(), "tags.out")
-		tags, err := ioutil.ReadFile(tagFile)
+		path := filepath.Join(Directory, "darknodes", f.Name(), "tags.out")
+		tagFile, err := ioutil.ReadFile(path)
 		if err != nil {
 			continue
 		}
-		haveAllTags := true
-		for i := range ts {
-			if !strings.Contains(string(tags), ts[i]) {
-				haveAllTags = false
-			}
-		}
-		if !haveAllTags {
+		if !ValidateTags(string(tagFile), tags) {
 			continue
 		}
 
@@ -145,6 +138,16 @@ func GetNodesByTags(tags string) ([]string, error) {
 	return nodes, nil
 }
 
+func ValidateTags(have, required string) bool {
+	tagsStr := strings.Split(strings.TrimSpace(required), ",")
+	for _, tag := range tagsStr {
+		if !strings.Contains(have, tag) {
+			return false
+		}
+	}
+	return true
+}
+
 func isDeployed(name string) bool {
 	path := NodePath(name)
 	script := fmt.Sprintf("cd %v && terraform output ip", path)

util/system.go

@@ -24,7 +24,7 @@ func NodePath(name string) string {
 
 // BackUpConfig copies the config file of the node to the backup folder under
 // .darknode directory in case something unexpected happens.
-func BackUpConfig(name string) error{
+func BackUpConfig(name string) error {
 	path := NodePath(name)
 	backupFolder := filepath.Join(Directory, "backup", name)
 	if err := Run("mkdir", "-p", backupFolder); err != nil {