From 7f5f5e6c665e57a5766ddf52885dd47ebae8f840 Mon Sep 17 00:00:00 2001 From: xu wu Date: Fri, 20 Mar 2020 22:02:44 +0700 Subject: [PATCH] [FAB-17504] add Organizations..OrdererEndpoints and remove Orderer.Addresses (#125) Description The use of Orderer.Addresses in configtx.yaml is deprecated, and Organizations..OrdererEndpoints should be used instead. Therefore, update all the fabric-samples configtx.yaml files. Related issues https://jira.hyperledger.org/browse/FAB-17504 Signed-off-by: xu wu --- first-network/configtx.yaml | 6 +++--- interest_rate_swaps/network/configtx.yaml | 6 +++--- test-network/configtx/configtx.yaml | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/first-network/configtx.yaml b/first-network/configtx.yaml index f760eb2ab2..c81f2b02fe 100644 --- a/first-network/configtx.yaml +++ b/first-network/configtx.yaml @@ -41,6 +41,9 @@ Organizations: Type: Signature Rule: "OR('OrdererMSP.admin')" + OrdererEndpoints: + - orderer.example.com:7050 + - &Org1 # DefaultOrg defines the organization which is used in the sampleconfig # of the fabric.git development environment @@ -215,9 +218,6 @@ Orderer: &OrdererDefaults # Orderer Type: The orderer implementation to start OrdererType: etcdraft - Addresses: - - orderer.example.com:7050 - # Batch Timeout: The amount of time to wait before creating a batch BatchTimeout: 2s diff --git a/interest_rate_swaps/network/configtx.yaml b/interest_rate_swaps/network/configtx.yaml index 75d9a02345..2d1c6caeaa 100644 --- a/interest_rate_swaps/network/configtx.yaml +++ b/interest_rate_swaps/network/configtx.yaml @@ -41,6 +41,9 @@ Organizations: Type: Signature Rule: "OR('orderer.admin')" + OrdererEndpoints: + - irs-orderer:7050 + - &partya # DefaultOrg defines the organization which is used in the sampleconfig # of the fabric.git development environment @@ -324,9 +327,6 @@ Orderer: &OrdererDefaults # Available types are "solo" and "kafka" OrdererType: solo - Addresses: - - irs-orderer:7050 - # Batch Timeout: The amount of time to wait before creating a batch BatchTimeout: 2s diff --git a/test-network/configtx/configtx.yaml b/test-network/configtx/configtx.yaml index 684d3adeff..d280ccbcc9 100644 --- a/test-network/configtx/configtx.yaml +++ b/test-network/configtx/configtx.yaml @@ -41,6 +41,9 @@ Organizations: Type: Signature Rule: "OR('OrdererMSP.admin')" + OrdererEndpoints: + - orderer.example.com:7050 + - &Org1 # DefaultOrg defines the organization which is used in the sampleconfig # of the fabric.git development environment @@ -221,8 +224,6 @@ Orderer: &OrdererDefaults Port: 7050 ClientTLSCert: ../organizations/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt ServerTLSCert: ../organizations/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt - Addresses: - - orderer.example.com:7050 # Batch Timeout: The amount of time to wait before creating a batch BatchTimeout: 2s