remove df commands in cre-cli (#17785)

* remove df commands in cre-cli

* fix goimports

Author: anirudhwarrier

system-tests/lib/crecli/commands.go

@@ -7,10 +7,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"regexp"
-	"strconv"
-	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/pkg/errors"
 )
 
@@ -153,77 +150,6 @@ func EncryptSecrets(creCLICommandPath, secretsFile string, secrets map[string]st
 	return re.ReplaceAllString(matches[0][1], ""), nil
 }
 
-func SetFeedAdmin(creCLICommandPath string, chainID int, adminAddress common.Address, settingsFile *os.File) error {
-	setFeedAdminCmd := exec.Command(creCLICommandPath, "-S", settingsFile.Name(), "df", "set-feed-admin", "--chain-id", strconv.Itoa(chainID), "--feed-admin", adminAddress.Hex()) // #nosec G204
-	var outputBuffer bytes.Buffer
-	setFeedAdminCmd.Stdout = &outputBuffer
-	setFeedAdminCmd.Stderr = &outputBuffer
-	if err := setFeedAdminCmd.Start(); err != nil {
-		return errors.Wrap(err, "failed to start DF set feed admin command")
-	}
-
-	waitErr := setFeedAdminCmd.Wait()
-	fmt.Println("Set Feed Admin output:\n", outputBuffer.String())
-	if waitErr != nil {
-		return errors.Wrap(waitErr, "failed to wait for set feed admin command")
-	}
-
-	return nil
-}
-
-func SetFeedConfig(creCLICommandPath, feedID, feedDecimals, feedDescription string, chainID int, allowedSenders, allowedWorkflowOwners []common.Address, allowedWorkflowNames []string, settingsFile *os.File) error {
-	allowedSendersHex := make([]string, len(allowedSenders))
-	for i, addr := range allowedSenders {
-		allowedSendersHex[i] = addr.Hex()
-	}
-	allowedSendersStr := strings.Join(allowedSendersHex, ",")
-
-	allowedWorkflowOwnersHex := make([]string, len(allowedWorkflowOwners))
-	for i, addr := range allowedWorkflowOwners {
-		allowedWorkflowOwnersHex[i] = addr.Hex()
-	}
-	allowedWorkflowOwnersStr := strings.Join(allowedWorkflowOwnersHex, ",")
-
-	cleanFeedID := strings.TrimPrefix(feedID, "0x")
-	feedLength := len(cleanFeedID)
-
-	if feedLength < 32 {
-		return errors.Errorf("feed ID must be at least 32 characters long, but was %d", feedLength)
-	}
-
-	if feedLength > 32 {
-		cleanFeedID = cleanFeedID[:32]
-	}
-
-	setFeedConfigCmd := exec.Command(creCLICommandPath,
-		"-S", settingsFile.Name(),
-		"df",
-		"set-feed-config",
-		"--chain-id", strconv.Itoa(chainID),
-		"--allowed-senders", allowedSendersStr,
-		"--allowed-workflow-owners", allowedWorkflowOwnersStr,
-		"--allowed-workflow-names", strings.Join(allowedWorkflowNames, ","),
-		"--data-id", cleanFeedID,
-		"--decimals-arr", fmt.Sprintf("[%s]", feedDecimals),
-		"--description", feedDescription,
-	) // #nosec G204
-
-	var outputBuffer bytes.Buffer
-	setFeedConfigCmd.Stdout = &outputBuffer
-	setFeedConfigCmd.Stderr = &outputBuffer
-	if err := setFeedConfigCmd.Start(); err != nil {
-		return errors.Wrap(err, "failed to start DF set feed config command")
-	}
-
-	waitErr := setFeedConfigCmd.Wait()
-	fmt.Println("Set Feed Config output:\n", outputBuffer.String())
-	if waitErr != nil {
-		return errors.Wrap(waitErr, "failed to wait for set feed config command")
-	}
-
-	return nil
-}
-
 func PauseWorkflow(creCLICommandPath string, settingsFile *os.File) error {
 	commandArgs := []string{"workflow", "pause", "-S", settingsFile.Name(), "-v"}
 

system-tests/tests/smoke/cre/por_test.go

@@ -5,7 +5,6 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-	"strings"
 	"testing"
 	"time"
 
@@ -251,11 +250,6 @@ type configureDataFeedsCacheInput struct {
 }
 
 func configureDataFeedsCacheContract(testLogger zerolog.Logger, input *configureDataFeedsCacheInput) error {
-	chainIDInt, intErr := strconv.Atoi(input.blockchain.ChainID)
-	if intErr != nil {
-		return errors.Wrap(intErr, "failed to convert chain ID to int")
-	}
-
 	forwarderAddress, forwarderErr := crecontracts.FindAddressesForChain(input.fullCldEnvironment.ExistingAddresses, input.chainSelector, keystone_changeset.KeystoneForwarder.String()) //nolint:staticcheck // won't migrate now
 	if forwarderErr != nil {
 		return errors.Wrapf(forwarderErr, "failed to find forwarder address for chain %d", input.chainSelector)
@@ -266,56 +260,6 @@ func configureDataFeedsCacheContract(testLogger zerolog.Logger, input *configure
 		return errors.Wrapf(dataFeedsCacheErr, "failed to find data feeds cache address for chain %d", input.chainSelector)
 	}
 
-	if input.useCRECLI {
-		// These two env vars are required by the CRE CLI
-		err := os.Setenv("CRE_ETH_PRIVATE_KEY", input.deployerPrivateKey)
-		if err != nil {
-			return errors.Wrap(err, "failed to set CRE_ETH_PRIVATE_KEY")
-		}
-		err = os.Setenv("CRE_PROFILE", libcrecli.CRECLIProfile)
-		if err != nil {
-			return errors.Wrap(err, "failed to set CRE_PROFILE")
-		}
-
-		dfAdminErr := libcrecli.SetFeedAdmin(input.creCLIAbsPath, chainIDInt, input.sethClient.MustGetRootKeyAddress(), input.settingsFile)
-		if dfAdminErr != nil {
-			return errors.Wrap(dfAdminErr, "failed to set feed admin")
-		}
-
-		cleanFeedID := strings.TrimPrefix(input.feedID, "0x")
-
-		// Ensure the feed ID is long enough
-		if len(cleanFeedID) < 14 { // Need at least 7 bytes (14 hex chars)
-			return fmt.Errorf("feed ID too short: %s", input.feedID)
-		} else if len(cleanFeedID) > 32 {
-			cleanFeedID = cleanFeedID[:32]
-		}
-
-		// Extract decimals from feed ID
-		decimals, decimalsErr := df_changeset.GetDecimalsFromFeedID(cleanFeedID)
-		if decimalsErr != nil {
-			return errors.Wrapf(decimalsErr, "failed to get decimals from feed ID %s", input.feedID)
-		}
-
-		dfConfigErr := libcrecli.SetFeedConfig(
-			input.creCLIAbsPath,
-			input.feedID,
-			strconv.Itoa(int(decimals)),
-			"PoR test feed",
-			chainIDInt,
-			[]common.Address{forwarderAddress},
-			[]common.Address{input.sethClient.MustGetRootKeyAddress()},
-			[]string{input.workflowName},
-			input.settingsFile,
-		)
-
-		if dfConfigErr != nil {
-			return errors.Wrap(dfConfigErr, "failed to set feed config")
-		}
-
-		return nil
-	}
-
 	configInput := &keystonetypes.ConfigureDataFeedsCacheInput{
 		CldEnv:                input.fullCldEnvironment,
 		ChainSelector:         input.chainSelector,