[FAB-4318] Fix block-listener.go to adapt fabric alpha2

The current block-listener.go example cannot run in alpha2.
o resolve this problem, it is necessary to load appropriate msp info here.
also in fabric/event/consumer/consumer.go, the signerCertbytes also needs
to be passed to the creator of event message.

Change-Id: I63c54ee1e4691c46b51983e73588328b3638c8db
Signed-off-by: Hangyu Li <[email protected]>

Author: lihangyu

events/consumer/consumer.go

@@ -80,6 +80,13 @@ func (ec *EventsClient) send(emsg *ehpb.Event) error {
 		return fmt.Errorf("could not obtain the default signing identity, err %s", err)
 	}
 
+	//pass the signer's cert to Creator
+	signerCert, err := signer.Serialize()
+	if err != nil {
+		return fmt.Errorf("fail to serialize the default signing identity, err %s", err)
+	}
+	emsg.Creator = signerCert
+
 	signedEvt, err := utils.GetSignedEvent(emsg, signer)
 	if err != nil {
 		return fmt.Errorf("could not sign outgoing event, err %s", err)

examples/events/block-listener/README.md

@@ -1,6 +1,46 @@
 # What is block-listener
-## WIP : TODO for v1.0 using FAB-3037
-Need to describe this tool, and all about events
+block-listener.go will connect to a peer and receive block and chaincode events (if there are chaincode events being set).
+Currently, this example only runs with TLS disabled.
+
+# To Run
+```sh
+1. go build
+
+2. ./block-listener -events-address=< event address > -events-from-chaincode=< chaincode ID > -events-mspdir=< msp directory > -events-mspid=< msp id >
+```
+Please be noted that if no msp info provided, it uses default MSP under fabric/sampleconfig.
+# Example with e2e
+Please make sure you have finished running the [e2e_cli example](https://github.com/hyperledger/fabric/tree/master/examples/e2e_cli). Before doing that, don't forget to make sure that TLS has been disabled by setting the  CORE_PEER_TLS_ENABLED=***false*** in ``docker-compose-cli.yaml``, ``base/docker-compose-base.yaml`` and ``base/peer-base.yaml``. 
+
+Suppose you just finished the All-in-one:
+```sh
+./network_setup.sh up
+```
+Attach event client to peer peer0.org1.example.com (suppose you are running block-listener in the host environment):
+```sh
+./block-listener -events-address=127.0.0.1:7053 -events-mspdir=<peer0.org1.example.com's msp directory > -events-mspid=Org1MSP
+```
+
+Event client should output "Event Address: 127.0.0.1:7053" and wait for events.
+
+Exec into the cli container:
+
+```sh
+docker exec -it cli bash
+```
+Setup the environment variables for peer0.org1.example.com
+```sh
+CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/[email protected]/msp
+CORE_PEER_ADDRESS=peer0.org1.example.com:7051
+CORE_PEER_LOCALMSPID="Org1MSP"
+```
+
+Create an invoke transaction:
+
+```sh
+peer chaincode invoke -o orderer.example.com:7050 -C $CHANNEL_NAME -n mycc -c '{"Args":["invoke","a","b","10"]}'
+```
+Now you should see the block content received in events client.
 
 
 <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.

examples/events/block-listener/block-listener.go

@@ -24,6 +24,8 @@ import (
 
 	"github.com/hyperledger/fabric/core/ledger/util"
 	"github.com/hyperledger/fabric/events/consumer"
+	"github.com/hyperledger/fabric/msp/mgmt"
+	"github.com/hyperledger/fabric/msp/mgmt/testtools"
 	"github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/hyperledger/fabric/protos/utils"
@@ -135,10 +137,30 @@ func getChainCodeEvents(tdata []byte) (*pb.ChaincodeEvent, error) {
 func main() {
 	var eventAddress string
 	var chaincodeID string
+	var mspDir string
+	var mspId string
 	flag.StringVar(&eventAddress, "events-address", "0.0.0.0:7053", "address of events server")
 	flag.StringVar(&chaincodeID, "events-from-chaincode", "", "listen to events from given chaincode")
+	flag.StringVar(&mspDir, "events-mspdir", "", "set up the msp direction")
+	flag.StringVar(&mspId, "events-mspid", "", "set up the mspid")
 	flag.Parse()
 
+	//if no msp info provided, we use the default MSP under fabric/sampleconfig
+	if mspDir == "" {
+		err := msptesttools.LoadMSPSetupForTesting()
+		if err != nil {
+			fmt.Printf("Could not initialize msp, err %s", err)
+			os.Exit(-1)
+		}
+	} else {
+		//load msp info
+		err := mgmt.LoadLocalMsp(mspDir, nil, mspId)
+		if err != nil {
+			fmt.Printf("Could not initialize msp, err %s", err)
+			os.Exit(-1)
+		}
+	}
+
 	fmt.Printf("Event Address: %s\n", eventAddress)
 
 	a := createEventClient(eventAddress, chaincodeID)