[FAB-10113] test idemix MSP in the e2e

This change set introduces support to test the client idemix signer and the
peer idemix verifier in the e2e test. This is accomplished by adding a third
organization with MSP of type idemix, and adding an extra chaincode query
where the creator signs using idemix. Notice that no extra peer is
introduced, since peers cannot operate as idemix endorsers yet with a local
MSP of type idemix.

Change-Id: Ice078d75f12e901ba580583791a8574a14b96802
Signed-off-by: Alessandro Sorniotti <ale.linux@sopit.net>

Author: ale-linux

examples/e2e_cli/configtx.yaml

@@ -25,13 +25,15 @@ Profiles:
                 Organizations:
                     - *Org1
                     - *Org2
+                    - *Org3
     TwoOrgsChannel:
         Consortium: SampleConsortium
         Application:
             <<: *ApplicationDefaults
             Organizations:
                 - *Org1
                 - *Org2
+                - *Org3
 
 ################################################################################
 #
@@ -132,6 +134,25 @@ Organizations:
             - Host: peer0.org2.example.com
               Port: 7051
 
+    - &Org3
+        # Name of the organization
+        Name: Org3MSP
+
+        # ID to load the MSP definition as
+        ID: Org3MSP
+
+        # Type of MSP - this org uses idemix for its MSP implementation
+        MSPType: idemix
+
+        MSPDir: crypto-config/idemix
+
+        AnchorPeers:
+            # AnchorPeers defines the location of peers which can be used
+            # for cross org gossip communication.  Note, this value is only
+            # encoded in the genesis block in the Application section context
+            - Host: peer0.org3.example.com
+              Port: 7051
+
 ################################################################################
 #
 #   CHANNEL

examples/e2e_cli/docker-compose-cli.yaml

@@ -142,6 +142,7 @@ services:
       - CORE_PEER_ID=cli
       - CORE_PEER_ADDRESS=peer0.org1.example.com:7051
       - CORE_PEER_LOCALMSPID=Org1MSP
+      - CORE_PEER_LOCALMSPTYPE=bccsp
       - CORE_PEER_TLS_ENABLED=true
       - CORE_PEER_TLS_CERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt
       - CORE_PEER_TLS_KEY_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key

examples/e2e_cli/generateArtifacts.sh

@@ -127,5 +127,6 @@ function generateChannelArtifacts() {
 }
 
 generateCerts
+generateIdemixMaterial
 replacePrivateKey
 generateChannelArtifacts

examples/e2e_cli/scripts/script.sh

@@ -44,6 +44,12 @@ setGlobals () {
 		else
 			CORE_PEER_ADDRESS=peer1.org1.example.com:7051
 		fi
+	elif [ $ORG -eq 3 ] ; then
+		CORE_PEER_LOCALMSPID="Org3MSP"
+		CORE_PEER_TLS_ROOTCERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt
+		CORE_PEER_ADDRESS=peer0.org1.example.com:7051
+		CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/idemix
+		CORE_PEER_LOCALMSPTYPE=idemix
 	else
 		CORE_PEER_LOCALMSPID="Org2MSP"
 		CORE_PEER_TLS_ROOTCERT_FILE=$PEER0_ORG2_CA
@@ -304,6 +310,10 @@ installChaincode 1 2
 echo "Querying chaincode on peer1.org2..."
 chaincodeQuery 1 2 90
 
+#Query on chaincode on Peer0/Org1 with idemix MSP type, check if the result is 90
+echo "Querying chaincode on org1/peer0..."
+chaincodeQuery 1 3 90
+
 echo
 echo "===================== All GOOD, End-2-End execution completed ===================== "
 echo