moved SequencerPubKey to shared pacakge

dymensionxyz · Jul 2, 2023 · e244fe1 · e244fe1
1 parent 6c132e8
commit e244fe1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/cmd/config/init/rollapp.go b/cmd/config/init/rollapp.go
@@ -28,7 +28,7 @@ func initializeRollappConfig(initConfig utils.RollappConfig) error {
 		return err
 	}
 
-	seqPubKey, err := showSequencerPubKey(initConfig.RollappBinary, home)
+	seqPubKey, err := utils.GetSequencerPubKey(initConfig)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/register/bash_commands.go b/cmd/register/bash_commands.go
@@ -1,13 +1,12 @@
 package register
 
 import (
-	"github.com/dymensionxyz/roller/cmd/utils"
 	"os/exec"
 	"path/filepath"
 
-	"fmt"
+	"github.com/dymensionxyz/roller/cmd/utils"
 
-	"strings"
+	"fmt"
 
 	"github.com/dymensionxyz/roller/cmd/consts"
 )
@@ -22,23 +21,8 @@ func getRegisterRollappCmd(rollappConfig utils.RollappConfig) *exec.Cmd {
 	)
 }
 
-func showSequencerPubKey(rollappConfig utils.RollappConfig) (string, error) {
-	cmd := exec.Command(
-		consts.Executables.RollappEVM,
-		"dymint",
-		"show-sequencer",
-		"--home",
-		filepath.Join(rollappConfig.Home, consts.ConfigDirName.Rollapp),
-	)
-	out, err := cmd.Output()
-	if err != nil {
-		return "", err
-	}
-	return strings.ReplaceAll(strings.ReplaceAll(string(out), "\n", ""), "\\", ""), nil
-}
-
 func getRegisterSequencerCmd(rollappConfig utils.RollappConfig) (*exec.Cmd, error) {
-	seqPubKey, err := showSequencerPubKey(rollappConfig)
+	seqPubKey, err := utils.GetSequencerPubKey(rollappConfig)
 	if err != nil {
 		return nil, err
 	}

diff --git a/cmd/utils/keys.go b/cmd/utils/keys.go
@@ -104,3 +104,18 @@ func PrintAddresses(addresses []AddressData) {
 	table.AppendBulk(data)
 	table.Render()
 }
+
+func GetSequencerPubKey(rollappConfig RollappConfig) (string, error) {
+	cmd := exec.Command(
+		rollappConfig.RollappBinary,
+		"dymint",
+		"show-sequencer",
+		"--home",
+		filepath.Join(rollappConfig.Home, consts.ConfigDirName.Rollapp),
+	)
+	out, err := cmd.Output()
+	if err != nil {
+		return "", err
+	}
+	return strings.ReplaceAll(strings.ReplaceAll(string(out), "\n", ""), "\\", ""), nil
+}