[FAB-3358] Remove testchainid from peer startup

There is currently a --peer-defaultchain option
which can be passed to peer node start which will
setup a testchain.  This was used in the past while
work was underway to support creating channels but
at this point it is no longer needed and we should not
have test code in the production path.

This is Part 1 of 2 to fix this.  First, we remove
the actual code for creating testchainid but we
leave the CLI flag because the SDK e2e's have it
in their compose cmd.

Change-Id: I7229d647976a5d927dc0c53cfaeebd7f5fa9c811
Signed-off-by: Gari Singh <[email protected]>

Author: mastersingh24

bddtests/dc-peer-base.yml

@@ -30,7 +30,7 @@ services:
     # $$GOPATH (double dollar) required to prevent docker-compose doing its own
     # substitution before the value gets to the container
     #command: sh -c "exec $$GOPATH/src/github.com/hyperledger/fabric/bddtests/scripts/start-peer.sh"
-    command: peer node start --peer-defaultchain=false
+    command: peer node start
 
     # Use these options if coverage desired for peers
     #image: hyperledger/fabric-peer-coverage

docs/source/chaincode.rst

@@ -215,7 +215,7 @@ Command
 
    <th width="371" bgcolor="#ffffff" style="border-top: none; border-bottom: 1.50pt solid #e1e4e5; border-left: none; border-right: none; padding-top: 0in; padding-bottom: 0.08in; padding-left: 0in; padding-right: 0in">
 
-stdout result in the event of success
+stdout result in the event of success
 
 .. raw:: html
 
@@ -251,7 +251,7 @@ version
 
    <td width="371" bgcolor="#f3f6f6" style="border-top: 1px solid #e1e4e5; border-bottom: 1px solid #e1e4e5; border-left: 1px solid #e1e4e5; border-right: none; padding-top: 0in; padding-bottom: 0.08in; padding-left: 0.16in; padding-right: 0in">
 
-String form of peer.version defined in core.yaml
+String form of peer.version defined in core.yaml
 
 .. raw:: html
 
@@ -307,7 +307,7 @@ node status
 
    <td width="371" bgcolor="#f3f6f6" style="border-top: 1px solid #e1e4e5; border-bottom: 1px solid #e1e4e5; border-left: 1px solid #e1e4e5; border-right: none; padding-top: 0in; padding-bottom: 0.08in; padding-left: 0.16in; padding-right: 0in">
 
-String form of StatusCode
+String form of StatusCode
 
 .. raw:: html
 
@@ -335,7 +335,7 @@ node stop
 
    <td width="371" bgcolor="#ffffff" style="border-top: 1px solid #e1e4e5; border-bottom: 1px solid #e1e4e5; border-left: 1px solid #e1e4e5; border-right: none; padding-top: 0in; padding-bottom: 0.08in; padding-left: 0.16in; padding-right: 0in">
 
-String form of StatusCode
+String form of StatusCode
 
 .. raw:: html
 
@@ -364,7 +364,7 @@ chaincode deploy
    <td width="371" bgcolor="#f3f6f6" style="border-top: 1px solid #e1e4e5; border-bottom: 1px solid #e1e4e5; border-left: 1px solid #e1e4e5; border-right: none; padding-top: 0in; padding-bottom: 0.08in; padding-left: 0.16in; padding-right: 0in">
 
 The chaincode container name (hash) required for subsequent chaincode
-invoke and chaincode query commands
+invoke and chaincode query commands
 
 .. raw:: html
 
@@ -490,31 +490,6 @@ Adds a peer to the chain
 
    <tr>
 
-.. raw:: html
-
-   <td width="262" bgcolor="#f3f6f6" style="border-top: 1px solid #e1e4e5; border-bottom: 1px solid #e1e4e5; border-left: 1px solid #e1e4e5; border-right: none; padding-top: 0in; padding-bottom: 0.08in; padding-left: 0.16in; padding-right: 0in">
-
-.. raw:: html
-
-   <pre class="western" style="orphans: 2; widows: 2"><span style="display: inline-block; border: 1px solid #e1e4e5; padding: 0.01in"><span style="font-variant: normal"><font color="#e74c3c"><font face="Consolas, Andale Mono WT, Andale Mono, Lucida Console, Lucida Sans Typewriter, DejaVu Sans Mono, Bitstream Vera Sans Mono, Liberation Mono, Nimbus Mono L, Monaco, Courier New, Courier, monospace"><font size="1" style="font-size: 7pt"><span style="letter-spacing: normal"><span lang="en-US"><span style="font-style: normal"><span style="font-weight: normal">--peer-defaultchain=true</span></span></span></span></font></font></font></span></span></pre>
-
-.. raw:: html
-
-   </td>
-
-.. raw:: html
-
-   <td width="371" bgcolor="#f3f6f6" style="border-top: 1px solid #e1e4e5; border-bottom: 1px solid #e1e4e5; border-left: 1px solid #e1e4e5; border-right: none; padding-top: 0in; padding-bottom: 0.08in; padding-left: 0.16in; padding-right: 0in">
-
- Allows users to continue to work with the default TEST\_CHAINID string.
-Command line options support writing this value as raw bytes (-r, –raw)
-or formatted as the hexadecimal representation of the raw bytes (-x,
-–hex). If the query response is empty then nothing is output.
-
-.. raw:: html
-
-   </td>
-
 .. raw:: html
 
    </tbody>

