Skip to content

Commit cd71ca9

Browse files
committed
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 <[email protected]>
1 parent ab56c33 commit cd71ca9

File tree

9 files changed

+1
-126
lines changed

9 files changed

+1
-126
lines changed

core/chaincode/chaincodetest.yaml

-14
Original file line numberDiff line numberDiff line change
@@ -408,20 +408,6 @@ ledger:
408408

409409
blockchain:
410410

411-
# Define the genesis block
412-
genesisBlock:
413-
414-
# Deploy chaincodes into the genesis block
415-
chaincodes:
416-
417-
#sample_syscc:
418-
# path: github.com/hyperledger/fabric/core/system_chaincode/sample_syscc
419-
# type: GOLANG
420-
# constructor:
421-
# args:
422-
# - greetings
423-
# - hello world
424-
425411
# Setting the deploy-system-chaincode property to false will prevent the
426412
# deploying of system chaincode at genesis time.
427413
deploy-system-chaincode: false

core/ledger/genesis/config.go

-42
This file was deleted.

core/ledger/genesis/genesis.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ var genesisLogger = logging.MustGetLogger("genesis")
2828
var makeGenesisError error
2929
var once sync.Once
3030

31-
// MakeGenesis creates the genesis block based on configuration in core.yaml
32-
// and adds it to the blockchain.
31+
// MakeGenesis creates the genesis block and adds it to the blockchain.
3332
func MakeGenesis() error {
3433
once.Do(func() {
3534
ledger, err := ledger.GetLedger()

core/ledger/genesis/genesis_test.yaml

-15
Original file line numberDiff line numberDiff line change
@@ -211,21 +211,6 @@ ledger:
211211

212212
blockchain:
213213

214-
# Define the genesis block
215-
genesisBlock:
216-
217-
# Deploy chaincodes into the genesis block
218-
chaincode:
219-
path: github.com/hyperledger/fabric/core/example/chaincode/chaincode_example01
220-
type: GOLANG
221-
constructor:
222-
func: init
223-
args:
224-
- alice
225-
- "4"
226-
- bob
227-
- "10"
228-
229214
state:
230215

231216
# Control the number state deltas that are maintained. This takes additional

core/rest/rest_test.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,6 @@ ledger:
344344

345345
blockchain:
346346

347-
# Define the genesis block
348-
genesisBlock:
349-
350347
state:
351348

352349
# Control the number state deltas that are maintained. This takes additional

examples/chaincode/go/asset_management02/asset.yaml

-15
Original file line numberDiff line numberDiff line change
@@ -422,21 +422,6 @@ ledger:
422422

423423
blockchain:
424424

425-
# Define the genesis block
426-
genesisBlock:
427-
428-
# Deploy chaincodes into the genesis block
429-
# chaincode:
430-
# path: github.com/hyperledger/fabric/core/example/chaincode/chaincode_example01
431-
# type: GOLANG
432-
# constructor:
433-
# func: init
434-
# args:
435-
# - alice
436-
# - "4"
437-
# - bob
438-
# - "10"
439-
440425
# Setting the deploy-system-chaincode property to false will prevent the
441426
# deploying of system chaincode at genesis time.
442427
deploy-system-chaincode: false

examples/chaincode/go/asset_management_with_roles/asset.yaml

-15
Original file line numberDiff line numberDiff line change
@@ -397,21 +397,6 @@ ledger:
397397

398398
blockchain:
399399

400-
# Define the genesis block
401-
genesisBlock:
402-
403-
# Deploy chaincodes into the genesis block
404-
# chaincode:
405-
# path: github.com/hyperledger/fabric/core/example/chaincode/chaincode_example01
406-
# type: GOLANG
407-
# constructor:
408-
# func: init
409-
# args:
410-
# - alice
411-
# - "4"
412-
# - bob
413-
# - "10"
414-
415400
# Setting the deploy-system-chaincode property to false will prevent the
416401
# deploying of system chaincode at genesis time.
417402
deploy-system-chaincode: false

membersrvc/ca/ca_test.yaml

-17
Original file line numberDiff line numberDiff line change
@@ -265,23 +265,6 @@ ledger:
265265

266266
blockchain:
267267

268-
# Define the genesis block
269-
genesisBlock:
270-
271-
# Deploy chaincodes into the genesis block
272-
# chaincode:
273-
# - id:
274-
# url: github.com/hyperledger/fabric/core/example/chaincode/chaincode_example01
275-
# version: 0.1.0
276-
# type: GOLANG
277-
# constructor:
278-
# func: init
279-
# args:
280-
# - alice
281-
# - "4"
282-
# - bob
283-
# - "10"
284-
285268
state:
286269

287270
# Control the number state deltas that are maintained. This takes additional

peer/core.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -335,9 +335,6 @@ ledger:
335335

336336
blockchain:
337337

338-
# Define the genesis block
339-
genesisBlock:
340-
341338
state:
342339

343340
# Control the number state deltas that are maintained. This takes additional

0 commit comments

Comments
 (0)