[FAB-1893] Remove underscore from test chain ID

https://jira.hyperledger.org/browse/FAB-1893

FAB-1349 [1] will drop support for underscores in chain IDs. We
therefore need to update the chain ID we use for testing, from
`test_chainid` to `testchainid`.

This changeset takes care of this.

[1] https://jira.hyperledger.org/browse/FAB-1349

Change-Id: Id893beec7cb38aed31c363be03c86568cb76dce7
Signed-off-by: Kostas Christidis <kostas@christidis.io>

Author: Kostas Christidis

bddtests/steps/bootstrap_impl.py

@@ -91,7 +91,7 @@ def step_impl(context, chainId):
 @given(u'the orderer admins use the genesis block for chain "{chainId}" to configure orderers')
 def step_impl(context, chainId):
     pass
-    #raise NotImplementedError(u'STEP: Given the orderer admins use the genesis block for chain "test_chainid" to configure orderers')
+    #raise NotImplementedError(u'STEP: Given the orderer admins use the genesis block for chain "testchainid" to configure orderers')
 
 @given(u'the ordererBootstrapAdmin generates a GUUID to identify the orderer system chain and refer to it by name as "{ordererSystemChainId}"')
 def step_impl(context, ordererSystemChainId):

bddtests/steps/orderer_util.py

@@ -36,7 +36,7 @@
 from common.common_pb2 import Payload
 
 # The default chain ID when the system is statically bootstrapped for testing
-TEST_CHAIN_ID = "test_chainid"
+TEST_CHAIN_ID = "testchainid"
 
 def _defaultDataFunction(index):
     payload = common_pb2.Payload(

common/util/utils.go

@@ -144,7 +144,7 @@ func ArrayToChaincodeArgs(args []string) [][]byte {
 	return bargs
 }
 
-const testchainid = "test_chainid"
+const testchainid = "testchainid"
 const testorgid = "**TEST_ORGID**"
 
 //GetTestChainID returns the CHAINID constant in use by orderer

docs/channel-setup.md

@@ -92,9 +92,9 @@ peer node start --peer-defaultchain=false
 ```
 
 ```
-"--peer-defaultchain=true" is the default. It allow users continue to work with the default "test_chainid" without having to join a chain.
+"--peer-defaultchain=true" is the default. It allow users continue to work with the default "testchainid" without having to join a chain.
 
-"--peer-defaultchain=false" starts the peer with only the channels that were joined by the peer. If the peer never joined a channel it would start up without any channels. In particular, it does not have the default "test_chainid" support.
+"--peer-defaultchain=false" starts the peer with only the channels that were joined by the peer. If the peer never joined a channel it would start up without any channels. In particular, it does not have the default "testchainid" support.
 
 To join channels, a peer MUST be started with the "--peer-defaultchain=false" option.
 ```

examples/ccchecker/ccchecker.json

@@ -14,5 +14,5 @@
        }
    ],
  "TimeoutToAbortSecs": 60,
- "ChainName": "test_chainid"
+ "ChainName": "testchainid"
 }

orderer/common/bootstrap/provisional/provisional.go

@@ -50,7 +50,7 @@ const (
 	// networks. It it necessary to set and export this variable so that test
 	// clients can connect without being rejected for targetting a chain which
 	// does not exist.
-	TestChainID = "test_chainid"
+	TestChainID = "testchainid"
 
 	// AcceptAllPolicyKey is the key of the AcceptAllPolicy.
 	AcceptAllPolicyKey = "AcceptAllPolicy"

peer/node/start.go

@@ -57,7 +57,7 @@ func startCmd() *cobra.Command {
 	flags.BoolVarP(&chaincodeDevMode, "peer-chaincodedev", "", false,
 		"Whether peer in chaincode development mode")
 	flags.BoolVarP(&peerDefaultChain, "peer-defaultchain", "", true,
-		"Whether to start peer with chain test_chainid")
+		"Whether to start peer with chain testchainid")
 
 	return nodeStartCmd
 }
@@ -184,7 +184,7 @@ func serve(args []string) error {
 			panic(fmt.Sprintf("Unable to create genesis block for [%s] due to [%s]", chainID, err))
 		}
 
-		//this creates test_chainid and sets up gossip
+		//this creates testchainid and sets up gossip
 		if err = peer.CreateChainFromBlock(block); err == nil {
 			fmt.Printf("create chain [%s]", chainID)
 			scc.DeploySysCCs(chainID)
@@ -198,7 +198,7 @@ func serve(args []string) error {
 		}
 	}
 
-	//this brings up all the chains (including test_chainid)
+	//this brings up all the chains (including testchainid)
 	peer.Initialize(startDeliveryService)
 
 	logger.Infof("Starting peer with ID=%s, network ID=%s, address=%s",