[FAB-10185] Reorder for logical consistency

Change-Id: I0274250c8c0c5d1801b6db0fb7bfce3359bb1c2f Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
hyperledger · May 17, 2018 · 5cf1944 · 5cf1944
1 parent e2f4f20
commit 5cf1944
Show file tree

Hide file tree

Showing 3 changed files with 153 additions and 153 deletions.
diff --git a/balance-transfer/artifacts/channel/configtx.yaml b/balance-transfer/artifacts/channel/configtx.yaml
@@ -4,51 +4,6 @@
 #
 
 ---
-################################################################################
-#
-# SECTION: Orderer
-#
-# - This section defines the values to encode into a config transaction or
-# genesis block for orderer related parameters
-#
-################################################################################
-Orderer: &OrdererDefaults
-
- # Orderer Type: The orderer implementation to start
- # Available types are "solo" and "kafka"
- OrdererType: solo
-
- Addresses:
- - orderer.example.com:7050
-
- # Batch Timeout: The amount of time to wait before creating a batch
- BatchTimeout: 2s
-
- # Batch Size: Controls the number of messages batched into a block
- BatchSize:
-
- # Max Message Count: The maximum number of messages to permit in a batch
- MaxMessageCount: 10
-
- # Absolute Max Bytes: The absolute maximum number of bytes allowed for
- # the serialized messages in a batch.
- AbsoluteMaxBytes: 98 MB
-
- # Preferred Max Bytes: The preferred maximum number of bytes allowed for
- # the serialized messages in a batch. A message larger than the preferred
- # max bytes will result in a batch larger than preferred max bytes.
- PreferredMaxBytes: 512 KB
-
- Kafka:
- # Brokers: A list of Kafka brokers to which the orderer connects
- # NOTE: Use IP:port notation
- Brokers:
- - 127.0.0.1:9092
-
- # Organizations is the list of orgs which are defined as participants on
- # the orderer side of the network
- Organizations:
-
 ################################################################################
 #
 # Section: Organizations
@@ -120,6 +75,51 @@ Application: &ApplicationDefaults
  # the application side of the network
  Organizations:
 
+################################################################################
+#
+# SECTION: Orderer
+#
+# - This section defines the values to encode into a config transaction or
+# genesis block for orderer related parameters
+#
+################################################################################
+Orderer: &OrdererDefaults
+
+ # Orderer Type: The orderer implementation to start
+ # Available types are "solo" and "kafka"
+ OrdererType: solo
+
+ Addresses:
+ - orderer.example.com:7050
+
+ # Batch Timeout: The amount of time to wait before creating a batch
+ BatchTimeout: 2s
+
+ # Batch Size: Controls the number of messages batched into a block
+ BatchSize:
+
+ # Max Message Count: The maximum number of messages to permit in a batch
+ MaxMessageCount: 10
+
+ # Absolute Max Bytes: The absolute maximum number of bytes allowed for
+ # the serialized messages in a batch.
+ AbsoluteMaxBytes: 98 MB
+
+ # Preferred Max Bytes: The preferred maximum number of bytes allowed for
+ # the serialized messages in a batch. A message larger than the preferred
+ # max bytes will result in a batch larger than preferred max bytes.
+ PreferredMaxBytes: 512 KB
+
+ Kafka:
+ # Brokers: A list of Kafka brokers to which the orderer connects
+ # NOTE: Use IP:port notation
+ Brokers:
+ - 127.0.0.1:9092
+
+ # Organizations is the list of orgs which are defined as participants on
+ # the orderer side of the network
+ Organizations:
+
 ################################################################################
 #
 # Profile

diff --git a/basic-network/configtx.yaml b/basic-network/configtx.yaml
@@ -4,51 +4,6 @@
 #
 
 ---
