From 0431f709af2ca6cc5b0ac96fb038a16d94e5b068 Mon Sep 17 00:00:00 2001 From: Dave Enyeart Date: Thu, 25 Apr 2024 16:07:01 -0400 Subject: [PATCH] Update dependencies and unit tests (#106) * Bump github.com/hyperledger/fabric-protos-go from 0.3.0 to 0.3.3 Bump github.com/hyperledger/fabric-protos-go from 0.3.0 to 0.3.3. Also, harden the tests from protobug error non-determinism. Signed-off-by: David Enyeart * Bump github.com/stretchr/testify from 1.8.2 to 1.9.0 Bump github.com/stretchr/testify from 1.8.2 to 1.9.0. Signed-off-by: David Enyeart * Bump github.com/golang/protobuf from 1.5.3 to 1.5.4 Bump github.com/golang/protobuf from 1.5.3 to 1.5.4. Signed-off-by: David Enyeart * Bump google.golang.org/grpc from 1.54.0 to 1.63.2 Bump google.golang.org/grpc from 1.54.0 to 1.63.2. Signed-off-by: David Enyeart * Bump golang.org/x/net to 0.23.0 Bump golang.org/x/net to 0.23.0. Signed-off-by: David Enyeart * Bump Go to 1.21 Bump Go to 1.21. Signed-off-by: David Enyeart * Make unit test pass with non-deterministic tls error Make unit test pass with non-deterministic tls error Signed-off-by: David Enyeart --------- Signed-off-by: David Enyeart --- .github/workflows/build.yml | 2 +- go.mod | 20 +++++++-------- go.sum | 50 ++++++++++++++---------------------- shim/internal/config_test.go | 4 +-- shim/stub_test.go | 10 ++++---- 5 files changed, 37 insertions(+), 49 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6408a16c..1f3062f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.20.x + go-version: 1.21.x - uses: actions/checkout@v2 with: fetch-depth: 1 diff --git a/go.mod b/go.mod index 69aa7f34..1a409bbd 100644 --- a/go.mod +++ b/go.mod @@ -1,23 +1,23 @@ module github.com/hyperledger/fabric-chaincode-go -go 1.20 +go 1.21 require ( - github.com/golang/protobuf v1.5.3 - github.com/hyperledger/fabric-protos-go v0.3.0 - github.com/stretchr/testify v1.8.2 - google.golang.org/grpc v1.54.0 + github.com/golang/protobuf v1.5.4 + github.com/hyperledger/fabric-protos-go v0.3.3 + github.com/stretchr/testify v1.9.0 + google.golang.org/grpc v1.63.2 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/kr/pretty v0.3.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect - google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect - google.golang.org/protobuf v1.28.1 // indirect + golang.org/x/net v0.23.0 // indirect + golang.org/x/sys v0.19.0 // indirect + golang.org/x/text v0.14.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 96b83e86..f4e0d639 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,11 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/hyperledger/fabric-protos-go v0.3.0 h1:MXxy44WTMENOh5TI8+PCK2x6pMj47Go2vFRKDHB2PZs= -github.com/hyperledger/fabric-protos-go v0.3.0/go.mod h1:WWnyWP40P2roPmmvxsUXSvVI/CF6vwY1K1UFidnKBys= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/hyperledger/fabric-protos-go v0.3.3 h1:0nssqz8QWJNVNBVQz+IIfAd2j1ku7QPKFSM/1anKizI= +github.com/hyperledger/fabric-protos-go v0.3.3/go.mod h1:BPXse9gIOQwyAePQrwQVUcc44bTW4bB5V3tujuvyArk= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= @@ -21,33 +18,24 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= -google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= +google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/shim/internal/config_test.go b/shim/internal/config_test.go index d9ece872..4cfb7ea9 100644 --- a/shim/internal/config_test.go +++ b/shim/internal/config_test.go @@ -681,7 +681,7 @@ func TestTLSClientWithChaincodeServer(t *testing.T) { clientCert: []byte(certPEM), clientRootCert: []byte(rootPEM), success: false, - errMsg: "rpc error: code = Unavailable desc = write tcp 127.0.0.1:[[:digit:]]{5}->127.0.0.1:[[:digit:]]{5}: write: broken pipe", + errMsg: "rpc error", address: "127.0.0.1:0", }, { @@ -689,7 +689,7 @@ func TestTLSClientWithChaincodeServer(t *testing.T) { issrv: true, clientRootCert: []byte(rootPEM), success: false, - errMsg: "rpc error: code = Unavailable desc = write tcp 127.0.0.1:[[:digit:]]{5}->127.0.0.1:[[:digit:]]{5}: write: broken pipe", + errMsg: "rpc error", address: "127.0.0.1:0", }, } diff --git a/shim/stub_test.go b/shim/stub_test.go index bc98705a..3a50000b 100644 --- a/shim/stub_test.go +++ b/shim/stub_test.go @@ -61,7 +61,7 @@ func TestNewChaincodeStub(t *testing.T) { {signedProposal: proto.Clone(validSignedProposal).(*peerpb.SignedProposal)}, { signedProposal: &peerpb.SignedProposal{ProposalBytes: []byte("garbage")}, - expectedErr: "failed to extract Proposal from SignedProposal: proto: cannot parse invalid wire-format data", + expectedErr: "failed to extract Proposal from SignedProposal", }, { signedProposal: &peerpb.SignedProposal{}, @@ -96,7 +96,7 @@ func TestNewChaincodeStub(t *testing.T) { ) if tt.expectedErr != "" { assert.Error(t, err) - assert.EqualError(t, err, tt.expectedErr) + assert.ErrorContains(t, err, tt.expectedErr) continue } assert.NoError(t, err) @@ -215,11 +215,11 @@ func TestChaincodeStubGetTxTimestamp(t *testing.T) { ChannelHeader: []byte("garbage-channel-header"), }), }, - expectedErr: "error unmarshaling ChannelHeader: proto: cannot parse invalid wire-format data", + expectedErr: "error unmarshaling ChannelHeader", }, { proposal: &peerpb.Proposal{Header: []byte("garbage-header")}, - expectedErr: "error unmarshaling Header: proto: cannot parse invalid wire-format data", + expectedErr: "error unmarshaling Header", }, } @@ -227,7 +227,7 @@ func TestChaincodeStubGetTxTimestamp(t *testing.T) { stub := &ChaincodeStub{proposal: tt.proposal} ts, err := stub.GetTxTimestamp() if tt.expectedErr != "" { - assert.EqualError(t, err, tt.expectedErr) + assert.ErrorContains(t, err, tt.expectedErr) continue }