Merge changes from topic 'consortium-stack'

* changes: [FAB-2862] Update BDD for new config changes [FAB-2821] Print readset/writeset/deltaset on updt
hyperledger · Apr 26, 2017 · 5f91834 · 5f91834
2 parents a646912 + 911ef2a
commit 5f91834
Show file tree

Hide file tree

Showing 17 changed files with 384 additions and 435 deletions.
diff --git a/bddtests/common/common_pb2.py b/bddtests/common/common_pb2.py
diff --git a/bddtests/common/configuration_pb2.py b/bddtests/common/configuration_pb2.py
diff --git a/bddtests/docker-compose-next-4.yml b/bddtests/docker-compose-next-4.yml
@@ -7,6 +7,7 @@ services:
       file: docker-compose-orderer-solo.yml
       service: orderer0
     environment:
+      - ORDERER_GENERAL_LOCALMSPDIR=${ORDERER0_ORDERER_GENERAL_LOCALMSPDIR}
       - ORDERER_GENERAL_LOCALMSPID=${ORDERER0_ORDERER_GENERAL_LOCALMSPID}
       - ORDERER_GENERAL_TLS_ENABLED=true
       - ORDERER_GENERAL_TLS_PRIVATEKEY=${ORDERER0_ORDERER_GENERAL_TLS_PRIVATEKEY}
@@ -23,6 +24,7 @@ services:
       - CORE_PEER_GOSSIP_BOOTSTRAP=peer1:7051
       - CORE_PEER_PROFILE_ENABLED=true
       - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
+      - CORE_PEER_MSPCONFIGPATH=${PEER0_CORE_PEER_MSPCONFIGPATH}
       - CORE_PEER_LOCALMSPID=${PEER0_CORE_PEER_LOCALMSPID}
       - CORE_PEER_TLS_CERT_FILE=${PEER0_CORE_PEER_TLS_CERT_FILE}
       - CORE_PEER_TLS_KEY_FILE=${PEER0_CORE_PEER_TLS_KEY_FILE}
@@ -42,6 +44,7 @@ services:
       - CORE_PEER_ID=vp1
       - CORE_PEER_GOSSIP_BOOTSTRAP=peer0:7051
       - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
+      - CORE_PEER_MSPCONFIGPATH=${PEER1_CORE_PEER_MSPCONFIGPATH}
       - CORE_PEER_LOCALMSPID=${PEER1_CORE_PEER_LOCALMSPID}
       - CORE_PEER_TLS_CERT_FILE=${PEER1_CORE_PEER_TLS_CERT_FILE}
       - CORE_PEER_TLS_KEY_FILE=${PEER1_CORE_PEER_TLS_KEY_FILE}
@@ -59,6 +62,7 @@ services:
       - CORE_PEER_ID=vp2
       - CORE_PEER_GOSSIP_BOOTSTRAP=peer3:7051
       - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
+      - CORE_PEER_MSPCONFIGPATH=${PEER2_CORE_PEER_MSPCONFIGPATH}
       - CORE_PEER_LOCALMSPID=${PEER2_CORE_PEER_LOCALMSPID}
       - CORE_PEER_TLS_CERT_FILE=${PEER2_CORE_PEER_TLS_CERT_FILE}
       - CORE_PEER_TLS_KEY_FILE=${PEER2_CORE_PEER_TLS_KEY_FILE}
@@ -76,6 +80,7 @@ services:
       - CORE_PEER_ID=vp3
       - CORE_PEER_GOSSIP_BOOTSTRAP=peer2:7051
       - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
+      - CORE_PEER_MSPCONFIGPATH=${PEER3_CORE_PEER_MSPCONFIGPATH}
       - CORE_PEER_LOCALMSPID=${PEER3_CORE_PEER_LOCALMSPID}
       - CORE_PEER_TLS_CERT_FILE=${PEER3_CORE_PEER_TLS_CERT_FILE}
       - CORE_PEER_TLS_KEY_FILE=${PEER3_CORE_PEER_TLS_KEY_FILE}