-################################################################################
-#
-# SECTION: Orderer
-#
-# - This section defines the values to encode into a config transaction or
-# genesis block for orderer related parameters
-#
-################################################################################
-Orderer: &OrdererDefaults
-
- # Orderer Type: The orderer implementation to start
- # Available types are "solo" and "kafka"
- OrdererType: solo
-
- Addresses:
- - orderer.example.com:7050
-
- # Batch Timeout: The amount of time to wait before creating a batch
- BatchTimeout: 2s
-
- # Batch Size: Controls the number of messages batched into a block
- BatchSize:
-
- # Max Message Count: The maximum number of messages to permit in a batch
- MaxMessageCount: 10
-
- # Absolute Max Bytes: The absolute maximum number of bytes allowed for
- # the serialized messages in a batch.
- AbsoluteMaxBytes: 99 MB
-
- # Preferred Max Bytes: The preferred maximum number of bytes allowed for
- # the serialized messages in a batch. A message larger than the preferred
- # max bytes will result in a batch larger than preferred max bytes.
- PreferredMaxBytes: 512 KB
-
- Kafka:
- # Brokers: A list of Kafka brokers to which the orderer connects
- # NOTE: Use IP:port notation
- Brokers:
- - 127.0.0.1:9092
-
- # Organizations is the list of orgs which are defined as participants on
- # the orderer side of the network
- Organizations:
-
 ################################################################################
 #
 # Section: Organizations
@@ -103,6 +58,51 @@ Application: &ApplicationDefaults
  # the application side of the network
  Organizations:
 
+################################################################################
+#
+# SECTION: Orderer
+#
+# - This section defines the values to encode into a config transaction or
+# genesis block for orderer related parameters
+#
+################################################################################
+Orderer: &OrdererDefaults
+
+ # Orderer Type: The orderer implementation to start
+ # Available types are "solo" and "kafka"
+ OrdererType: solo
+
+ Addresses:
+ - orderer.example.com:7050
+
+ # Batch Timeout: The amount of time to wait before creating a batch
+ BatchTimeout: 2s
+
+ # Batch Size: Controls the number of messages batched into a block
+ BatchSize:
+
+ # Max Message Count: The maximum number of messages to permit in a batch
+ MaxMessageCount: 10
+
+ # Absolute Max Bytes: The absolute maximum number of bytes allowed for
+ # the serialized messages in a batch.
+ AbsoluteMaxBytes: 99 MB
+
+ # Preferred Max Bytes: The preferred maximum number of bytes allowed for
+ # the serialized messages in a batch. A message larger than the preferred
+ # max bytes will result in a batch larger than preferred max bytes.
+ PreferredMaxBytes: 512 KB
+
+ Kafka:
+ # Brokers: A list of Kafka brokers to which the orderer connects
+ # NOTE: Use IP:port notation
+ Brokers:
+ - 127.0.0.1:9092
+
+ # Organizations is the list of orgs which are defined as participants on
+ # the orderer side of the network
+ Organizations:
+
 ################################################################################
 #
 # Profile

diff --git a/first-network/configtx.yaml b/first-network/configtx.yaml
@@ -4,55 +4,6 @@
 #
 
 ---
-################################################################################
-#
-# SECTION: Capabilities
-#
-# - This section defines the capabilities of fabric network. This is a new
-# concept as of v1.1.0 and should not be utilized in mixed networks with
-# v1.0.x peers and orderers. Capabilities define features which must be
-# present in a fabric binary for that binary to safely participate in the
-# fabric network. For instance, if a new MSP type is added, newer binaries
-# might recognize and validate the signatures from this type, while older
-# binaries without this support would be unable to validate those
-# transactions. This could lead to different versions of the fabric binaries
-# having different world states. Instead, defining a capability for a channel
-# informs those binaries without this capability that they must cease
-# processing transactions until they have been upgraded. For v1.0.x if any
-# capabilities are defined (including a map with all capabilities turned off)
-# then the v1.0.x peer will deliberately crash.
-#
-################################################################################
-Capabilities:
- # Channel capabilities apply to both the orderers and the peers and must be
- # supported by both. Set the value of the capability to true to require it.
- Global: &ChannelCapabilities
- # V1.1 for Global is a catchall flag for behavior which has been
- # determined to be desired for all orderers and peers running v1.0.x,
- # but the modification of which would cause incompatibilities. Users
- # should leave this flag set to true.
- V1_1: true
-
- # Orderer capabilities apply only to the orderers, and may be safely
- # manipulated without concern for upgrading peers. Set the value of the
- # capability to true to require it.
- Orderer: &OrdererCapabilities
- # V1.1 for Order is a catchall flag for behavior which has been
- # determined to be desired for all orderers running v1.0.x, but the
- # modification of which would cause incompatibilities. Users should
- # leave this flag set to true.
- V1_1: true
-
- # Application capabilities apply only to the peer network, and may be safely
- # manipulated without concern for upgrading orderers. Set the value of the
- # capability to true to require it.
- Application: &ApplicationCapabilities
- # V1.1 for Application is a catchall flag for behavior which has been
- # determined to be desired for all peers running v1.0.x, but the
- # modification of which would cause incompatibilities. Users should
- # leave this flag set to true.
- V1_1: true
-
 ################################################################################
 #
 # Section: Organizations
