Merge pull request #790 from jshufro/jms/removeecmigrator

Remove ec migrator

Author: 0xfornax

docker/rocketpool-ec-migrator

@@ -38,7 +38,6 @@ const (
 	ApiContainerSuffix              string = "_api"
 	WatchtowerContainerSuffix       string = "_watchtower"
 	PruneProvisionerContainerSuffix string = "_prune_provisioner"
-	EcMigratorContainerSuffix       string = "_ec_migrator"
 	clientDataVolumeName            string = "/ethclient"
 	dataFolderVolumeName            string = "/.rocketpool/data"
 

rocketpool-cli/service/service.go

@@ -14,7 +14,6 @@ import (
 const (
 	smartnodeTag                       string = "rocketpool/smartnode:v" + shared.RocketPoolVersion
 	pruneProvisionerTag                string = "rocketpool/eth1-prune-provision:v0.0.1"
-	ecMigratorTag                      string = "rocketpool/ec-migrator:v1.0.0"
 	NetworkID                          string = "network"
 	ProjectNameID                      string = "projectName"
 	SnapshotID                         string = "rocketpool-dao.eth"
@@ -750,10 +749,6 @@ func (config *SmartnodeConfig) GetPruneProvisionerContainerTag() string {
 	return pruneProvisionerTag
 }
 
-func (cfg *SmartnodeConfig) GetEcMigratorContainerTag() string {
-	return ecMigratorTag
-}
-
 func (cfg *SmartnodeConfig) GetSnapshotApiDomain() string {
 	return cfg.snapshotApiDomain[cfg.Network.Value.(config.Network)]
 }

rocketpool/ec_migrate multi.sh

@@ -12,7 +12,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"strconv"
 	"strings"
 	"time"
 
@@ -881,34 +880,6 @@ func (c *Client) RunNethermindPruneStarter(executionContainerName string, pruneS
 	return nil
 }
 
-// Runs the EC migrator
-func (c *Client) RunEcMigrator(container string, volume string, targetDir string, mode string, image string) error {
-	cmd := fmt.Sprintf("docker run --rm --name %s -v %s:/ethclient -v %s:/mnt/external -e EC_MIGRATE_MODE='%s' %s", container, volume, targetDir, mode, image)
-	err := c.printOutput(cmd)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Gets the size of the target directory via the EC migrator for importing, which should have the same permissions as exporting
-func (c *Client) GetDirSizeViaEcMigrator(container string, targetDir string, image string) (uint64, error) {
-	cmd := fmt.Sprintf("docker run --rm --name %s -v %s:/mnt/external -e OPERATION='size' %s", container, targetDir, image)
-	output, err := c.readOutput(cmd)
-	if err != nil {
-		return 0, fmt.Errorf("Error getting source directory size: %w", err)
-	}
-
-	trimmedOutput := strings.TrimRight(string(output), "\n")
-	dirSize, err := strconv.ParseUint(trimmedOutput, 0, 64)
-	if err != nil {
-		return 0, fmt.Errorf("Error parsing directory size output [%s]: %w", trimmedOutput, err)
-	}
-
-	return dirSize, nil
-}
-
 // Deletes the node wallet and all validator keys, and restarts the Docker containers
 func (c *Client) PurgeAllKeys(composeFiles []string) error {
 	// Get the command to run with root privileges