@@ -21,6 +21,7 @@ import (
21
21
"testing"
22
22
23
23
"github.com/hyperledger/fabric/protos/common"
24
+ "github.com/hyperledger/fabric/protos/msp"
24
25
"github.com/hyperledger/fabric/protos/utils"
25
26
"github.com/stretchr/testify/assert"
26
27
)
@@ -29,15 +30,15 @@ func TestAnd(t *testing.T) {
29
30
p1 , err := FromString ("AND('A.member', 'B.member')" )
30
31
assert .NoError (t , err )
31
32
32
- principals := make ([]* common .MSPPrincipal , 0 )
33
+ principals := make ([]* msp .MSPPrincipal , 0 )
33
34
34
- principals = append (principals , & common .MSPPrincipal {
35
- PrincipalClassification : common .MSPPrincipal_ROLE ,
36
- Principal : utils .MarshalOrPanic (& common .MSPRole {Role : common .MSPRole_MEMBER , MspIdentifier : "A" })})
35
+ principals = append (principals , & msp .MSPPrincipal {
36
+ PrincipalClassification : msp .MSPPrincipal_ROLE ,
37
+ Principal : utils .MarshalOrPanic (& msp .MSPRole {Role : msp .MSPRole_MEMBER , MspIdentifier : "A" })})
37
38
38
- principals = append (principals , & common .MSPPrincipal {
39
- PrincipalClassification : common .MSPPrincipal_ROLE ,
40
- Principal : utils .MarshalOrPanic (& common .MSPRole {Role : common .MSPRole_MEMBER , MspIdentifier : "B" })})
39
+ principals = append (principals , & msp .MSPPrincipal {
40
+ PrincipalClassification : msp .MSPPrincipal_ROLE ,
41
+ Principal : utils .MarshalOrPanic (& msp .MSPRole {Role : msp .MSPRole_MEMBER , MspIdentifier : "B" })})
41
42
42
43
p2 := & common.SignaturePolicyEnvelope {
43
44
Version : 0 ,
@@ -52,15 +53,15 @@ func TestOr(t *testing.T) {
52
53
p1 , err := FromString ("OR('A.member', 'B.member')" )
53
54
assert .NoError (t , err )
54
55
55
- principals := make ([]* common .MSPPrincipal , 0 )
56
+ principals := make ([]* msp .MSPPrincipal , 0 )
56
57
57
- principals = append (principals , & common .MSPPrincipal {
58
- PrincipalClassification : common .MSPPrincipal_ROLE ,
59
- Principal : utils .MarshalOrPanic (& common .MSPRole {Role : common .MSPRole_MEMBER , MspIdentifier : "A" })})
58
+ principals = append (principals , & msp .MSPPrincipal {
59
+ PrincipalClassification : msp .MSPPrincipal_ROLE ,
60
+ Principal : utils .MarshalOrPanic (& msp .MSPRole {Role : msp .MSPRole_MEMBER , MspIdentifier : "A" })})
60
61
61
- principals = append (principals , & common .MSPPrincipal {
62
- PrincipalClassification : common .MSPPrincipal_ROLE ,
63
- Principal : utils .MarshalOrPanic (& common .MSPRole {Role : common .MSPRole_MEMBER , MspIdentifier : "B" })})
62
+ principals = append (principals , & msp .MSPPrincipal {
63
+ PrincipalClassification : msp .MSPPrincipal_ROLE ,
64
+ Principal : utils .MarshalOrPanic (& msp .MSPRole {Role : msp .MSPRole_MEMBER , MspIdentifier : "B" })})
64
65
65
66
p2 := & common.SignaturePolicyEnvelope {
66
67
Version : 0 ,
@@ -75,19 +76,19 @@ func TestComplex1(t *testing.T) {
75
76
p1 , err := FromString ("OR('A.member', AND('B.member', 'C.member'))" )
76
77
assert .NoError (t , err )
77
78
78
- principals := make ([]* common .MSPPrincipal , 0 )
79
+ principals := make ([]* msp .MSPPrincipal , 0 )
79
80
80
- principals = append (principals , & common .MSPPrincipal {
81
- PrincipalClassification : common .MSPPrincipal_ROLE ,
82
- Principal : utils .MarshalOrPanic (& common .MSPRole {Role : common .MSPRole_MEMBER , MspIdentifier : "B" })})
81
+ principals = append (principals , & msp .MSPPrincipal {
82
+ PrincipalClassification : msp .MSPPrincipal_ROLE ,
83
+ Principal : utils .MarshalOrPanic (& msp .MSPRole {Role : msp .MSPRole_MEMBER , MspIdentifier : "B" })})
83
84
84
- principals = append (principals , & common .MSPPrincipal {
85
- PrincipalClassification : common .MSPPrincipal_ROLE ,
86
- Principal : utils .MarshalOrPanic (& common .MSPRole {Role : common .MSPRole_MEMBER , MspIdentifier : "C" })})
85
+ principals = append (principals , & msp .MSPPrincipal {
86
+ PrincipalClassification : msp .MSPPrincipal_ROLE ,
87
+ Principal : utils .MarshalOrPanic (& msp .MSPRole {Role : msp .MSPRole_MEMBER , MspIdentifier : "C" })})
87
88
88
- principals = append (principals , & common .MSPPrincipal {
89
- PrincipalClassification : common .MSPPrincipal_ROLE ,
90
- Principal : utils .MarshalOrPanic (& common .MSPRole {Role : common .MSPRole_MEMBER , MspIdentifier : "A" })})
89
+ principals = append (principals , & msp .MSPPrincipal {
90
+ PrincipalClassification : msp .MSPPrincipal_ROLE ,
91
+ Principal : utils .MarshalOrPanic (& msp .MSPRole {Role : msp .MSPRole_MEMBER , MspIdentifier : "A" })})
91
92
92
93
p2 := & common.SignaturePolicyEnvelope {
93
94
Version : 0 ,
@@ -102,23 +103,23 @@ func TestComplex2(t *testing.T) {
102
103
p1 , err := FromString ("OR(AND('A.member', 'B.member'), OR('C.admin', 'D.member'))" )
103
104
assert .NoError (t , err )
104
105
105
- principals := make ([]* common .MSPPrincipal , 0 )
106
+ principals := make ([]* msp .MSPPrincipal , 0 )
106
107
107
- principals = append (principals , & common .MSPPrincipal {
108
- PrincipalClassification : common .MSPPrincipal_ROLE ,
109
- Principal : utils .MarshalOrPanic (& common .MSPRole {Role : common .MSPRole_MEMBER , MspIdentifier : "A" })})
108
+ principals = append (principals , & msp .MSPPrincipal {
109
+ PrincipalClassification : msp .MSPPrincipal_ROLE ,
110
+ Principal : utils .MarshalOrPanic (& msp .MSPRole {Role : msp .MSPRole_MEMBER , MspIdentifier : "A" })})
110
111
111
- principals = append (principals , & common .MSPPrincipal {
112
- PrincipalClassification : common .MSPPrincipal_ROLE ,
113
- Principal : utils .MarshalOrPanic (& common .MSPRole {Role : common .MSPRole_MEMBER , MspIdentifier : "B" })})
112
+ principals = append (principals , & msp .MSPPrincipal {
113
+ PrincipalClassification : msp .MSPPrincipal_ROLE ,
114
+ Principal : utils .MarshalOrPanic (& msp .MSPRole {Role : msp .MSPRole_MEMBER , MspIdentifier : "B" })})
114
115
115
- principals = append (principals , & common .MSPPrincipal {
116
- PrincipalClassification : common .MSPPrincipal_ROLE ,
117
- Principal : utils .MarshalOrPanic (& common .MSPRole {Role : common .MSPRole_ADMIN , MspIdentifier : "C" })})
116
+ principals = append (principals , & msp .MSPPrincipal {
117
+ PrincipalClassification : msp .MSPPrincipal_ROLE ,
118
+ Principal : utils .MarshalOrPanic (& msp .MSPRole {Role : msp .MSPRole_ADMIN , MspIdentifier : "C" })})
118
119
119
- principals = append (principals , & common .MSPPrincipal {
120
- PrincipalClassification : common .MSPPrincipal_ROLE ,
121
- Principal : utils .MarshalOrPanic (& common .MSPRole {Role : common .MSPRole_MEMBER , MspIdentifier : "D" })})
120
+ principals = append (principals , & msp .MSPPrincipal {
121
+ PrincipalClassification : msp .MSPPrincipal_ROLE ,
122
+ Principal : utils .MarshalOrPanic (& msp .MSPRole {Role : msp .MSPRole_MEMBER , MspIdentifier : "D" })})
122
123
123
124
p2 := & common.SignaturePolicyEnvelope {
124
125
Version : 0 ,
0 commit comments