@@ -110,6 +61,69 @@ Organizations:
  - Host: peer0.org2.example.com
  Port: 7051
 
+################################################################################
+#
+# SECTION: Capabilities
+#
+# - This section defines the capabilities of fabric network. This is a new
+# concept as of v1.1.0 and should not be utilized in mixed networks with
+# v1.0.x peers and orderers. Capabilities define features which must be
+# present in a fabric binary for that binary to safely participate in the
+# fabric network. For instance, if a new MSP type is added, newer binaries
+# might recognize and validate the signatures from this type, while older
+# binaries without this support would be unable to validate those
+# transactions. This could lead to different versions of the fabric binaries
+# having different world states. Instead, defining a capability for a channel
+# informs those binaries without this capability that they must cease
+# processing transactions until they have been upgraded. For v1.0.x if any
+# capabilities are defined (including a map with all capabilities turned off)
+# then the v1.0.x peer will deliberately crash.
+#
+################################################################################
+Capabilities:
+ # Channel capabilities apply to both the orderers and the peers and must be
+ # supported by both. Set the value of the capability to true to require it.
+ Global: &ChannelCapabilities
+ # V1.1 for Global is a catchall flag for behavior which has been
+ # determined to be desired for all orderers and peers running v1.0.x,
+ # but the modification of which would cause incompatibilities. Users
+ # should leave this flag set to true.
+ V1_1: true
+
+ # Orderer capabilities apply only to the orderers, and may be safely
+ # manipulated without concern for upgrading peers. Set the value of the
+ # capability to true to require it.
+ Orderer: &OrdererCapabilities
+ # V1.1 for Order is a catchall flag for behavior which has been
+ # determined to be desired for all orderers running v1.0.x, but the
+ # modification of which would cause incompatibilities. Users should
+ # leave this flag set to true.
+ V1_1: true
+
+ # Application capabilities apply only to the peer network, and may be safely
+ # manipulated without concern for upgrading orderers. Set the value of the
+ # capability to true to require it.
+ Application: &ApplicationCapabilities
+ # V1.1 for Application is a catchall flag for behavior which has been
+ # determined to be desired for all peers running v1.0.x, but the
+ # modification of which would cause incompatibilities. Users should
+ # leave this flag set to true.
+ V1_1: true
+
+################################################################################
+#
+# SECTION: Application
+#
+# - This section defines the values to encode into a config transaction or
+# genesis block for application related parameters
+#
+################################################################################
+Application: &ApplicationDefaults
+
+ # Organizations is the list of orgs which are defined as participants on
+ # the application side of the network
+ Organizations:
+
 ################################################################################
 #
 # SECTION: Orderer
@@ -155,20 +169,6 @@ Orderer: &OrdererDefaults
  # the orderer side of the network
  Organizations:
 
-################################################################################
-#
-# SECTION: Application
-#
-# - This section defines the values to encode into a config transaction or
-# genesis block for application related parameters
-#
-################################################################################
-Application: &ApplicationDefaults
-
- # Organizations is the list of orgs which are defined as participants on
- # the application side of the network
- Organizations:
-
 ################################################################################
 #
 # Profile