FAB-1763 Rename **TEST_CHAINID** to test_chainid

Chainid becomes database name in CouchDB. CouchDB naming conventions: Only lowercase characters (a-z), digits (0-9), and any of the characters _, $, (, ), +, -, and / are allowed. Must begin with a letter. Therefore, we either need to adopt these same restrictions for chainid naming, or have a deterministic mapping of chainid to a valid (and unique) CouchDB database name. The complete fix will be delivered in FAB-1764. In FAB-1763 we simply change '**TEST_CHAINID**' to 'test_chainid' in order to unblock current failures. Change-Id: Id274b37f5a07813b172db0e695ec803e63a09726 Signed-off-by: denyeart <[email protected]>
hyperledger · Jan 19, 2017 · 5bc5227 · 5bc5227
1 parent add2776
commit 5bc5227
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/bddtests/features/bootstrap.feature b/bddtests/features/bootstrap.feature
@@ -131,4 +131,4 @@ Feature: Bootstrap
 
     Examples: Orderer Options
       |          ComposeFile                 |    Waittime   |       OrdererSystemChainId       |PolicyType    |   ConsensusType |
-      |   docker-compose-next-4.yml          |       60      |   **TEST_CHAINID**               |unanimous    |       solo      |
+      |   docker-compose-next-4.yml          |       60      |   test_chainid               |unanimous    |       solo      |
diff --git a/bddtests/steps/bootstrap_impl.py b/bddtests/steps/bootstrap_impl.py
@@ -84,7 +84,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 "test_chainid" 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):

diff --git a/bddtests/steps/orderer_util.py b/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 = "test_chainid"
 
 def _defaultDataFunction(index):
     payload = common_pb2.Payload(

diff --git a/common/util/utils.go b/common/util/utils.go
@@ -144,7 +144,7 @@ func ArrayToChaincodeArgs(args []string) [][]byte {
 	return bargs
 }
 
-const testchainid = "**TEST_CHAINID**"
+const testchainid = "test_chainid"
 const testorgid = "**TEST_ORGID**"
 
 //GetTestChainID returns the CHAINID constant in use by orderer

diff --git a/docs/channel-setup.md b/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 "test_chainid" 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 "test_chainid" support.
 
 To join channels, a peer MUST be started with the "--peer-defaultchain=false" option.
 ```

diff --git a/examples/ccchecker/ccchecker.json b/examples/ccchecker/ccchecker.json
@@ -1,7 +1,7 @@
 {"Chaincodes":
   [
        {"Name": "mycc",
-	"InitArgs":[""], 
+	"InitArgs":[""],
         "Path": "github.com/hyperledger/fabric/examples/ccchecker/chaincodes/newkeyperinvoke",
 	"NumFinalQueryAttempts": 10,
 	"NumberOfInvokes": 10,
@@ -14,5 +14,5 @@
        }
    ],
  "TimeoutToAbortSecs": 60,
- "ChainName": "**TEST_CHAINID**"
+ "ChainName": "test_chainid"
 }
diff --git a/orderer/common/bootstrap/provisional/provisional.go b/orderer/common/bootstrap/provisional/provisional.go
@@ -49,7 +49,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 = "test_chainid"
 
 	// AcceptAllPolicyKey is the key of the AcceptAllPolicy.
 	AcceptAllPolicyKey = "AcceptAllPolicy"

diff --git a/peer/node/start.go b/peer/node/start.go
@@ -56,7 +56,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 test_chainid")
 
 	return nodeStartCmd
 }
@@ -183,7 +183,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 and sets up gossip
+		//this creates test_chainid and sets up gossip
 		if err = peer.CreateChainFromBlock(block); err == nil {
 			fmt.Printf("create chain [%s]", chainID)
 			chaincode.DeploySysCCs(chainID)
@@ -197,7 +197,7 @@ func serve(args []string) error {
 		}
 	}
 
-	//this brings up all the chains (including **TEST_CHAINID**)
+	//this brings up all the chains (including test_chainid)
 	peer.Initialize(startDeliveryService)
 
 	logger.Infof("Starting peer with ID=%s, network ID=%s, address=%s",