Remove dead code in genesis pkg

No invocation path found for config.go in genesis package, After remove config.go, the genesisBlock item in config file is also no needed. Change-Id: I093ef40027a67e1070bdc0fde6e8edcf6f34dd2e Signed-off-by: grapebaba <281165273@qq.com>
hyperledger · Aug 4, 2016 · cd71ca9 · cd71ca9
1 parent ab56c33
commit cd71ca9
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 126 deletions.
diff --git a/core/chaincode/chaincodetest.yaml b/core/chaincode/chaincodetest.yaml
@@ -408,20 +408,6 @@ ledger:
 
   blockchain:
 
-    # Define the genesis block
-    genesisBlock:
-
-      # Deploy chaincodes into the genesis block
-      chaincodes:
-
-        #sample_syscc:
-        #  path: github.com/hyperledger/fabric/core/system_chaincode/sample_syscc
-        #  type: GOLANG
-        #  constructor:
-        #    args:
-        #      - greetings
-        #      - hello world
-
     # Setting the deploy-system-chaincode property to false will prevent the
     # deploying of system chaincode at genesis time.
     deploy-system-chaincode: false

diff --git a/core/ledger/genesis/config.go b/core/ledger/genesis/config.go
diff --git a/core/ledger/genesis/genesis.go b/core/ledger/genesis/genesis.go
@@ -28,8 +28,7 @@ var genesisLogger = logging.MustGetLogger("genesis")
 var makeGenesisError error
 var once sync.Once
 
-// MakeGenesis creates the genesis block based on configuration in core.yaml
-// and adds it to the blockchain.
+// MakeGenesis creates the genesis block and adds it to the blockchain.
 func MakeGenesis() error {
 	once.Do(func() {
 		ledger, err := ledger.GetLedger()

diff --git a/core/ledger/genesis/genesis_test.yaml b/core/ledger/genesis/genesis_test.yaml
@@ -211,21 +211,6 @@ ledger:
 
   blockchain:
 
-    # Define the genesis block
-    genesisBlock:
-
-      # Deploy chaincodes into the genesis block
-      chaincode:
-          path: github.com/hyperledger/fabric/core/example/chaincode/chaincode_example01
-          type: GOLANG
-          constructor:
-            func: init
-            args:
-              - alice
-              - "4"
-              - bob
-              - "10"
-
   state:
 
     # Control the number state deltas that are maintained. This takes additional

diff --git a/core/rest/rest_test.yaml b/core/rest/rest_test.yaml
@@ -344,9 +344,6 @@ ledger:
 
   blockchain:
 
-    # Define the genesis block
-    genesisBlock:
-
   state:
 
     # Control the number state deltas that are maintained. This takes additional

diff --git a/examples/chaincode/go/asset_management02/asset.yaml b/examples/chaincode/go/asset_management02/asset.yaml
@@ -422,21 +422,6 @@ ledger:
 
   blockchain:
 
-    # Define the genesis block
-    genesisBlock:
-
-      # Deploy chaincodes into the genesis block
-      # chaincode:
-      #     path: github.com/hyperledger/fabric/core/example/chaincode/chaincode_example01
-      #     type: GOLANG
-      #     constructor:
-      #       func: init
-      #       args:
-      #         - alice
-      #         - "4"
-      #         - bob
-      #         - "10"
-
     # Setting the deploy-system-chaincode property to false will prevent the
     # deploying of system chaincode at genesis time.
     deploy-system-chaincode: false

diff --git a/examples/chaincode/go/asset_management_with_roles/asset.yaml b/examples/chaincode/go/asset_management_with_roles/asset.yaml
@@ -397,21 +397,6 @@ ledger:
 
   blockchain:
 
-    # Define the genesis block
-    genesisBlock:
-
-      # Deploy chaincodes into the genesis block
-      # chaincode:
-      #     path: github.com/hyperledger/fabric/core/example/chaincode/chaincode_example01
-      #     type: GOLANG
-      #     constructor:
-      #       func: init
-      #       args:
-      #         - alice
-      #         - "4"
-      #         - bob
-      #         - "10"
-
     # Setting the deploy-system-chaincode property to false will prevent the
     # deploying of system chaincode at genesis time.
     deploy-system-chaincode: false

diff --git a/membersrvc/ca/ca_test.yaml b/membersrvc/ca/ca_test.yaml
@@ -265,23 +265,6 @@ ledger:
 
   blockchain:
 
-    # Define the genesis block
-    genesisBlock:
-
-      # Deploy chaincodes into the genesis block
-      # chaincode:
-      #   - id:
-      #       url: github.com/hyperledger/fabric/core/example/chaincode/chaincode_example01
-      #       version: 0.1.0
-      #     type: GOLANG
-      #     constructor:
-      #       func: init
-      #       args:
-      #         - alice
-      #         - "4"
-      #         - bob
-      #         - "10"
-
     state:
 
       # Control the number state deltas that are maintained. This takes additional

diff --git a/peer/core.yaml b/peer/core.yaml
@@ -335,9 +335,6 @@ ledger:
 
   blockchain:
 
-    # Define the genesis block
-    genesisBlock:
-
   state:
 
     # Control the number state deltas that are maintained. This takes additional