docs/source/peer-chaincode-devmode.rst

@@ -28,7 +28,7 @@ Start the peer in dev mode
 
 ::
 
-    peer node start --peer-defaultchain=false --peer-chaincodedev=true
+    peer node start --peer-chaincodedev=true
 
 The above command starts the peer using the default ``sampleconfig/msp``
 MSP. The ``--peer-chaincodedev=true`` puts it in “dev” mode.
@@ -77,13 +77,13 @@ Use the chaincode
 
 Even though you are in ``--peer-chaincodedev`` mode, you still have to install the chaincode so the life-cycle system
 chaincode can go through its checks normally. This requirement may be removed in future when in ``--peer-chaincodedev``
-mode. 
+mode.
 
 ::
 
     peer chaincode install -n mycc -v 0 -p github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02
 
-Once installed, the chaincode is ready to be instantiated. 
+Once installed, the chaincode is ready to be instantiated.
 
 ::
 

examples/cluster/compose/peer-base/peer-base.yaml

@@ -17,4 +17,4 @@ services:
       - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=compose_default
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-    command: peer node start --peer-defaultchain=false
+    command: peer node start

examples/e2e_cli/base/peer-base.yaml

@@ -27,4 +27,4 @@ services:
       - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/tls/server.key
       - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/tls/ca.crt
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
-    command: peer node start --peer-defaultchain=false
+    command: peer node start

peer/node/start.go

@@ -23,15 +23,11 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
-	"strings"
 	"syscall"
 	"time"
 
-	genesisconfig "github.com/hyperledger/fabric/common/configtx/tool/localconfig"
-	"github.com/hyperledger/fabric/common/configtx/tool/provisional"
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/common/localmsp"
-	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core"
 	"github.com/hyperledger/fabric/core/chaincode"
 	"github.com/hyperledger/fabric/core/comm"
@@ -46,7 +42,6 @@ import (
 	"github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/peer/common"
 	peergossip "github.com/hyperledger/fabric/peer/gossip"
-	cb "github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -69,7 +64,7 @@ func startCmd() *cobra.Command {
 	flags := nodeStartCmd.Flags()
 	flags.BoolVarP(&chaincodeDevMode, "peer-chaincodedev", "", false,
 		"Whether peer in chaincode development mode")
-	flags.BoolVarP(&peerDefaultChain, "peer-defaultchain", "", true,
+	flags.BoolVarP(&peerDefaultChain, "peer-defaultchain", "", false,
 		"Whether to start peer with chain testchainid")
 	flags.StringVarP(&orderingEndpoint, "orderer", "o", "orderer:7050", "Ordering service endpoint")
 
@@ -183,44 +178,6 @@ func serve(args []string) error {
 	//initialize system chaincodes
 	initSysCCs()
 
-	// Begin startup of default chain
-	if peerDefaultChain {
-		if orderingEndpoint == "" {
-			logger.Panic("No ordering service endpoint provided, please use -o option.")
-		}
-
-		if len(strings.Split(orderingEndpoint, ":")) != 2 {
-			logger.Panicf("Invalid format of ordering service endpoint, %s.", orderingEndpoint)
-		}
-
-		chainID := util.GetTestChainID()
-
-		var block *cb.Block
-
-		func() {
-			defer func() {
-				if err := recover(); err != nil {
-					logger.Fatalf("Peer configured to start with the default test chain, but supporting configuration files did not match.  Please ensure that configtx.yaml contains the unmodified SampleSingleMSPSolo profile and that sampleconfig/msp is present.\n%s", err)
-				}
-			}()
-
-			genConf := genesisconfig.Load(genesisconfig.SampleSingleMSPSoloProfile)
-			genConf.Orderer.Addresses = []string{orderingEndpoint}
-			genConf.Application.Organizations[0].Name = XXXDefaultChannelMSPID
-			genConf.Application.Organizations[0].ID = XXXDefaultChannelMSPID
-			block = provisional.New(genConf).GenesisBlockForChannel(chainID)
-		}()
-
-		//this creates testchainid and sets up gossip
-		if err = peer.CreateChainFromBlock(block); err == nil {
-			logger.Infof("create chain [%s]", chainID)
-			scc.DeploySysCCs(chainID)
-			logger.Infof("Deployed system chaincodes on %s", chainID)
-		} else {
-			logger.Errorf("create default chain [%s] failed with %s", chainID, err)
-		}
-	}
-
 	//this brings up all the chains (including testchainid)
 	peer.Initialize(func(cid string) {
 		logger.Debugf("Deploying system CC, for chain <%s>", cid)