fixes after review

multiversx · Sep 13, 2022 · c52b27f · c52b27f
1 parent dcccc80
commit c52b27f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/cmd/node/main.go b/cmd/node/main.go
@@ -62,7 +62,8 @@ func main() {
 	app.Name = "Elrond Node CLI App"
 	machineID := core.GetAnonymizedMachineID(app.Name)
 
-	app.Version = fmt.Sprintf("%s/%s/%s-%s/%s", appVersion, runtime.Version(), runtime.GOOS, runtime.GOARCH, machineID)
+	baseVersion := fmt.Sprintf("%s/%s/%s-%s", appVersion, runtime.Version(), runtime.GOOS, runtime.GOARCH)
+	app.Version = fmt.Sprintf("%s/%s", baseVersion, machineID)
 	app.Usage = "This is the entry point for starting a new Elrond node - the app will start after the genesis timestamp"
 	app.Flags = getFlags()
 	app.Authors = []cli.Author{
@@ -73,7 +74,7 @@ func main() {
 	}
 
 	app.Action = func(c *cli.Context) error {
-		return startNodeRunner(c, log, app.Version)
+		return startNodeRunner(c, log, baseVersion, app.Version)
 	}
 
 	err := app.Run(os.Args)
@@ -83,7 +84,7 @@ func main() {
 	}
 }
 
-func startNodeRunner(c *cli.Context, log logger.Logger, version string) error {
+func startNodeRunner(c *cli.Context, log logger.Logger, baseVersion string, version string) error {
 	flagsConfig := getFlagsConfig(c, log)
 
 	fileLogging, errLogger := attachFileLogger(log, flagsConfig)
@@ -119,7 +120,7 @@ func startNodeRunner(c *cli.Context, log logger.Logger, version string) error {
 		log.Debug("initialized memory ballast object", "size", core.ConvertBytes(uint64(len(memoryBallastObject))))
 	}
 
-	cfgs.FlagsConfig.BaseVersion = fmt.Sprintf("%s-base", version)
+	cfgs.FlagsConfig.BaseVersion = baseVersion
 	cfgs.FlagsConfig.Version = version
 
 	nodeRunner, errRunner := node.NewNodeRunner(cfgs)

diff --git a/heartbeat/sender/heartbeatSenderFactory.go b/heartbeat/sender/heartbeatSenderFactory.go
@@ -97,7 +97,7 @@ func isMultikeyMode(privKey crypto.PrivateKey, keysHolder heartbeat.KeysHolder,
 
 	_, _, err = nodesCoordinator.GetValidatorWithPublicKey(pkBytes)
 	if err == nil && isMultikey {
-		return false, heartbeat.ErrInvalidConfiguration
+		return false, fmt.Errorf("%w, len(keysMap) = %d, isValidator = %v", heartbeat.ErrInvalidConfiguration, len(keysMap), err == nil)
 	}
 
 	return isMultikey, nil

diff --git a/heartbeat/sender/heartbeatSenderFactory_test.go b/heartbeat/sender/heartbeatSenderFactory_test.go
@@ -3,6 +3,7 @@ package sender
 import (
 	"errors"
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/ElrondNetwork/elrond-go-core/core"
@@ -77,6 +78,7 @@ func TestHeartbeatSenderFactory_createHeartbeatSender(t *testing.T) {
 		}
 		hbSender, err := createHeartbeatSender(args)
 		assert.True(t, errors.Is(err, heartbeat.ErrInvalidConfiguration))
+		assert.True(t, strings.Contains(err.Error(), "isValidator"))
 		assert.True(t, check.IfNil(hbSender))
 	})
 	t.Run("validator should create regular sender", func(t *testing.T) {

diff --git a/integrationTests/factory/componentsHelper.go b/integrationTests/factory/componentsHelper.go
@@ -68,7 +68,7 @@ func CreateDefaultConfig() *config.Configs {
 	configs.FlagsConfig = &config.ContextFlagsConfig{
 		WorkingDir:  "workingDir",
 		UseLogView:  true,
-		BaseVersion: fmt.Sprintf("%s-base", Version),
+		BaseVersion: BaseVersion,
 		Version:     Version,
 	}
 	configs.ConfigurationPathsHolder = configPathsHolder

diff --git a/integrationTests/factory/constants.go b/integrationTests/factory/constants.go
@@ -15,6 +15,7 @@ const (
 	GenesisPath           = "../testdata/genesis.json"
 	GenesisSmartContracts = "../testdata/genesisSmartContracts.json"
 	ValidatorKeyPemPath   = "../validatorKey.pem"
+	BaseVersion           = "v1.1.6.1-0-gbae61225f/go1.14.2/linux-amd64"
 	Version               = "v1.1.6.1-0-gbae61225f/go1.14.2/linux-amd64/a72b5f2eff"
 	WorkingDir            = "workingDir"
 	RoundActivationPath   = "enableRounds.toml"