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

Commit e11d47b

Browse files
troyrondatroyronda
authored
[FABG-988] Rename cauthdsl to policydsl (#101)
This change renames the cauthdsl to policydsl to match with Fabric. Signed-off-by: Troy Ronda <troy@troyronda.com>
1 parent c39fc7e commit e11d47b

File tree

17 files changed

+45
-44
lines changed

17 files changed

+45
-44
lines changed

‎internal/github.com/hyperledger/fabric/common/cauthdsl/cauthdsl_builder.go renamed to ‎internal/github.com/hyperledger/fabric/common/policydsl/policydsl_builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Notice: This file has been modified for Hyperledger Fabric SDK Go usage.
88
Please review third_party pinning scripts and patches for more details.
99
*/
1010

11-
package cauthdsl
11+
package policydsl
1212

1313
import (
1414
"sort"

‎internal/github.com/hyperledger/fabric/common/cauthdsl/policyparser.go renamed to ‎internal/github.com/hyperledger/fabric/common/policydsl/policyparser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Notice: This file has been modified for Hyperledger Fabric SDK Go usage.
88
Please review third_party pinning scripts and patches for more details.
99
*/
1010

11-
package cauthdsl
11+
package policydsl
1212

1313
import (
1414
"fmt"

‎internal/github.com/hyperledger/fabric/sdkinternal/configtxgen/encoder/encoder.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"github.com/gogo/protobuf/proto"
1515
cb "github.com/hyperledger/fabric-protos-go/common"
1616
pb "github.com/hyperledger/fabric-protos-go/peer"
17-
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/cauthdsl"
1817
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/channelconfig"
1918
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/genesis"
2019
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/policies"
20+
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/policydsl"
2121
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/util"
2222
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/msp"
2323
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/protoutil"
@@ -99,7 +99,7 @@ func AddPolicies(cg *cb.ConfigGroup, policyMap map[string]*genesisconfig.Policy,
9999
},
100100
}
101101
case SignaturePolicyType:
102-
sp, err := cauthdsl.FromString(policy.Rule)
102+
sp, err := policydsl.FromString(policy.Rule)
103103
if err != nil {
104104
return errors.Wrapf(err, "invalid signature policy rule '%s'", policy.Rule)
105105
}
@@ -345,7 +345,7 @@ func NewConsortiumsGroup(conf map[string]*genesisconfig.Consortium) (*cb.ConfigG
345345
consortiumsGroup := protoutil.NewConfigGroup()
346346
// This policy is not referenced anywhere, it is only used as part of the implicit meta policy rule at the channel level, so this setting
347347
// effectively degrades control of the ordering system channel to the ordering admins
348-
addPolicy(consortiumsGroup, policies.SignaturePolicy(channelconfig.AdminsPolicyKey, cauthdsl.AcceptAllPolicy), ordererAdminsPolicyName)
348+
addPolicy(consortiumsGroup, policies.SignaturePolicy(channelconfig.AdminsPolicyKey, policydsl.AcceptAllPolicy), ordererAdminsPolicyName)
349349

350350
for consortiumName, consortium := range conf {
351351
var err error

‎pkg/client/common/selection/dynamicselection/pgresolver/pgresolver_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111
"time"
1212

13-
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/cauthdsl"
13+
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/policydsl"
1414
"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
1515
mocks "github.com/hyperledger/fabric-sdk-go/pkg/fab/mocks"
1616
common "github.com/hyperledger/fabric-protos-go/common"
@@ -103,7 +103,7 @@ func TestPeerGroupResolverPolicy1(t *testing.T) {
103103

104104
func TestPeerGroupResolverAcceptAllPolicy(t *testing.T) {
105105

106-
sigPolicyEnv := cauthdsl.AcceptAllPolicy
106+
sigPolicyEnv := policydsl.AcceptAllPolicy
107107

108108
expected := []PeerGroup{
109109
pg(p1), pg(p2), pg(p3), pg(p4), pg(p5), pg(p6),

‎pkg/client/resmgmt/example_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/golang/protobuf/proto"
1616

1717
"github.com/hyperledger/fabric-protos-go/common"
18-
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/cauthdsl"
18+
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/policydsl"
1919
"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/context"
2020
"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
2121
sdkCtx "github.com/hyperledger/fabric-sdk-go/pkg/context"
@@ -63,7 +63,7 @@ func Example() {
6363
}
6464

6565
// Instantiate example chaincode on channel 'mychannel'
66-
ccPolicy := cauthdsl.SignedByMspMember("Org1MSP")
66+
ccPolicy := policydsl.SignedByMspMember("Org1MSP")
6767
instantiateReq := InstantiateCCRequest{Name: "ExampleCC", Version: "v0", Path: "path", Policy: ccPolicy}
6868
_, err = c.InstantiateCC("mychannel", instantiateReq, WithTargets(peer))
6969
if err != nil {
@@ -172,7 +172,7 @@ func ExampleWithTargetFilter() {
172172
fmt.Println("failed to create client")
173173
}
174174

175-
ccPolicy := cauthdsl.SignedByMspMember("Org1MSP")
175+
ccPolicy := policydsl.SignedByMspMember("Org1MSP")
176176
req := InstantiateCCRequest{Name: "ExampleCC", Version: "v0", Path: "path", Policy: ccPolicy}
177177

178178
resp, err := c.InstantiateCC("mychannel", req, WithTargetFilter(&urlTargetFilter{url: "http://peer1.com"}))
@@ -291,7 +291,7 @@ func ExampleClient_InstantiateCC() {
291291
fmt.Println("failed to create client")
292292
}
293293

294-
ccPolicy := cauthdsl.SignedByMspMember("Org1MSP")
294+
ccPolicy := policydsl.SignedByMspMember("Org1MSP")
295295
req := InstantiateCCRequest{Name: "ExampleCC", Version: "v0", Path: "path", Policy: ccPolicy}
296296

297297
resp, err := c.InstantiateCC("mychannel", req)
@@ -315,7 +315,7 @@ func ExampleClient_UpgradeCC() {
315315
fmt.Println("failed to create client")
316316
}
317317

318-
ccPolicy := cauthdsl.SignedByMspMember("Org1MSP")
318+
ccPolicy := policydsl.SignedByMspMember("Org1MSP")
319319
req := UpgradeCCRequest{Name: "ExampleCC", Version: "v1", Path: "path", Policy: ccPolicy}
320320

321321
resp, err := c.UpgradeCC("mychannel", req, WithTargets(mockPeer()))

‎pkg/client/resmgmt/resmgmt_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/golang/protobuf/proto"
3030
"github.com/hyperledger/fabric-protos-go/common"
3131
pb "github.com/hyperledger/fabric-protos-go/peer"
32-
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/cauthdsl"
32+
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/policydsl"
3333
"github.com/hyperledger/fabric-sdk-go/pkg/common/errors/status"
3434
"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/context"
3535
"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
@@ -815,7 +815,7 @@ func TestInstantiateCCWithDifferentMSP(t *testing.T) {
815815
rc := setupResMgmtClient(t, ctx)
816816

817817
// Valid request
818-
ccPolicy := cauthdsl.SignedByMspMember("otherMSP")
818+
ccPolicy := policydsl.SignedByMspMember("otherMSP")
819819
req := InstantiateCCRequest{Name: "name", Version: "version", Path: "path", Policy: ccPolicy}
820820

821821
// Test filter only provided (filter rejects discovery service peer msp)
@@ -836,7 +836,7 @@ func TestInstantiateCCWithOpts(t *testing.T) {
836836
rc := setupDefaultResMgmtClient(t)
837837

838838
// Valid request
839-
ccPolicy := cauthdsl.SignedByMspMember("Org1MSP")
839+
ccPolicy := policydsl.SignedByMspMember("Org1MSP")
840840
req := InstantiateCCRequest{Name: "name", Version: "version", Path: "path", Policy: ccPolicy}
841841

842842
// Setup targets
@@ -908,7 +908,7 @@ func TestUpgradeCCWithDifferentMSP(t *testing.T) {
908908
rc := setupResMgmtClient(t, ctx)
909909

910910
// Valid request
911-
ccPolicy := cauthdsl.SignedByMspMember("otherMSP")
911+
ccPolicy := policydsl.SignedByMspMember("otherMSP")
912912
req := UpgradeCCRequest{Name: "name", Version: "version", Path: "path", Policy: ccPolicy}
913913

914914
// Test filter only provided (filter rejects discovery service peer msp)
@@ -929,7 +929,7 @@ func TestUpgradeCCWithOpts(t *testing.T) {
929929
rc := setupDefaultResMgmtClient(t)
930930

931931
// Valid request
932-
ccPolicy := cauthdsl.SignedByMspMember("Org1MSP")
932+
ccPolicy := policydsl.SignedByMspMember("Org1MSP")
933933
req := UpgradeCCRequest{Name: "name", Version: "version", Path: "path", Policy: ccPolicy}
934934

935935
// Setup targets
@@ -966,7 +966,7 @@ func TestCCProposal(t *testing.T) {
966966

967967
rc := setupResMgmtClient(t, ctx)
968968

969-
ccPolicy := cauthdsl.SignedByMspMember("Org1MSP")
969+
ccPolicy := policydsl.SignedByMspMember("Org1MSP")
970970
instantiateReq := InstantiateCCRequest{Name: "name", Version: "version", Path: "path", Policy: ccPolicy}
971971

972972
// Test invalid function (only 'instatiate' and 'upgrade' are supported)
@@ -1614,7 +1614,7 @@ func TestGetConfigSignaturesFromIdentities(t *testing.T) {
16141614

16151615
func TestCheckRequiredCCProposalParams(t *testing.T) {
16161616
// Valid request
1617-
ccPolicy := cauthdsl.SignedByMspMember("Org1MSP")
1617+
ccPolicy := policydsl.SignedByMspMember("Org1MSP")
16181618
req := InstantiateCCRequest{Name: "name", Version: "version", Path: "path", Policy: ccPolicy}
16191619

16201620
// Test empty channel lang

‎scripts/third_party_pins/fabric/apply_fabric_common_utils.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ cp -R ${TMP_PROJECT_PATH} ${PATCH_PROJECT_PATH}
1717
declare TMP_PROJECT_PATH=${PATCH_PROJECT_PATH}
1818

1919
declare -a FILES=(
20-
"common/cauthdsl/cauthdsl_builder.go"
21-
"common/cauthdsl/policyparser.go"
20+
#renamed in Fabric v2 stream
21+
#"common/policydsl/policydsl_builder.go"
22+
#"common/policydsl/policyparser.go"
2223
"core/common/ccprovider/ccprovider.go"
2324
"core/common/ccprovider/cdspackage.go"
2425
"core/ledger/kvledger/txmgmt/rwsetutil/rwset_proto_util.go"

‎test/integration/base_test_setup.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
2828
"github.com/hyperledger/fabric-sdk-go/pkg/util/test"
2929
"github.com/hyperledger/fabric-sdk-go/test/metadata"
30-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/cauthdsl"
30+
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/policydsl"
3131
"github.com/pkg/errors"
3232
"github.com/stretchr/testify/require"
3333
)
@@ -307,7 +307,7 @@ func InstallChaincode(resMgmt *resmgmt.Client, ccPkg *resource.CCPackage, ccPath
307307

308308
// InstantiateChaincode instantiates the given chaincode to the given channel
309309
func InstantiateChaincode(resMgmt *resmgmt.Client, channelID, ccName, ccPath, ccVersion string, ccPolicyStr string, args [][]byte, collConfigs ...*pb.CollectionConfig) (resmgmt.InstantiateCCResponse, error) {
310-
ccPolicy, err := cauthdsl.FromString(ccPolicyStr)
310+
ccPolicy, err := policydsl.FromString(ccPolicyStr)
311311
if err != nil {
312312
return resmgmt.InstantiateCCResponse{}, errors.Wrapf(err, "error creating CC policy [%s]", ccPolicyStr)
313313
}
@@ -328,7 +328,7 @@ func InstantiateChaincode(resMgmt *resmgmt.Client, channelID, ccName, ccPath, cc
328328

329329
// InstantiateJavaChaincode instantiates the given java chaincode to the given channel
330330
func InstantiateJavaChaincode(resMgmt *resmgmt.Client, channelID, ccName, ccPath, ccVersion string, ccPolicyStr string, args [][]byte, collConfigs ...*pb.CollectionConfig) (resmgmt.InstantiateCCResponse, error) {
331-
ccPolicy, err := cauthdsl.FromString(ccPolicyStr)
331+
ccPolicy, err := policydsl.FromString(ccPolicyStr)
332332
if err != nil {
333333
return resmgmt.InstantiateCCResponse{}, errors.Wrapf(err, "error creating CC policy [%s]", ccPolicyStr)
334334
}
@@ -350,7 +350,7 @@ func InstantiateJavaChaincode(resMgmt *resmgmt.Client, channelID, ccName, ccPath
350350

351351
// InstantiateNodeChaincode instantiates the given node chaincode to the given channel
352352
func InstantiateNodeChaincode(resMgmt *resmgmt.Client, channelID, ccName, ccPath, ccVersion string, ccPolicyStr string, args [][]byte, collConfigs ...*pb.CollectionConfig) (resmgmt.InstantiateCCResponse, error) {
353-
ccPolicy, err := cauthdsl.FromString(ccPolicyStr)
353+
ccPolicy, err := policydsl.FromString(ccPolicyStr)
354354
if err != nil {
355355
return resmgmt.InstantiateCCResponse{}, errors.Wrapf(err, "error creating CC policy [%s]", ccPolicyStr)
356356
}
@@ -372,7 +372,7 @@ func InstantiateNodeChaincode(resMgmt *resmgmt.Client, channelID, ccName, ccPath
372372

373373
// UpgradeChaincode upgrades the given chaincode on the given channel
374374
func UpgradeChaincode(resMgmt *resmgmt.Client, channelID, ccName, ccPath, ccVersion string, ccPolicyStr string, args [][]byte, collConfigs ...*pb.CollectionConfig) (resmgmt.UpgradeCCResponse, error) {
375-
ccPolicy, err := cauthdsl.FromString(ccPolicyStr)
375+
ccPolicy, err := policydsl.FromString(ccPolicyStr)
376376
if err != nil {
377377
return resmgmt.UpgradeCCResponse{}, errors.Wrapf(err, "error creating CC policy [%s]", ccPolicyStr)
378378
}
@@ -393,7 +393,7 @@ func UpgradeChaincode(resMgmt *resmgmt.Client, channelID, ccName, ccPath, ccVers
393393

394394
// UpgradeJavaChaincode upgrades the given java chaincode on the given channel
395395
func UpgradeJavaChaincode(resMgmt *resmgmt.Client, channelID, ccName, ccPath, ccVersion string, ccPolicyStr string, args [][]byte, collConfigs ...*pb.CollectionConfig) (resmgmt.UpgradeCCResponse, error) {
396-
ccPolicy, err := cauthdsl.FromString(ccPolicyStr)
396+
ccPolicy, err := policydsl.FromString(ccPolicyStr)
397397
if err != nil {
398398
return resmgmt.UpgradeCCResponse{}, errors.Wrapf(err, "error creating CC policy [%s]", ccPolicyStr)
399399
}
@@ -415,7 +415,7 @@ func UpgradeJavaChaincode(resMgmt *resmgmt.Client, channelID, ccName, ccPath, cc
415415

416416
// UpgradeNodeChaincode upgrades the given node chaincode on the given channel
417417
func UpgradeNodeChaincode(resMgmt *resmgmt.Client, channelID, ccName, ccPath, ccVersion string, ccPolicyStr string, args [][]byte, collConfigs ...*pb.CollectionConfig) (resmgmt.UpgradeCCResponse, error) {
418-
ccPolicy, err := cauthdsl.FromString(ccPolicyStr)
418+
ccPolicy, err := policydsl.FromString(ccPolicyStr)
419419
if err != nil {
420420
return resmgmt.UpgradeCCResponse{}, errors.Wrapf(err, "error creating CC policy [%s]", ccPolicyStr)
421421
}

‎test/integration/e2e/end_to_end.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/stretchr/testify/require"
1919

2020
"github.com/hyperledger/fabric-sdk-go/test/integration"
21-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/cauthdsl"
21+
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/policydsl"
2222

2323
"github.com/hyperledger/fabric-sdk-go/pkg/client/channel"
2424
"github.com/hyperledger/fabric-sdk-go/pkg/client/resmgmt"
@@ -200,7 +200,7 @@ func createCC(t *testing.T, orgResMgmt *resmgmt.Client) {
200200
t.Fatal(err)
201201
}
202202
// Set up chaincode policy
203-
ccPolicy := cauthdsl.SignedByAnyMember([]string{"Org1MSP"})
203+
ccPolicy := policydsl.SignedByAnyMember([]string{"Org1MSP"})
204204
// Org resource manager will instantiate 'example_cc' on channel
205205
resp, err := orgResMgmt.InstantiateCC(
206206
channelID,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"github.com/hyperledger/fabric-sdk-go/pkg/client/channel"
3535
mspclient "github.com/hyperledger/fabric-sdk-go/pkg/client/msp"
3636
"github.com/hyperledger/fabric-sdk-go/pkg/fab/resource"
37-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/cauthdsl"
37+
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/policydsl"
3838
)
3939

4040
const (
@@ -387,7 +387,7 @@ func upgradeCC(t *testing.T, mc *multiorgContext, ccPkg *resource.CCPackage, ccN
387387
require.Truef(t, installed, "Expecting chaincode [%s:%s] to be installed on all peers in Org2")
388388

389389
// New chaincode policy (both orgs have to approve)
390-
org1Andorg2Policy, err := cauthdsl.FromString("AND ('Org1MSP.member','Org2MSP.member')")
390+
org1Andorg2Policy, err := policydsl.FromString("AND ('Org1MSP.member','Org2MSP.member')")
391391
require.Nil(t, err, "error should be nil for getting cc policy with both orgs to approve")
392392

393393
// Org1 resource manager will instantiate 'example_cc' version 1 on 'orgchannel'

‎test/integration/negative/revoked/revoked_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import (
4242
"github.com/hyperledger/fabric-sdk-go/pkg/fab/resource"
4343
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
4444
"github.com/hyperledger/fabric-sdk-go/test/integration"
45-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/cauthdsl"
45+
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/policydsl"
4646
)
4747

4848
const (
@@ -489,7 +489,7 @@ func createCC(t *testing.T, sdk1 *fabsdk.FabricSDK, name, path, version string,
489489
t.Fatal(err)
490490
}
491491
// Set up chaincode policy to 'two-of-two msps'
492-
ccPolicy, err := cauthdsl.FromString("AND ('Org1MSP.member','Org2MSP.member')")
492+
ccPolicy, err := policydsl.FromString("AND ('Org1MSP.member','Org2MSP.member')")
493493
require.NoErrorf(t, err, "Error creating cc policy with both orgs to approve")
494494
// Org1 resource manager will instantiate 'example_cc' on 'orgchannel'
495495
resp, err := org1ResMgmt.InstantiateCC(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
"github.com/hyperledger/fabric-sdk-go/pkg/client/channel"
2929
"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
30-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/cauthdsl"
30+
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/policydsl"
3131

3232
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
3333
"github.com/hyperledger/fabric-sdk-go/test/integration"
@@ -346,7 +346,7 @@ func TestChannelClientRollsBackPvtDataIfMvccReadConflict(t *testing.T) {
346346
}
347347

348348
func newCollectionConfig(colName, policy string, reqPeerCount, maxPeerCount int32, blockToLive uint64) (*pb.CollectionConfig, error) {
349-
p, err := cauthdsl.FromString(policy)
349+
p, err := policydsl.FromString(policy)
350350
if err != nil {
351351
return nil, err
352352
}

‎test/integration/pkg/client/common/selection/fabricselection_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defsvc"
2828
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/provider/chpvdr"
2929
"github.com/hyperledger/fabric-sdk-go/test/integration"
30-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/cauthdsl"
30+
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/policydsl"
3131
grpcCodes "google.golang.org/grpc/codes"
3232
)
3333

@@ -346,7 +346,7 @@ func expecting(groups ...[]string) [][]string {
346346
}
347347

348348
func newCollectionConfig(colName, policy string, reqPeerCount, maxPeerCount int32, blockToLive uint64) (*pb.CollectionConfig, error) {
349-
p, err := cauthdsl.FromString(policy)
349+
p, err := policydsl.FromString(policy)
350350
if err != nil {
351351
return nil, err
352352
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/hyperledger/fabric-sdk-go/pkg/client/resmgmt"
1515
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
1616
"github.com/hyperledger/fabric-sdk-go/test/integration"
17-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/cauthdsl"
17+
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/policydsl"
1818
"github.com/stretchr/testify/require"
1919
)
2020

@@ -84,7 +84,7 @@ func checkStaticCollectionConfig(t *testing.T, collConf *pb.StaticCollectionConf
8484
}
8585

8686
func newCollectionConfig(colName, policy string, reqPeerCount, maxPeerCount int32, blockToLive uint64) (*pb.CollectionConfig, error) {
87-
p, err := cauthdsl.FromString(policy)
87+
p, err := policydsl.FromString(policy)
8888
if err != nil {
8989
return nil, err
9090
}

‎test/performance/pkg/client/channel/chclient_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/hyperledger/fabric-sdk-go/pkg/util/pathvar"
2727
"github.com/stretchr/testify/require"
2828

29-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/cauthdsl"
29+
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/policydsl"
3030
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/core/common/ccprovider"
3131
pb "github.com/hyperledger/fabric-protos-go/peer"
3232
)
@@ -205,7 +205,7 @@ func getConfigBlockPayload() []byte {
205205
}
206206

207207
func getCCDataPayload() []byte {
208-
ccPolicy := cauthdsl.SignedByMspMember("Org1MSP")
208+
ccPolicy := policydsl.SignedByMspMember("Org1MSP")
209209
pp, err := proto.Marshal(ccPolicy)
210210
if err != nil {
211211
panic(fmt.Sprintf("failed to build mock CC Policy: %s", err))

‎third_party/github.com/hyperledger/fabric/common/cauthdsl/cauthdsl_builder.go renamed to ‎third_party/github.com/hyperledger/fabric/common/policydsl/policydsl_builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Notice: This file has been modified for Hyperledger Fabric SDK Go usage.
88
Please review third_party pinning scripts and patches for more details.
99
*/
1010

11-
package cauthdsl
11+
package policydsl
1212

1313
import (
1414
"sort"

‎third_party/github.com/hyperledger/fabric/common/cauthdsl/policyparser.go renamed to ‎third_party/github.com/hyperledger/fabric/common/policydsl/policyparser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Notice: This file has been modified for Hyperledger Fabric SDK Go usage.
88
Please review third_party pinning scripts and patches for more details.
99
*/
1010

11-
package cauthdsl
11+
package policydsl
1212

1313
import (
1414
"fmt"

0 commit comments

Comments
 (0)