revert: "support custom mnemonics in in-process testing network (back…

…port cosmos#10922) (cosmos#10935)" (cosmos#11083)

This reverts commit 8bb7a96.

server/init.go

@@ -19,9 +19,8 @@ func GenerateCoinKey(algo keyring.SignatureAlgo) (sdk.AccAddress, string, error)
 		algo,
 	)
 	if err != nil {
-		return sdk.AccAddress{}, "", err
+		return sdk.AccAddress([]byte{}), "", err
 	}
-
 	return sdk.AccAddress(info.GetPubKey().Address()), secret, nil
 }
 
@@ -44,19 +43,22 @@ func GenerateSaveCoinKey(
 
 	// ensure no overwrite
 	if !overwrite && exists {
-		return sdk.AccAddress{}, "", fmt.Errorf("key already exists, overwrite is disabled")
+		return sdk.AccAddress([]byte{}), "", fmt.Errorf(
+			"key already exists, overwrite is disabled")
 	}
 
-	// remove the old key by name if it exists
+	// generate a private key, with recovery phrase
 	if exists {
-		if err := keybase.Delete(keyName); err != nil {
-			return sdk.AccAddress{}, "", fmt.Errorf("failed to overwrite key")
+		err = keybase.Delete(keyName)
+		if err != nil {
+			return sdk.AccAddress([]byte{}), "", fmt.Errorf(
+				"failed to overwrite key")
 		}
 	}
 
 	k, mnemonic, err := keybase.NewMnemonic(keyName, keyring.English, sdk.GetConfig().GetFullBIP44Path(), keyring.DefaultBIP39Passphrase, algo)
 	if err != nil {
-		return sdk.AccAddress{}, "", err
+		return sdk.AccAddress([]byte{}), "", err
 	}
 
 	return sdk.AccAddress(k.GetAddress()), mnemonic, nil

testutil/key_test.go

@@ -27,7 +27,11 @@ func TestGenerateSaveCoinKey(t *testing.T) {
 	kb, err := keyring.New(t.Name(), "test", t.TempDir(), nil)
 	require.NoError(t, err)
 
+<<<<<<< HEAD:testutil/key_test.go
 	addr, mnemonic, err := GenerateSaveCoinKey(kb, "keyname", "", false, hd.Secp256k1)
+=======
+	addr, mnemonic, err := server.GenerateSaveCoinKey(kb, "keyname", false, hd.Secp256k1)
+>>>>>>> 845be8320... revert: "support custom mnemonics in in-process testing network (backport #10922) (#10935)" (#11083):server/init_test.go
 	require.NoError(t, err)
 
 	// Test key was actually saved

testutil/network/network.go

@@ -82,7 +82,6 @@ type Config struct {
 	TimeoutCommit    time.Duration              // the consensus commitment timeout
 	ChainID          string                     // the network chain-id
 	NumValidators    int                        // the total number of validators to create and bond
-	Mnemonics        []string                   // custom user-provided validator operator mnemonics
 	BondDenom        string                     // the staking bond denomination
 	MinGasPrices     string                     // the minimum gas prices each validator will accept
 	AccountTokens    sdk.Int                    // the amount of unique validator tokens (e.g. 1000node0)
@@ -267,14 +266,12 @@ func New(t *testing.T, cfg Config) *Network {
 
 		p2pAddr, _, err := server.FreeTCPAddr()
 		require.NoError(t, err)
-
 		tmCfg.P2P.ListenAddress = p2pAddr
 		tmCfg.P2P.AddrBookStrict = false
 		tmCfg.P2P.AllowDuplicateIP = true
 
 		nodeID, pubKey, err := genutil.InitializeNodeValidatorFiles(tmCfg)
 		require.NoError(t, err)
-
 		nodeIDs[i] = nodeID
 		valPubKeys[i] = pubKey