Remove unused containers

hyperledger_fabric/latest/kafka/channel-artifacts/Org3MSP.json

@@ -31,6 +31,35 @@
 			},
 			"version": "0"
 		},
+		"Endorsement": {
+			"mod_policy": "Admins",
+			"policy": {
+				"type": 1,
+				"value": {
+					"identities": [
+						{
+							"principal": {
+								"msp_identifier": "Org3MSP",
+								"role": "MEMBER"
+							},
+							"principal_classification": "ROLE"
+						}
+					],
+					"rule": {
+						"n_out_of": {
+							"n": 1,
+							"rules": [
+								{
+									"signed_by": 0
+								}
+							]
+						}
+					},
+					"version": 0
+				}
+			},
+			"version": "0"
+		},
 		"Readers": {
 			"mod_policy": "Admins",
 			"policy": {

hyperledger_fabric/latest/scripts/gen_channelArtifacts.sh

@@ -27,7 +27,11 @@ configtxgen \
 
 [ ! -f ${ORDERER_GENESIS} ] && echo "Fail to generate genesis block for system channel" && exit -1
 
-echo "Create the new app channel tx using configtx.yaml"
+for (( i=1; i<150; i++ ));
+do
+APP_CHANNEL="channel"$i
+APP_CHANNEL_TX=${APP_CHANNEL}".tx"
+echo "Create the new app channel ${APP_CHANNEL} tx using configtx.yaml"
 configtxgen \
 	-configPath /tmp \
 	-profile ${APP_CHANNEL_PROFILE} \
@@ -35,6 +39,7 @@ configtxgen \
 	-outputCreateChannelTx ${APP_CHANNEL_TX}
 
 [ ! -f ${APP_CHANNEL_TX} ] && echo "Fail to generate app channel tx file" && exit -1
+done
 
 configtxgen \
 	-inspectChannelCreateTx ${APP_CHANNEL_TX} > ${APP_CHANNEL_TX}.json

hyperledger_fabric/latest/scripts/gen_config_channel.sh

@@ -22,10 +22,10 @@ echo_b "Generating channel artifacts with ${GEN_IMG} in mode ${MODE}"
 [ ! -d ${MODE}/${CHANNEL_ARTIFACTS} ] && mkdir -p ${MODE}/${CHANNEL_ARTIFACTS}
 
 echo_b "Make sure channel-artifacts dir exists already"
-if [ -d ${MODE}/${CHANNEL_ARTIFACTS} -a ! -z "$(ls -A ${MODE}/${CHANNEL_ARTIFACTS})" ]; then
+#if [ -d ${MODE}/${CHANNEL_ARTIFACTS} -a ! -z "$(ls -A ${MODE}/${CHANNEL_ARTIFACTS})" ]; then
-	echo_b "${CHANNEL_ARTIFACTS} exists, ignore."
+#	echo_b "${CHANNEL_ARTIFACTS} exists, ignore."
-	exit 0
+#	exit 0
-fi
+#fi
 
 echo_g "Generating ${CHANNEL_ARTIFACTS}..."
 docker run \

hyperledger_fabric/latest/scripts/test_channel_create.sh

@@ -10,7 +10,12 @@ fi
 ## Create channel
 echo_b "=== Creating channel ${APP_CHANNEL} with ${APP_CHANNEL_TX}... ==="
 
+for (( i=1; i<150; i++ ));
+do
+ APP_CHANNEL="channel"$i
+ APP_CHANNEL_TX=${APP_CHANNEL}".tx"
 channelCreate "${APP_CHANNEL}" "${APP_CHANNEL_TX}" 1 0
+done
 
 echo_g "=== Created channel ${APP_CHANNEL} with ${APP_CHANNEL_TX} ==="
 

hyperledger_fabric/v1.4.0/base-solo.yaml

@@ -189,27 +189,3 @@ services:
     hostname: prometheus
     ports:
       - "9090:9090"
-
-  #deprecated
-  event-listener:
-    extends:
-      file: base.yaml
-      service: event-listener-base
-    container_name: fabric-event-listener
-    hostname: fabric-event-listener
-    environment:
-      - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 # default to operate on peer0.org1
-      - CORE_PEER_LOCALMSPID=Org1MSP
-      - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/fabric/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt
-      - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key
-      - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt
-      - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/fabric/crypto-config/peerOrganizations/org1.example.com/peers/peer0.Org1.example.com/msp
-    volumes:
-        - ./scripts:/tmp/scripts
-        - ./crypto-config.yaml:/etc/hyperledger/fabric/crypto-config.yaml
-        - ./crypto-config:/etc/hyperledger/fabric/crypto-config
-        - ./solo/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml
-        - ./solo/channel-artifacts:/tmp/channel-artifacts
-        - ./examples:/opt/gopath/src/examples
-    command: bash -c 'while true; do sleep 1; block-listener -events-address=peer0.org1.example.com:7053 -events-mspdir=/etc/hyperledger/fabric/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/ -events-mspid=Org1MSP; done'
-    #command: bash -c 'while true; do sleep 20170504; done'

hyperledger_fabric/v1.4.0/base.yaml

@@ -112,28 +112,6 @@ services:
     volumes:
        - ./prometheus.yml:/etc/prometheus/prometheus.yml
 
-  #deprecated
-  event-listener:
-    extends:
-      file: base.yaml
-      service: event-listener-base
-    container_name: fabric-event-listener
-    hostname: fabric-event-listener
-    environment:
-      - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 # default to operate on peer0.org1
-      - CORE_PEER_LOCALMSPID=Org1MSP
-      - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/fabric/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt
-      - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key
-      - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt
-      - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/fabric/crypto-config/peerOrganizations/org1.example.com/peers/peer0.Org1.example.com/msp
-    volumes:
-      - ./scripts:/tmp/scripts
-      - ./crypto-config.yaml:/etc/hyperledger/fabric/crypto-config.yaml
-      - ./crypto-config:/etc/hyperledger/fabric/crypto-config
-      - ./solo/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml
-      - ./solo/channel-artifacts:/tmp/channel-artifacts
-      - ./examples:/opt/gopath/src/examples
-
   zookeeper-base:
     image: hyperledger/fabric-zookeeper:${EXT_IMG_TAG}
     restart: always