Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit 92e563b

Browse files
huangjiehuahuangjiehua
authored
fix lint-submodules errors (#137)
* fix lint-submodules errors Signed-off-by: Jiehua Huang <[email protected]>
1 parent f34cc66 commit 92e563b

File tree

7 files changed

+142
-82
lines changed

7 files changed

+142
-82
lines changed

‎test/integration/base_test_setup.go

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -594,13 +594,28 @@ func ResetKeys(t *testing.T, ctx contextAPI.ChannelProvider, chaincodeID, value
594594
require.NoError(t, err, "Failed to create new channel client for resetting keys")
595595
for _, key := range keys {
596596
// Synchronous transaction
597-
_, e := chClient.Execute(
598-
channel.Request{
599-
ChaincodeID: chaincodeID,
600-
Fcn: "invoke",
601-
Args: ExampleCCTxSetArgs(key, value),
602-
},
603-
channel.WithRetry(retry.DefaultChannelOpts))
597+
req := channel.Request{
598+
ChaincodeID: chaincodeID,
599+
Fcn: "invoke",
600+
Args: ExampleCCTxSetArgs(key, value),
601+
}
602+
e := invoke(chClient, req)
604603
require.NoError(t, e, "Failed to reset keys")
605604
}
606605
}
606+
607+
func invoke(chClient *channel.Client, req channel.Request) error {
608+
609+
// Synchronous transaction
610+
_, e := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
611+
func() (interface{}, error) {
612+
re, e := chClient.Execute(req)
613+
if e != nil {
614+
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("Execute returned error: %v", e), nil)
615+
}
616+
return re, e
617+
},
618+
)
619+
return e
620+
621+
}

