Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove etcd/raft fixtures from sampleconfig folder
This addresses FAB-12198.

Change-Id: Ib72f21560a0852bb84f84d41a0784db0a3ef9479
Signed-off-by: Kostas Christidis <kostas@christidis.io>
  • Loading branch information
kchristidis committed Nov 13, 2018
1 parent 08b5332 commit f21d8b9
Show file tree
Hide file tree
Showing 5 changed files with 169 additions and 34 deletions.
6 changes: 4 additions & 2 deletions orderer/common/server/etcdraft_test.go
Expand Up @@ -23,6 +23,9 @@ import (
func TestSpawnEtcdRaft(t *testing.T) {
gt := NewGomegaWithT(t)

cwd, err := filepath.Abs(".")
gt.Expect(err).NotTo(HaveOccurred())

// Create tempdir to be used to store the genesis block for the system channel
tempDir, err := ioutil.TempDir("", "etcdraft-orderer-launch")
gt.Expect(err).NotTo(HaveOccurred())
Expand All @@ -46,7 +49,7 @@ func TestSpawnEtcdRaft(t *testing.T) {
genesisBlockPath := filepath.Join(tempDir, "genesis.block")
cmd := exec.Command(configtxgen, "-channelID", "system", "-profile", "SampleDevModeEtcdRaft",
"-outputBlock", genesisBlockPath)
cmd.Env = append(cmd.Env, fmt.Sprintf("FABRIC_CFG_PATH=%s", filepath.Join(fabricRootDir, "sampleconfig")))
cmd.Env = append(cmd.Env, fmt.Sprintf("FABRIC_CFG_PATH=%s", filepath.Join(cwd, "testdata")))
configtxgenProcess, err := gexec.Start(cmd, nil, nil)
gt.Expect(err).NotTo(HaveOccurred())

Expand All @@ -68,7 +71,6 @@ func launchOrderer(gt *GomegaWithT, cmd *exec.Cmd, orderer, tempDir, genesisBloc
cmd = exec.Command(orderer)
cmd.Env = []string{
"ORDERER_GENERAL_LISTENPORT=5611",
"ORDERER_GENERAL_GENESISPROFILE=SampleDevModeEtcdRaft",
"ORDERER_GENERAL_GENESISMETHOD=file",
"ORDERER_GENERAL_SYSTEMCHANNEL=system",
"ORDERER_GENERAL_TLS_CLIENTAUTHREQUIRED=true",
Expand Down
165 changes: 165 additions & 0 deletions orderer/common/server/testdata/configtx.yaml
@@ -0,0 +1,165 @@
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#

---
Organizations:
- &SampleOrg
Name: SampleOrg
ID: SampleOrg
MSPDir: ../../../../sampleconfig/msp
Policies: &SampleOrgPolicies
Readers:
Type: Signature
Rule: "OR('SampleOrg.member')"
Writers:
Type: Signature
Rule: "OR('SampleOrg.member')"
Admins:
Type: Signature
Rule: "OR('SampleOrg.admin')"
AnchorPeers:
- Host: 127.0.0.1
Port: 7051

Capabilities:
Channel: &ChannelCapabilities
V1_3: true
Orderer: &OrdererCapabilities
V1_1: true
Application: &ApplicationCapabilities
V1_3: true
V1_2: false
V1_1: false

Application: &ApplicationDefaults
ACLs: &ACLsDefault
lscc/ChaincodeExists: /Channel/Application/Readers
lscc/GetDeploymentSpec: /Channel/Application/Readers
lscc/GetChaincodeData: /Channel/Application/Readers
lscc/GetInstantiatedChaincodes: /Channel/Application/Readers
qscc/GetChainInfo: /Channel/Application/Readers
qscc/GetBlockByNumber: /Channel/Application/Readers
qscc/GetBlockByHash: /Channel/Application/Readers
qscc/GetTransactionByID: /Channel/Application/Readers
qscc/GetBlockByTxID: /Channel/Application/Readers
cscc/GetConfigBlock: /Channel/Application/Readers
cscc/GetConfigTree: /Channel/Application/Readers
cscc/SimulateConfigTreeUpdate: /Channel/Application/Readers
peer/Propose: /Channel/Application/Writers
peer/ChaincodeToChaincode: /Channel/Application/Readers
event/Block: /Channel/Application/Readers
event/FilteredBlock: /Channel/Application/Readers
Organizations:
Policies: &ApplicationDefaultPolicies
Readers:
Type: ImplicitMeta
Rule: "ANY Readers"
Writers:
Type: ImplicitMeta
Rule: "ANY Writers"
Admins:
Type: ImplicitMeta
Rule: "MAJORITY Admins"
Capabilities:
<<: *ApplicationCapabilities

Orderer: &OrdererDefaults
OrdererType: solo
Addresses:
- 127.0.0.1:7050
BatchTimeout: 2s
BatchSize:
MaxMessageCount: 10
AbsoluteMaxBytes: 10 MB
PreferredMaxBytes: 512 KB
MaxChannels: 0
EtcdRaft:
Consenters:
- Host: raft0.example.com
Port: 7050
ClientTLSCert: path/to/ClientTLSCert0
ServerTLSCert: path/to/ServerTLSCert0
- Host: raft1.example.com
Port: 7050
ClientTLSCert: path/to/ClientTLSCert1
ServerTLSCert: path/to/ServerTLSCert1
- Host: raft2.example.com
Port: 7050
ClientTLSCert: path/to/ClientTLSCert2
ServerTLSCert: path/to/ServerTLSCert2
Options:
TickInterval: 100
ElectionTick: 10
HeartbeatTick: 1
MaxInflightMsgs: 256
MaxSizePerMsg: 1048576
Organizations:
Policies:
Readers:
Type: ImplicitMeta
Rule: "ANY Readers"
Writers:
Type: ImplicitMeta
Rule: "ANY Writers"
Admins:
Type: ImplicitMeta
Rule: "MAJORITY Admins"
BlockValidation:
Type: ImplicitMeta
Rule: "ANY Writers"
Capabilities:
<<: *OrdererCapabilities

Channel: &ChannelDefaults
Policies:
Readers:
Type: ImplicitMeta
Rule: "ANY Readers"
Writers:
Type: ImplicitMeta
Rule: "ANY Writers"
Admins:
Type: ImplicitMeta
Rule: "MAJORITY Admins"
Capabilities:
<<: *ChannelCapabilities

Profiles:
SampleDevModeEtcdRaft:
<<: *ChannelDefaults
Orderer:
<<: *OrdererDefaults
OrdererType: etcdraft
EtcdRaft:
Consenters:
- Host: raft0.example.com
Port: 7050
ClientTLSCert: tls/server.crt
ServerTLSCert: tls/server.crt
Organizations:
- <<: *SampleOrg
Policies:
<<: *SampleOrgPolicies
Admins:
Type: Signature
Rule: "OR('SampleOrg.member')"
Application:
<<: *ApplicationDefaults
Organizations:
- <<: *SampleOrg
Policies:
<<: *SampleOrgPolicies
Admins:
Type: Signature
Rule: "OR('SampleOrg.member')"
Consortiums:
SampleConsortium:
Organizations:
- <<: *SampleOrg
Policies:
<<: *SampleOrgPolicies
Admins:
Type: Signature
Rule: "OR('SampleOrg.member')"
6 changes: 0 additions & 6 deletions sampleconfig/configtx.yaml
Expand Up @@ -551,12 +551,6 @@ Profiles:
Orderer:
<<: *OrdererDefaults
OrdererType: etcdraft
EtcdRaft:
Consenters:
- Host: 127.0.0.1
Port: 7050
ClientTLSCert: etcdraft/tls-client-1.pem
ServerTLSCert: etcdraft/tls-server-1.pem
Organizations:
- <<: *SampleOrg
Policies:
Expand Down
13 changes: 0 additions & 13 deletions sampleconfig/etcdraft/tls-client-1.pem

This file was deleted.

13 changes: 0 additions & 13 deletions sampleconfig/etcdraft/tls-server-1.pem

This file was deleted.

0 comments on commit f21d8b9

Please sign in to comment.