Merge pull request #151 from s7techlab/upd-protos-go

upd protos and fix discovery

client/discovery/gossip_discovery_service.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"github.com/hyperledger/fabric-protos-go/discovery"
+	"github.com/hyperledger/fabric-protos-go/peer"
 	discClient "github.com/hyperledger/fabric/discovery/client"
 )
 
@@ -31,8 +32,8 @@ func (s *gossipServiceDiscovery) DiscoverChaincode(ctx context.Context, ccName,
 		OfChannel(chanName).
 		AddPeersQuery().
 		AddConfigQuery().
-		AddEndorsersQuery(&discovery.ChaincodeInterest{
-			Chaincodes: []*discovery.ChaincodeCall{
+		AddEndorsersQuery(&peer.ChaincodeInterest{
+			Chaincodes: []*peer.ChaincodeCall{
 				{Name: ccName},
 			},
 		})
@@ -46,7 +47,7 @@ func (s *gossipServiceDiscovery) DiscoverChaincode(ctx context.Context, ccName,
 	}
 
 	chanEndorsers, err := res.ForChannel(chanName).Endorsers(discClient.InvocationChain{
-		&discovery.ChaincodeCall{
+		&peer.ChaincodeCall{
 			Name: ccName,
 		},
 	}, discClient.NoFilter)

client/grpc/grpc_test.go

@@ -85,7 +85,7 @@ func TestNewGRPCOptionsFromConfig(t *testing.T) {
 	assert.NotNil(t, opts)
 	assert.NoError(t, err)
 	conn, err = grpc.DialContext(ctx, tlsConnConfig.Host, opts.Dial...)
-	assert.NoError(t, err)
+	assert.NoError(t, err, tlsConnConfig.Host)
 	assert.NotNil(t, conn)
 	cli = testpb.NewTestServiceClient(conn)
 	out, err = cli.EmptyCall(context.Background(), &testpb.Empty{})

client/grpc/testdata/tls/ca/ca-key.pem

@@ -1,51 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

client/grpc/testdata/tls/ca/ca.csr

@@ -1,27 +1,28 @@
 -----BEGIN CERTIFICATE REQUEST-----
-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
+MIIEtDCCApwCAQAwMTEKMAgGA1UEBhMBQzEKMAgGA1UEBxMBTDEXMBUGA1UEChMO
+SExGLVNESy1HTyBUTFMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/
+scxb95I0SFO3AuGQ6OZQx5JOI2ZoTvaHrnSVs56i2xCna1muQLapeRdguUCF84yt
+XsfTxrsvpSSSMZzFpZviWtbESW5VOqcoPM/6f/KMlgz/4PgDR+YD4mGjqUnHGgRO
+HuLECuZBpZlh9F/dTQOPDHtyw2Aetmck9c9mfCsbJdvFlpZYK6tubMcW6eV7aW62
+aevGchZJzEnLEMEb02ReZPkytfVqHC12MEFlrrvsVIieS5kZlmicxhW9uNGQfGez
+1gsWRCO6JJS678530+ieWJe9jWFuCtr3SA780goKmd8aMTCIDCAqPtmDqb7fIOv0
+q1t8qTDzqSauSXBbmegn6mQ1oSviwMB5SzkCc61MiosYwQyH3l97BG/LTrjoglBe
+azE3XQtAFBrsmSHgdSma35IEhaGO9ffRXU5jocj1qG7e3xtCs5V9kXTZ7ppjR4IB
+VMMZa/X7rKHpoVeQ687YnN2W/dHgg0ocQMzbh9hvuWWR54zV2Ti6yCeX+eJwkKLB
+7nt+voeCmLlLIVeuV5OAf/E4j29RNphGxmpV6zi0nmPatk9YxfBKBeTfKLrEDJx6
+TtTAmAyc6/sagWuKRFpPEqMwU+wEFQ4HORdV8odTLdO2Vw/qlfc4d+87AeFkTAPF
+b7kM78J0hEknozgJiymHudig3jISaEtqlRm7XVEDZQIDAQABoD4wPAYJKoZIhvcN
+AQkOMS8wLTAaBgNVHREEEzARgglsb2NhbGhvc3SHBH8AAAEwDwYDVR0TAQH/BAUw
+AwEB/zANBgkqhkiG9w0BAQ0FAAOCAgEAm+yDjsOLd9L4bhhY3ERntCVPEa5iKSnk
+j+YBw89TK8fsR0yD16oVEPVQ3trCCdpk5wRAatj4JtIN6Iu+eTj94f65XaCpVORX
+zbtEhpFpLqcbG9XeCbd1c4+zjyrcH0tASqWAgdTkG0Qa28ukc+nQHoU5m9L90akj
+ETgpd7HYIg8iYNeVpjl4XiEDF+UuwBmWQbpS/nmel284nNKip15rcVJ4Gnto1QJ2
+q2TTHi6DrkdIm1lBvnwCaWh0Wdsiq62wky9ASni4ALc232iNuSB6BrvSD10qgKzi
+zMiJfQL5A7cRH1m+gXs4r3d3jL/t3S3hv6hNZa+j18OM1LsRna09MYoadT803WsA
+X+KVnLDBQTlupjYny3wejgqvEOeyvpv6LlCxBMShGEjPlTcgucdXjl9tA6DjhbBB
+xiQ6rfwZnoQ49jun8OnJXCPR351nfnWzs+3gIQNExaP3KLO4k4DKndS0erwXWjsM
+o1BozBTzgh2ujlQ1MP13jOqWHDG+fJMR35wuUpBuLNtFlTimgsHfDdcPNBsPwNJR
+5lYvEX3ozqI8u8bxq8o7RcyWlbYqqiBpkdXtc1tIRgwA45iWMcxl7RlUpqB2pfRO
+4pPcNpp5+aKJgldd0auDdYd1WQ2jt4VgLRZJoMxBUDcFwAdg/l0USFUXyqRHLZa6
+gKFyF5Ub5GA=
 -----END CERTIFICATE REQUEST-----

client/grpc/testdata/tls/ca/ca.pem

@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-MIIFQzCCAyugAwIBAgIUW/QL+G/bdkeWWyYADw1HUlfTjRYwDQYJKoZIhvcNAQEN
+MIIFQzCCAyugAwIBAgIUJlWQCzKjfX+2IJmivDsT2F1YW+UwDQYJKoZIhvcNAQEN
 BQAwMTEKMAgGA1UEBhMBQzEKMAgGA1UEBxMBTDEXMBUGA1UEChMOSExGLVNESy1H
-TyBUTFMwHhcNMjMwNTI5MTE0ODAwWhcNMjgwNTI3MTE0ODAwWjAxMQowCAYDVQQG
+TyBUTFMwHhcNMjQwNjA0MTIwOTAwWhcNMzQwNjAyMTIwOTAwWjAxMQowCAYDVQQG
 EwFDMQowCAYDVQQHEwFMMRcwFQYDVQQKEw5ITEYtU0RLLUdPIFRMUzCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAK0L4W4EplPHACx3B8f7uSNtFahq1MPZ
-W8tsoMIH8JQrdfphoE/YS0ISp1yee36GclxuefqkibTaAMvsLsx7T45UPR8zvcc2
-2nlkjRxGxsNh3S6CLyGX/C7qWxoYvyk+NfnLptfhqREA3ebYx9cnF89dJ3Z9PldB
-xNi2mwLMX7gikFsg+b/TGW9Sp6nYQ45uT/wl4cS0kPLEuH3UHU27LsU7/qfUWedP
-0hT4R3kybpzIkhNTpMZ5FSjQxmjt7GQoBI0O+t/kp1soTiAsm90W6PS9QmcJyzxP
-0w6nGqEzORdkybXTMX+QziZJG6d+1fkvE75QjCHUNmZk/AbF5lCzq767BF4gfEa/
-TQAnLL8p4+AS1JtBkMDrenINZV1EYFZEULa/ZBnp2bNumN1W0c3x6N0jaq3brDMO
-ZfmW++Dp+qMLJcBJPLHmr1oo8OrEDmwoDcDILw91eZhK+f2VqSUXqLKGN6kvxN+D
-ErWAWMbMtjZPRVC/kB54KqYVrlR1YUhDApjNwj6p80SgTZeXTENjgc/CM2N0aho7
-tFTW3E+VCynMSNSrXksDRkduGSUqdoKtVGcnuOT/sm04G4x/gNpNNy00T0Y6VgZh
-H4nJoZtTPY9E/2ge8hzx67tMqHbZdMXvq16tdG8oGRBboKvXQ2NL0VlOxmUPTKyg
-0clMiQxrrKphAgMBAAGjUzBRMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBSRajYNPROdjbxXDzEU9Gjxi+xicjAPBgNVHREECDAGhwR/
-AAABMA0GCSqGSIb3DQEBDQUAA4ICAQAYgl55rSnMSF8IZx+q5lm+y7PTZAOOTS4D
-B+Cem5C4W5jNn2WOpUNrRCVSQrRt11TWpQWxI4lznU8NOBXRziVcsljCUvkRUlnu
-qAWsTc6OdXN9gjjI/bmtup6kyUG7cd52JPO5PqoGRgyqk4ypFltz4XQRYIS8dPBe
-LmBECU0DezaInLm7VD6JwvLgUH3DHXtmbqvLrZgfKADCLn67lyo8V6yfC0JxPLeK
-NXh6u1FqN1X/zfmyHZUHzX7LhXpInJtHIk2ycvtisY0JNGNxRQIzrlewxw68yMWO
-S/UzPhZPngCD1u/dkBxs4gEKvlUFjo0/iQc0PitKXyvExzVubJJu/sheN69F5CjZ
-CUhrxorYK9KQQNL+uiW4N128a5uj2/h7sodkUzmrMokJT8t3X0L8oVl20Z3hrfKl
-huQZVjcTsRF3Tbb+d3/moShRuM0GfLbKmcwRaixM2IW55Byb/AO3yadUeyciAlMh
-KAeG9YB11jzLm4OFekUk53e4OX7FTvWbzjjf1rwYErokh06rQ/sqEIlaibJSqMvJ
-8Z64BdO649rHyMbHsFKU2muOhmQKPcA8rUkCef1QpkZfjLlbot7ocefJ/yG6HJZE
-SDfPgkPUzvYlETTMUAodAzh6LV8W/05Lumy1N7WmLH+DsKFRzzU2U3RDIc3Qcrcs
-gq0998rfIw==
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAL+xzFv3kjRIU7cC4ZDo5lDHkk4jZmhO
+9oeudJWznqLbEKdrWa5Atql5F2C5QIXzjK1ex9PGuy+lJJIxnMWlm+Ja1sRJblU6
+pyg8z/p/8oyWDP/g+ANH5gPiYaOpSccaBE4e4sQK5kGlmWH0X91NA48Me3LDYB62
+ZyT1z2Z8Kxsl28WWllgrq25sxxbp5XtpbrZp68ZyFknMScsQwRvTZF5k+TK19Woc
+LXYwQWWuu+xUiJ5LmRmWaJzGFb240ZB8Z7PWCxZEI7oklLrvznfT6J5Yl72NYW4K
+2vdIDvzSCgqZ3xoxMIgMICo+2YOpvt8g6/SrW3ypMPOpJq5JcFuZ6CfqZDWhK+LA
+wHlLOQJzrUyKixjBDIfeX3sEb8tOuOiCUF5rMTddC0AUGuyZIeB1KZrfkgSFoY71
+99FdTmOhyPWobt7fG0KzlX2RdNnummNHggFUwxlr9fusoemhV5Drztic3Zb90eCD
+ShxAzNuH2G+5ZZHnjNXZOLrIJ5f54nCQosHue36+h4KYuUshV65Xk4B/8TiPb1E2
+mEbGalXrOLSeY9q2T1jF8EoF5N8ousQMnHpO1MCYDJzr+xqBa4pEWk8SozBT7AQV
+Dgc5F1Xyh1Mt07ZXD+qV9zh37zsB4WRMA8VvuQzvwnSESSejOAmLKYe52KDeMhJo
+S2qVGbtdUQNlAgMBAAGjUzBRMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBSxcVpthsBS8ZCGPlFYHM3Sg64xyzAPBgNVHREECDAGhwR/
+AAABMA0GCSqGSIb3DQEBDQUAA4ICAQCB9xohfexSvxa0H89zApyU2RyK6WPhl8RO
+ciqtLYh3khSnTXU8AfGMFHc0meRNNn2EKmmtRoWAogftuSmHfHlynbqWZe9mqUy5
+mfkuARcJN1X44ngb9DgJhVOBg19TC7OR2Ux/OfCtctfIXNapTNOpAJ0djZ/N/vlk
+z6HaxZAkkpGxFVHJTFmoeb44rrXksejjtZcQsdeT5b9anCcQTiL1CETA6+DJtWPk
+s3Q96DLX8nZYhCAyTrT+S9SffOvznEWE/qaYG6da7s72ty7gclLbokrqjP/nM5zI
+iO4027NmSofiJ615iVPn+GYnrEu8oNlI5omLkoXccj6CqgqZnXC3b1RtyRSyvcFn
+iZTomBF0/5PcENGGN2KJ8Py2zVrQxko/jM0pwhLqqZ/wsGUOL0jvskGkod9YtjyS
+b0+O67dI2rVdUoUIywP1E6e96wGAjtQzs6avQB/7NOcGueLxdFj/hClXmnn4t/UA
+A0oCEqRNwj6mFT9f5vPnQeR38qjcWHad5w7NQ2YSCZEcUMeECL4kvOsaXeKDUs7F
+OHAGACLMx65f+o81TWKMndwRWRQJ45lzn8HZiTbfc+m0F8jYJwFBWihFUwZErTdn
+gZ/AplRZkXCI76O1QBL9Gat8vtj/y0saYxm7DSKGICJNZBA9pfD2qm/rqE47JNVY
+TzadI6R4bw==
 -----END CERTIFICATE-----

client/grpc/testdata/tls/ca/cfssl.json

@@ -0,0 +1,27 @@
+{
+  "signing": {
+    "default": {
+      "expiry": "8760h"
+    },
+    "profiles": {
+      "server": {
+        "usages": [
+          "signing",
+          "digital signing",
+          "key encipherment",
+          "server auth"
+        ],
+        "expiry": "87600h"
+      },
+      "client": {
+        "usages": [
+          "signing",
+          "digital signature",
+          "key encipherment",
+          "client auth"
+        ],
+        "expiry": "87600h"
+      }
+    }
+  }
+}

client/grpc/testdata/tls/ca/csr.json

@@ -1,4 +1,8 @@
 {
+  "CA": {
+    "expiry": "87600h",
+    "pathlen": 0
+  },
   "hosts": [
     "localhost",
     "127.0.0.1"