‎test/integration/e2e/orgs/multiple_orgs_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ func queryApprovedCC(t *testing.T, ccName string, sequence int64, channelID stri
857857
for _, p := range org1Peers {
858858
resp, err := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
859859
func() (interface{}, error) {
860-
resp1, err := mc.org1ResMgmt.LifecycleQueryApprovedCC(channelID, queryApprovedCCReq, resmgmt.WithTargets(p), resmgmt.WithRetry(retry.DefaultResMgmtOpts))
860+
resp1, err := mc.org1ResMgmt.LifecycleQueryApprovedCC(channelID, queryApprovedCCReq, resmgmt.WithTargets(p))
861861
if err != nil {
862862
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("LifecycleQueryApprovedCC returned error: %v", err), nil)
863863
}
@@ -913,7 +913,7 @@ func checkCCCommitReadiness(t *testing.T, packageID string, ccName, ccVersion st
913913
for _, p := range org1Peers {
914914
resp, err := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
915915
func() (interface{}, error) {
916-
resp1, err := mc.org1ResMgmt.LifecycleCheckCCCommitReadiness(channelID, req, resmgmt.WithTargets(p), resmgmt.WithRetry(retry.DefaultResMgmtOpts))
916+
resp1, err := mc.org1ResMgmt.LifecycleCheckCCCommitReadiness(channelID, req, resmgmt.WithTargets(p))
917917
fmt.Printf("LifecycleCheckCCCommitReadiness cc = %v, = %v\n", ccName, resp1)
918918
if err != nil {
919919
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("LifecycleCheckCCCommitReadiness returned error: %v", err), nil)
@@ -936,7 +936,7 @@ func checkCCCommitReadiness(t *testing.T, packageID string, ccName, ccVersion st
936936
for _, p := range org2Peers {
937937
resp, err := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
938938
func() (interface{}, error) {
939-
resp1, err := mc.org2ResMgmt.LifecycleCheckCCCommitReadiness(channelID, req, resmgmt.WithTargets(p), resmgmt.WithRetry(retry.DefaultResMgmtOpts))
939+
resp1, err := mc.org2ResMgmt.LifecycleCheckCCCommitReadiness(channelID, req, resmgmt.WithTargets(p))
940940
fmt.Printf("LifecycleCheckCCCommitReadiness cc = %v, = %v\n", ccName, resp1)
941941
if err != nil {
942942
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("LifecycleCheckCCCommitReadiness returned error: %v", err), nil)
@@ -993,7 +993,7 @@ func queryCommittedCC(t *testing.T, ccName string, channelID string, sequence in
993993
for _, p := range org1Peers {
994994
resp, err := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
995995
func() (interface{}, error) {
996-
resp1, err := mc.org1ResMgmt.LifecycleQueryCommittedCC(channelID, req, resmgmt.WithTargets(p), resmgmt.WithRetry(retry.DefaultResMgmtOpts))
996+
resp1, err := mc.org1ResMgmt.LifecycleQueryCommittedCC(channelID, req, resmgmt.WithTargets(p))
997997
if err != nil {
998998
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("LifecycleQueryCommittedCC returned error: %v", err), nil)
999999
}
@@ -1018,7 +1018,7 @@ func queryCommittedCC(t *testing.T, ccName string, channelID string, sequence in
10181018
for _, p := range org2Peers {
10191019
resp, err := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
10201020
func() (interface{}, error) {
1021-
resp1, err := mc.org2ResMgmt.LifecycleQueryCommittedCC(channelID, req, resmgmt.WithTargets(p), resmgmt.WithRetry(retry.DefaultResMgmtOpts))
1021+
resp1, err := mc.org2ResMgmt.LifecycleQueryCommittedCC(channelID, req, resmgmt.WithTargets(p))
10221022
if err != nil {
10231023
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("LifecycleQueryCommittedCC returned error: %v", err), nil)
10241024
}

‎test/integration/pkg/client/channel/channel_client_pvt_test.go

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -436,16 +436,23 @@ func runPvtDataPreReconcilePutAndGet(t *testing.T, sdk *fabsdk.FabricSDK, orgsCo
436436
value1 := "pvtValue1"
437437
value2 := "pvtValue2"
438438
value3 := "pvtValue3"
439-
440-
response, err := chClient.Query(
441-
channel.Request{
442-
ChaincodeID: ccID,
443-
Fcn: "getprivate",
444-
Args: [][]byte{[]byte(coll1), []byte(key1)},
439+
re, err := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
440+
func() (interface{}, error) {
441+
re, err := chClient.Query(
442+
channel.Request{
443+
ChaincodeID: ccID,
444+
Fcn: "getprivate",
445+
Args: [][]byte{[]byte(coll1), []byte(key1)},
446+
},
447+
)
448+
if err != nil {
449+
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("query returned : %v", re), nil)
450+
}
451+
return re, nil
445452
},
446-
channel.WithRetry(retry.DefaultChannelOpts),
447453
)
448454
require.NoError(t, err)
455+
response := re.(channel.Response)
449456
t.Logf("Got response payload: [%s]", string(response.Payload))
450457
require.Nil(t, response.Payload)
451458

‎test/integration/pkg/client/resmgmt/resmgmt_queries_pvt_test.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@ SPDX-License-Identifier: Apache-2.0
77
package resmgmt
88

99
import (
10+
"fmt"
1011
"reflect"
1112
"testing"
1213

1314
pb "github.com/hyperledger/fabric-protos-go/peer"
1415
"github.com/hyperledger/fabric-sdk-go/pkg/client/resmgmt"
1516
"github.com/hyperledger/fabric-sdk-go/pkg/common/errors/retry"
17+
"github.com/hyperledger/fabric-sdk-go/pkg/common/errors/status"
1618
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
1719
"github.com/hyperledger/fabric-sdk-go/test/integration"
1820
"github.com/hyperledger/fabric-sdk-go/test/metadata"
@@ -52,8 +54,17 @@ func TestQueryCollectionsConfig(t *testing.T) {
5254
if err != nil {
5355
t.Fatalf("Failed to create new resource management client: %s", err)
5456
}
57+
resp1, err := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
58+
func() (interface{}, error) {
59+
resp1, err := client.QueryCollectionsConfig(orgChannelID, ccID)
60+
if err != nil {
61+
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("QueryCollectionsConfig returned : %v", resp1), nil)
62+
}
63+
return resp1, err
64+
},
65+
)
66+
resp := resp1.(*pb.CollectionConfigPackage)
5567

56-
resp, err := client.QueryCollectionsConfig(orgChannelID, ccID, resmgmt.WithRetry(retry.DefaultResMgmtOpts))
5768
if err != nil {
5869
t.Fatalf("QueryCollectionsConfig return error: %s", err)
5970
}

‎test/integration/pkg/fab/eventclient_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"github.com/pkg/errors"
2222
"github.com/stretchr/testify/require"
2323

24+
pb "github.com/hyperledger/fabric-protos-go/peer"
2425
"github.com/hyperledger/fabric-sdk-go/pkg/fab/events/deliverclient/seek"
2526
"github.com/hyperledger/fabric-sdk-go/test/integration"
26-
pb "github.com/hyperledger/fabric-protos-go/peer"
2727
)
2828

2929
const eventTimeWindow = 20 * time.Second // the maximum amount of time to watch for events.

‎test/integration/pkg/fab/transient_data_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ package fab
88

99
import (
1010
reqContext "context"
11+
"fmt"
12+
"strings"
1113
"testing"
1214

1315
"github.com/hyperledger/fabric-sdk-go/pkg/common/errors/retry"
16+
"github.com/hyperledger/fabric-sdk-go/pkg/common/errors/status"
1417
contextAPI "github.com/hyperledger/fabric-sdk-go/pkg/common/providers/context"
1518
"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
1619
"github.com/hyperledger/fabric-sdk-go/pkg/context"
@@ -89,7 +92,7 @@ func createAndSendTransactionProposal(transactor fab.ProposalSender, chainCodeID
8992
tp *fab.TransactionProposal
9093
}
9194

92-
invokerResp, err := retry.NewInvoker(retry.New(retry.DefaultChannelOpts)).Invoke(
95+
invokerResp, err := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
9396
func() (interface{}, error) {
9497
txh, err := transactor.CreateTransactionHeader()
9598
if err != nil {
@@ -102,8 +105,8 @@ func createAndSendTransactionProposal(transactor fab.ProposalSender, chainCodeID
102105
}
103106

104107
tpr, err := transactor.SendTransactionProposal(tp, targets)
105-
if err != nil {
106-
return nil, errors.WithMessage(err, "invoking transaction proposal failed")
108+
if err != nil && strings.Contains(err.Error(), "500") {
109+
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("creating transaction proposal failed error: %v", err), nil)
107110
}
108111

109112
return &invokerResponse{

‎test/integration/prepare.go

Lines changed: 82 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"github.com/hyperledger/fabric-sdk-go/pkg/client/resmgmt"
1717
"github.com/hyperledger/fabric-sdk-go/pkg/common/errors/retry"
1818
"github.com/hyperledger/fabric-sdk-go/pkg/common/errors/status"
19+
fabAPI "github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
1920
"github.com/hyperledger/fabric-sdk-go/pkg/fab"
2021
packager "github.com/hyperledger/fabric-sdk-go/pkg/fab/ccpackager/gopackager"
2122
javapackager "github.com/hyperledger/fabric-sdk-go/pkg/fab/ccpackager/javapackager"
@@ -286,15 +287,7 @@ func QueryApprovedCC(mc []*OrgContext, ccName string, sequence int64, channelID
286287
}
287288
for _, orgCtx := range mc {
288289
for _, p := range orgCtx.Peers {
289-
_, err := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
290-
func() (interface{}, error) {
291-
resp1, err := orgCtx.ResMgmt.LifecycleQueryApprovedCC(channelID, queryApprovedCCReq, resmgmt.WithTargets(p), resmgmt.WithRetry(retry.DefaultResMgmtOpts))
292-
if err != nil {
293-
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("LifecycleQueryApprovedCC returned error: %v", err), nil)
294-
}
295-
return resp1, err
296-
},
297-
)
290+
err := queryApprovedCC(orgCtx, channelID, p, queryApprovedCCReq)
298291
if err != nil {
299292
return errors.WithMessage(err, "QueryApprovedCC example chaincode failed")
300293
}
@@ -304,8 +297,26 @@ func QueryApprovedCC(mc []*OrgContext, ccName string, sequence int64, channelID
304297

305298
}
306299

300+
func queryApprovedCC(orgCtx *OrgContext, channelID string, p fabAPI.Peer, req resmgmt.LifecycleQueryApprovedCCRequest) error {
301+
302+
_, err := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
303+
func() (interface{}, error) {
304+
resp1, err := orgCtx.ResMgmt.LifecycleQueryApprovedCC(channelID, req, resmgmt.WithTargets(p), resmgmt.WithRetry(retry.DefaultResMgmtOpts))
305+
if err != nil {
306+
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("QueryApprovedCC returned : %v", resp1), nil)
307+
}
308+
return resp1, err
309+
},
310+
)
311+
if err != nil {
312+
return errors.WithMessage(err, "QueryApprovedCC example chaincode failed")
313+
}
314+
315+
return nil
316+
}
317+
307318
// CheckCCCommitReadiness checkcommit the example CC on the given channel
308-
func CheckCCCommitReadiness(mc []*OrgContext, packageID string, ccName, ccVersion string, sequence int64, channelID string, ccPolicyStr string) error {
319+
func CheckCCCommitReadiness(mc []*OrgContext, packageID string, ccName, ccVersion string, sequence int64, channelID string, ccPolicyStr string, collConfigs ...*pb.CollectionConfig) error {
309320
ccPolicy, err := policydsl.FromString(ccPolicyStr)
310321
if err != nil {
311322
return errors.Wrapf(err, "error creating CC policy [%s]", ccPolicyStr)
@@ -319,39 +330,45 @@ func CheckCCCommitReadiness(mc []*OrgContext, packageID string, ccName, ccVersio
319330
SignaturePolicy: ccPolicy,
320331
Sequence: sequence,
321332
InitRequired: true,
333+
CollectionConfig: collConfigs,
322334
}
323-
/*resp1, err := mc.org1ResMgmt.LifecycleCheckCCCommitReadiness(channelID, req, resmgmt.WithTargets([]fab.Peer{org1Peers[0]}...), resmgmt.WithRetry(retry.DefaultResMgmtOpts))
324-
if err != nil {
325-
t.Fatal(err)
326-
}
327-
require.NotNil(t, resp1)*/
335+
328336
for _, orgCtx := range mc {
329337
for _, p := range orgCtx.Peers {
330-
_, err := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
331-
func() (interface{}, error) {
332-
resp1, err := orgCtx.ResMgmt.LifecycleCheckCCCommitReadiness(channelID, req, resmgmt.WithTargets(p), resmgmt.WithRetry(retry.DefaultResMgmtOpts))
333-
fmt.Printf("LifecycleCheckCCCommitReadiness cc = %v, = %v\n", ccName, resp1)
334-
if err != nil {
335-
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("LifecycleCheckCCCommitReadiness returned error: %v", err), nil)
336-
}
337-
flag := true
338-
for _, r := range resp1.Approvals {
339-
flag = flag && r
340-
}
341-
if !flag {
342-
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("LifecycleCheckCCCommitReadiness returned : %v", resp1), nil)
343-
}
344-
return resp1, err
345-
},
346-
)
338+
err = checkCCCommitReadiness(orgCtx, channelID, p, req)
347339
if err != nil {
348-
errors.WithMessage(err, "LifecycleCheckCCCommitReadiness example chaincode failed")
340+
return errors.WithMessage(err, "LifecycleCheckCCCommitReadiness example chaincode failed")
349341
}
350342
}
351343
}
352344
return nil
353345
}
354346

347+
func checkCCCommitReadiness(orgCtx *OrgContext, channelID string, p fabAPI.Peer, req resmgmt.LifecycleCheckCCCommitReadinessRequest) error {
348+
349+
_, err := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
350+
func() (interface{}, error) {
351+
resp1, err := orgCtx.ResMgmt.LifecycleCheckCCCommitReadiness(channelID, req, resmgmt.WithTargets(p))
352+
if err != nil {
353+
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("LifecycleCheckCCCommitReadiness returned : %v", resp1), nil)
354+
}
355+
flag := true
356+
for _, r := range resp1.Approvals {
357+
flag = flag && r
358+
}
359+
if !flag {
360+
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("LifecycleCheckCCCommitReadiness returned : %v", resp1), nil)
361+
}
362+
return resp1, err
363+
},
364+
)
365+
if err != nil {
366+
return errors.WithMessage(err, "LifecycleCheckCCCommitReadiness example chaincode failed")
367+
}
368+
369+
return nil
370+
}
371+
355372
// CommitExampleChaincode approve the example CC on the given channel
356373
func CommitExampleChaincode(orgs []*OrgContext, channelID, ccID, ccVersion, ccPolicyStr string, sequence int64, collConfigs ...*pb.CollectionConfig) error {
357374
ccPolicy, err := policydsl.FromString(ccPolicyStr)
@@ -405,40 +422,47 @@ func QueryCommittedCC(mc []*OrgContext, ccName string, channelID string, sequenc
405422
req := resmgmt.LifecycleQueryCommittedCCRequest{
406423
Name: ccName,
407424
}
408-
/*resp1, err := mc.org1ResMgmt.LifecycleQueryCommittedCC(channelID, req, resmgmt.WithTargets(org1Peers[0]), resmgmt.WithRetry(retry.DefaultResMgmtOpts))
409-
if err != nil {
410-
t.Fatal(err)
411-
}*/
412425
for _, orgCtx := range mc {
413426
for _, p := range orgCtx.Peers {
414-
_, err := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
415-
func() (interface{}, error) {
416-
resp1, err := orgCtx.ResMgmt.LifecycleQueryCommittedCC(channelID, req, resmgmt.WithTargets(p), resmgmt.WithRetry(retry.DefaultResMgmtOpts))
417-
if err != nil {
418-
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("LifecycleQueryCommittedCC returned error: %v", err), nil)
419-
}
420-
flag := false
421-
for _, r := range resp1 {
422-
if r.Name == ccName && r.Sequence == sequence {
423-
flag = true
424-
break
425-
}
426-
}
427-
if !flag {
428-
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("LifecycleQueryCommittedCC returned : %v", resp1), nil)
429-
}
430-
return resp1, err
431-
},
432-
)
427+
err := queryCommittedCC(orgCtx, ccName, channelID, sequence, p, req)
433428
if err != nil {
434-
errors.WithMessage(err, "queryCommittedCC example chaincode failed")
429+
return errors.WithMessage(err, "queryCommittedCC example chaincode failed")
435430
}
436431
}
437432
}
438433
return nil
439434

440435
}
441436

437+
func queryCommittedCC(orgCtx *OrgContext, ccName string, channelID string, sequence int64, p fabAPI.Peer, req resmgmt.LifecycleQueryCommittedCCRequest) error {
438+
439+
_, err := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
440+
func() (interface{}, error) {
441+
resp1, err := orgCtx.ResMgmt.LifecycleQueryCommittedCC(channelID, req, resmgmt.WithTargets(p))
442+
if err != nil {
443+
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("LifecycleQueryCommittedCC returned : %v", resp1), nil)
444+
}
445+
flag := false
446+
for _, r := range resp1 {
447+
if r.Name == ccName && r.Sequence == sequence {
448+
flag = true
449+
break
450+
}
451+
}
452+
if !flag {
453+
return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), fmt.Sprintf("LifecycleQueryCommittedCC returned : %v", resp1), nil)
454+
}
455+
return resp1, err
456+
},
457+
)
458+
if err != nil {
459+
return errors.WithMessage(err, "queryCommittedCC example chaincode failed")
460+
}
461+
462+
return nil
463+
464+
}
465+
442466
// InstallExamplePvtChaincode installs the example pvt chaincode to all peers in the given orgs
443467
func InstallExamplePvtChaincode(orgs []*OrgContext, ccID string) error {
444468
ccPkg, err := packager.NewCCPackage(examplePvtCCPath, GetDeployPath())
@@ -565,7 +589,7 @@ func instantiateExampleChaincodeLc(sdk *fabsdk.FabricSDK, orgs []*OrgContext, ch
565589
return errors.WithMessage(err, "QueryApprovedCC example chaincode failed")
566590
}
567591

568-
err = CheckCCCommitReadiness(orgs, packageID, ccID, ccVersion, sequence, channelID, ccPolicy)
592+
err = CheckCCCommitReadiness(orgs, packageID, ccID, ccVersion, sequence, channelID, ccPolicy, collConfigs...)
569593
if err != nil {
570594
return errors.WithMessage(err, "CheckCCCommitReadiness example chaincode failed")
571595
}

0 commit comments

Comments
 (0)