From f1ec0e21934561f03abd6fc5266bd804afd9d0f5 Mon Sep 17 00:00:00 2001
From: likhita-809 <78951027+likhita-809@users.noreply.github.com>
Date: Thu, 3 Jun 2021 20:38:21 +0530
Subject: [PATCH] fix: Fix testnet command (#9454)

* accept hyphen in node-dir-prefix flag for testnet and change `node-dir-prefixtoken` to `testtoken`

* remove unnecessary use of fmt.Sprintf in simapp/simd/cmd/testnet.go

* add changelog

* add  changelog

* remove unrelated changelog
---
 CHANGELOG.md               | 1 +
 simapp/simd/cmd/testnet.go | 2 +-
 types/coin.go              | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe9eee18f6..abd920da83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -142,6 +142,7 @@ if input key is empty, or input data contains empty key.
 
 ### Bug Fixes
 
+* [\#9454](https://github.com/cosmos/cosmos-sdk/pull/9454) Fix testnet command with --node-dir-prefix accepts `-` and change `node-dir-prefix token` to `testtoken`.
 * (x/gov) [\#8813](https://github.com/cosmos/cosmos-sdk/pull/8813) fix `GET /cosmos/gov/v1beta1/proposals/{proposal_id}/deposits` to include initial deposit
 * (gRPC) [\#8945](https://github.com/cosmos/cosmos-sdk/pull/8945) gRPC reflection now works correctly.
 * (keyring) [#\8635](https://github.com/cosmos/cosmos-sdk/issues/8635) Remove hardcoded default passphrase value on `NewMnemonic`
diff --git a/simapp/simd/cmd/testnet.go b/simapp/simd/cmd/testnet.go
index d188253a63..d789c3471f 100644
--- a/simapp/simd/cmd/testnet.go
+++ b/simapp/simd/cmd/testnet.go
@@ -199,7 +199,7 @@ func InitTestnet(
 		accTokens := sdk.TokensFromConsensusPower(1000, sdk.DefaultPowerReduction)
 		accStakingTokens := sdk.TokensFromConsensusPower(500, sdk.DefaultPowerReduction)
 		coins := sdk.Coins{
-			sdk.NewCoin(fmt.Sprintf("%stoken", nodeDirName), accTokens),
+			sdk.NewCoin("testtoken", accTokens),
 			sdk.NewCoin(sdk.DefaultBondDenom, accStakingTokens),
 		}
 
diff --git a/types/coin.go b/types/coin.go
index c6675a1c7a..3cfc58b7b3 100644
--- a/types/coin.go
+++ b/types/coin.go
@@ -634,7 +634,7 @@ func (coins Coins) Sort() Coins {
 var (
 	// Denominations can be 3 ~ 128 characters long and support letters, followed by either
 	// a letter, a number or a separator ('/').
-	reDnmString = `[a-zA-Z][a-zA-Z0-9/]{2,127}`
+	reDnmString = `[a-zA-Z][a-zA-Z0-9/-]{2,127}`
 	reDecAmt    = `[[:digit:]]+(?:\.[[:digit:]]+)?|\.[[:digit:]]+`
 	reSpc       = `[[:space:]]*`
 	reDnm       *regexp.Regexp