Remove event url everywhere (hyperledger-archives#4290)

* remove all references to event url in playground Signed-off-by: Dave Kelsey <[email protected]> * correct text Signed-off-by: Dave Kelsey <[email protected]>
avinashtgoje · Jul 31, 2018 · 98f6856 · 98f6856
1 parent 733138e
commit 98f6856
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 89 deletions.
diff --git a/packages/composer-cli/test/card/data/connection.yaml b/packages/composer-cli/test/card/data/connection.yaml
@@ -1,6 +1,6 @@
 #
 # The network connection profile provides client applications the information about the target
-# blockchain network that are necessary for the applications to interact with it. These are all 
+# blockchain network that are necessary for the applications to interact with it. These are all
 # knowledge that must be acquired from out-of-band sources. This file provides such a source.
 #
 name: "global-trade-network"
@@ -47,19 +47,19 @@ client:
   cryptoconfig:
     path: path/to/fixtures/channel/crypto-config
 
-  # Some SDKs support pluggable KV stores, the properties under "credentialStore" 
+  # Some SDKs support pluggable KV stores, the properties under "credentialStore"
   # are implementation specific
   credentialStore:
     # [Optional]. Specific to FileKeyValueStore.js or similar implementations in other SDKs. Can be others
     # if using an alternative impl. For instance, CouchDBKeyValueStore.js would require an object
     # here for properties like url, db name, etc.
     path: "/tmp/hfc-kvs"
 
-    # [Optional]. Specific to the CryptoSuite implementation. Software-based implementations like 
-    # CryptoSuite_ECDSA_AES.js in node SDK requires a key store. PKCS#11 based implementations does 
+    # [Optional]. Specific to the CryptoSuite implementation. Software-based implementations like
+    # CryptoSuite_ECDSA_AES.js in node SDK requires a key store. PKCS#11 based implementations does
     # not.
     cryptoStore:
-      # Specific to the underlying KeyValueStore that backs the crypto key store. 
+      # Specific to the underlying KeyValueStore that backs the crypto key store.
       path: "/tmp/hfc-cvs"
 
     # [Optional]. Specific to Composer environment
@@ -80,39 +80,39 @@ client:
     library: /path/to/bccsp/libraries
 
 #
-# [Optional]. But most apps would have this section so that channel objects can be constructed 
-# based on the content below. If an app is creating channels, then it likely will not need this 
+# [Optional]. But most apps would have this section so that channel objects can be constructed
+# based on the content below. If an app is creating channels, then it likely will not need this
 # section.
 #
 channels:
   # name of the channel
   mychannel:
-    # Required. list of orderers designated by the application to use for transactions on this 
-    # channel. This list can be a result of access control ("org1" can only access "ordererA"), or 
-    # operational decisions to share loads from applications among the orderers.  The values must 
+    # Required. list of orderers designated by the application to use for transactions on this
+    # channel. This list can be a result of access control ("org1" can only access "ordererA"), or
+    # operational decisions to share loads from applications among the orderers.  The values must
     # be "names" of orgs defined under "organizations/peers"
     orderers:
       - orderer.example.com
 
     # Required. list of peers from participating orgs
     peers:
       peer0.org1.example.com:
-        # [Optional]. will this peer be sent transaction proposals for endorsement? The peer must 
-        # have the chaincode installed. The app can also use this property to decide which peers 
+        # [Optional]. will this peer be sent transaction proposals for endorsement? The peer must
+        # have the chaincode installed. The app can also use this property to decide which peers
         # to send the chaincode install request. Default: true
         endorsingPeer: true
 
         # [Optional]. will this peer be sent query proposals? The peer must have the chaincode
-        # installed. The app can also use this property to decide which peers to send the 
+        # installed. The app can also use this property to decide which peers to send the
         # chaincode install request. Default: true
         chaincodeQuery: true
 
-        # [Optional]. will this peer be sent query proposals that do not require chaincodes, like 
+        # [Optional]. will this peer be sent query proposals that do not require chaincodes, like
         # queryBlock(), queryTransaction(), etc. Default: true
         ledgerQuery: true
 
-        # [Optional]. will this peer be the target of the SDK's listener registration? All peers can 
-        # produce events but the app typically only needs to connect to one to listen to events. 
+        # [Optional]. will this peer be the target of the SDK's listener registration? All peers can
+        # produce events but the app typically only needs to connect to one to listen to events.
         # Default: true
         eventSource: true
 
@@ -142,29 +142,29 @@ organizations:
       - peer1.org1.example.com
 
     # [Optional]. Certificate Authorities issue certificates for identification purposes in a Fabric based
-    # network. Typically certificates provisioning is done in a separate process outside of the 
-    # runtime network. Fabric-CA is a special certificate authority that provides a REST APIs for 
-    # dynamic certificate management (enroll, revoke, re-enroll). The following section is only for 
+    # network. Typically certificates provisioning is done in a separate process outside of the
+    # runtime network. Fabric-CA is a special certificate authority that provides a REST APIs for
+    # dynamic certificate management (enroll, revoke, re-enroll). The following section is only for
     # Fabric-CA servers.
     certificateAuthorities:
       - ca-org1
 
-    # [Optional]. If the application is going to make requests that are reserved to organization 
-    # administrators, including creating/updating channels, installing/instantiating chaincodes, it 
-    # must have access to the admin identity represented by the private key and signing certificate. 
+    # [Optional]. If the application is going to make requests that are reserved to organization
+    # administrators, including creating/updating channels, installing/instantiating chaincodes, it
+    # must have access to the admin identity represented by the private key and signing certificate.
     # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for
     # convenience in development mode, production systems should not expose sensitive information
     # this way. The SDK should allow applications to set the org admin identity via APIs, and only use
     # this route as an alternative when it exists.
-    adminPrivateKey: 
+    adminPrivateKey:
       pem: "-----BEGIN PRIVATE KEY----- <etc>"
     signedCert:
       path: "/tmp/somepath/signed-cert.pem"
 
-  # the profile will contain public information about organizations other than the one it belongs to. 
-  # These are necessary information to make transaction lifecycles work, including MSP IDs and 
-  # peers with a public URL to send transaction proposals. The file will not contain private 
-  # information reserved for members of the organization, such as admin key and certificate, 
+  # the profile will contain public information about organizations other than the one it belongs to.
+  # These are necessary information to make transaction lifecycles work, including MSP IDs and
+  # peers with a public URL to send transaction proposals. The file will not contain private
+  # information reserved for members of the organization, such as admin key and certificate,
   # fabric-ca registrar enroll ID and secret, etc.
   Org2:
     mspid: Org2MSP
@@ -198,9 +198,6 @@ peers:
     # this URL is used to send endorsement and query requests
     url: grpcs://localhost:7051
 
-    # this URL is used to connect the EventHub and registering event listeners
-    eventUrl: grpcs://localhost:7053
-
     grpcOptions:
       ssl-target-name-override: peer0.org1.example.com
       grpc.http2.keepalive_time: 15
@@ -211,16 +208,15 @@ peers:
 
   peer0.org2.example.com:
     url: grpcs://localhost:8051
-    eventUrl: grpcs://localhost:8053
     grpcOptions:
       ssl-target-name-override: peer0.org2.example.com
     tlsCACerts:
       # Comma-Separated list of paths
       path: peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem
 
 #
-# Fabric-CA is a special kind of Certificate Authority provided by Hyperledger Fabric which allows 
-# certificate management to be done via REST APIs. Application may choose to use a standard 
+# Fabric-CA is a special kind of Certificate Authority provided by Hyperledger Fabric which allows
+# certificate management to be done via REST APIs. Application may choose to use a standard
 # Certificate Authority instead of Fabric-CA, in which case this section would not be specified.
 #
 certificateAuthorities:
@@ -240,7 +236,7 @@ certificateAuthorities:
         certfile: path/to/tls/fabricca/certs/client/client_fabric_client.pem
 
 
-    # Fabric-CA supports dynamic user enrollment via REST APIs. A "root" user, a.k.a registrar, is 
+    # Fabric-CA supports dynamic user enrollment via REST APIs. A "root" user, a.k.a registrar, is
     # needed to enroll and invoke new users.
     registrar:
        enrollId: admin

diff --git a/packages/composer-common/test/data/id-cards/missing-connection-name-yaml/connection.yaml b/packages/composer-common/test/data/id-cards/missing-connection-name-yaml/connection.yaml
@@ -36,10 +36,8 @@ orderers:
 peers:
   peer0.org1.example.com:
     url: 'grpc://localhost:7051'
-    eventUrl: 'grpc://localhost:7053'
   peer0.org2.example.com:
     url: 'grpc://localhost:8051'
-    eventUrl: 'grpc://localhost:8053'
 certificateAuthorities:
   ca.org1.example.com:
     url: 'http://localhost:7054'

diff --git a/packages/composer-common/test/data/id-cards/valid-with-yaml/connection.yaml b/packages/composer-common/test/data/id-cards/valid-with-yaml/connection.yaml
@@ -37,10 +37,8 @@ orderers:
 peers:
   peer0.org1.example.com:
     url: 'grpc://localhost:7051'
-    eventUrl: 'grpc://localhost:7053'
   peer0.org2.example.com:
     url: 'grpc://localhost:8051'
-    eventUrl: 'grpc://localhost:8053'
 certificateAuthorities:
   ca.org1.example.com:
     url: 'http://localhost:7054'

diff --git a/packages/composer-playground/src/app/connection-profile/connection-profile.component.html b/packages/composer-playground/src/app/connection-profile/connection-profile.component.html
@@ -279,21 +279,6 @@
                                 </div>
                             </td>
                         </tr>
-                        <tr>
-                            <th>
-                                Event Url*
-                            </th>
-                            <td>
-                                <input
-                                    [ngClass]="{'error-underline': peerEventUrl.invalid && (peerEventUrl.dirty || peerEventUrl.touched)}"
-                                    type="text"
-                                    [(ngModel)]="peer.eventUrl" #peerEventUrl="ngModel" name="peerEventUrl{{peerIndex}}" required>
-                                <div *ngIf="peerEventUrl.invalid && (peerEventUrl.dirty || peerEventUrl.touched)"
-                                     class="error-message">
-                                    Peer event url is required
-                                </div>
-                            </td>
-                        </tr>
                     </table>
                     <table class="profile-info">
                         <colgroup>