Skip to content

Commit dcf36eb

Browse files
yeasyyeasy
committed
[FAB-3603] Enable more strict code checking
* Update the linter script to checking go vet result when `make linter`; * Add the new created idemix path to the check list; * Update source code to pass the more strict checking; * Fix several wrong usages in Error msg. Change-Id: I1ed61745079726df00643206069b56b9846fa1c1 Signed-off-by: Baohua Yang <yangbaohua@gmail.com>
1 parent 75709bc commit dcf36eb

File tree

74 files changed

+401
-391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+401
-391
lines changed

‎common/cauthdsl/cauthdsl_builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func init() {
5757
// Envelope builds an envelope message embedding a SignaturePolicy
5858
func Envelope(policy *cb.SignaturePolicy, identities [][]byte) *cb.SignaturePolicyEnvelope {
5959
ids := make([]*msp.MSPPrincipal, len(identities))
60-
for i, _ := range ids {
60+
for i := range ids {
6161
ids[i] = &msp.MSPPrincipal{PrincipalClassification: msp.MSPPrincipal_IDENTITY, Principal: identities[i]}
6262
}
6363

‎common/cauthdsl/cauthdsl_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,13 @@ func TestNilSignaturePolicyEnvelope(t *testing.T) {
184184

185185
func TestDeduplicate(t *testing.T) {
186186
ids := []*cb.SignedData{
187-
&cb.SignedData{
187+
{
188188
Identity: []byte("id1"),
189189
},
190-
&cb.SignedData{
190+
{
191191
Identity: []byte("id2"),
192192
},
193-
&cb.SignedData{
193+
{
194194
Identity: []byte("id3"),
195195
},
196196
}

‎common/cauthdsl/policy_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func TestAccept(t *testing.T) {
6767
policyID := "policyID"
6868
m, err := policies.NewManagerImpl("test", providerMap(), &cb.ConfigGroup{
6969
Policies: map[string]*cb.ConfigPolicy{
70-
policyID: &cb.ConfigPolicy{Policy: acceptAllPolicy},
70+
policyID: {Policy: acceptAllPolicy},
7171
},
7272
})
7373
assert.NoError(t, err)
@@ -83,7 +83,7 @@ func TestReject(t *testing.T) {
8383
policyID := "policyID"
8484
m, err := policies.NewManagerImpl("test", providerMap(), &cb.ConfigGroup{
8585
Policies: map[string]*cb.ConfigPolicy{
86-
policyID: &cb.ConfigPolicy{Policy: rejectAllPolicy},
86+
policyID: {Policy: rejectAllPolicy},
8787
},
8888
})
8989
assert.NoError(t, err)

‎common/channelconfig/channel_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestInterface(t *testing.T) {
3030
func TestChannelConfig(t *testing.T) {
3131
cc, err := NewChannelConfig(&cb.ConfigGroup{
3232
Groups: map[string]*cb.ConfigGroup{
33-
"UnknownGroupKey": &cb.ConfigGroup{},
33+
"UnknownGroupKey": {},
3434
},
3535
})
3636
assert.Error(t, err)

‎common/channelconfig/realconfig_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestWithRealConfigtx(t *testing.T) {
2929
},
3030
}
3131
conf.Application.Organizations[0].AnchorPeers = []*genesisconfig.AnchorPeer{
32-
&genesisconfig.AnchorPeer{
32+
{
3333
Host: "foo",
3434
Port: 7,
3535
},

‎common/configtx/configmap.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,15 @@ func recurseConfigMap(path string, configMap map[string]comparable) (*cb.ConfigG
133133
newConfigGroup := cb.NewConfigGroup()
134134
proto.Merge(newConfigGroup, group.ConfigGroup)
135135

136-
for key, _ := range group.Groups {
136+
for key := range group.Groups {
137137
updatedGroup, err := recurseConfigMap(path+PathSeparator+key, configMap)
138138
if err != nil {
139139
return nil, err
140140
}
141141
newConfigGroup.Groups[key] = updatedGroup
142142
}
143143

144-
for key, _ := range group.Values {
144+
for key := range group.Values {
145145
valuePath := ValuePrefix + path + PathSeparator + key
146146
value, ok := configMap[valuePath]
147147
if !ok {
@@ -153,7 +153,7 @@ func recurseConfigMap(path string, configMap map[string]comparable) (*cb.ConfigG
153153
newConfigGroup.Values[key] = proto.Clone(value.ConfigValue).(*cb.ConfigValue)
154154
}
155155

156-
for key, _ := range group.Policies {
156+
for key := range group.Policies {
157157
policyPath := PolicyPrefix + path + PathSeparator + key
158158
policy, ok := configMap[policyPath]
159159
if !ok {

‎common/configtx/manager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ var (
3636
configAllowedChars = "[a-zA-Z0-9.-]+"
3737
maxLength = 249
3838
illegalNames = map[string]struct{}{
39-
".": struct{}{},
40-
"..": struct{}{},
39+
".": {},
40+
"..": {},
4141
}
4242
)
4343

‎common/configtx/update.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func (cm *configManager) verifyDeltaSet(deltaSet map[string]comparable, signedDa
113113
}
114114

115115
func verifyFullProposedConfig(writeSet, fullProposedConfig map[string]comparable) error {
116-
for key, _ := range writeSet {
116+
for key := range writeSet {
117117
if _, ok := fullProposedConfig[key]; !ok {
118118
return fmt.Errorf("Writeset contained key %s which did not appear in proposed config", key)
119119
}

‎common/configtx/update_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func TestPolicyForItem(t *testing.T) {
144144
PolicyManagerVal: &mockpolicies.Manager{
145145
Policy: rootPolicy,
146146
SubManagersMap: map[string]*mockpolicies.Manager{
147-
"foo": &mockpolicies.Manager{
147+
"foo": {
148148
Policy: fooPolicy,
149149
},
150150
},

‎common/policies/policy_test.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ func defaultProviders() map[int32]Provider {
3737
func TestUnnestedManager(t *testing.T) {
3838
config := &cb.ConfigGroup{
3939
Policies: map[string]*cb.ConfigPolicy{
40-
"1": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
41-
"2": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
42-
"3": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
40+
"1": {Policy: &cb.Policy{Type: mockType}},
41+
"2": {Policy: &cb.Policy{Type: mockType}},
42+
"3": {Policy: &cb.Policy{Type: mockType}},
4343
},
4444
}
4545

@@ -65,30 +65,30 @@ func TestUnnestedManager(t *testing.T) {
6565
func TestNestedManager(t *testing.T) {
6666
config := &cb.ConfigGroup{
6767
Policies: map[string]*cb.ConfigPolicy{
68-
"n0a": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
69-
"n0b": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
70-
"n0c": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
68+
"n0a": {Policy: &cb.Policy{Type: mockType}},
69+
"n0b": {Policy: &cb.Policy{Type: mockType}},
70+
"n0c": {Policy: &cb.Policy{Type: mockType}},
7171
},
7272
Groups: map[string]*cb.ConfigGroup{
73-
"nest1": &cb.ConfigGroup{
73+
"nest1": {
7474
Policies: map[string]*cb.ConfigPolicy{
75-
"n1a": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
76-
"n1b": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
77-
"n1c": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
75+
"n1a": {Policy: &cb.Policy{Type: mockType}},
76+
"n1b": {Policy: &cb.Policy{Type: mockType}},
77+
"n1c": {Policy: &cb.Policy{Type: mockType}},
7878
},
7979
Groups: map[string]*cb.ConfigGroup{
80-
"nest2a": &cb.ConfigGroup{
80+
"nest2a": {
8181
Policies: map[string]*cb.ConfigPolicy{
82-
"n2a_1": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
83-
"n2a_2": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
84-
"n2a_3": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
82+
"n2a_1": {Policy: &cb.Policy{Type: mockType}},
83+
"n2a_2": {Policy: &cb.Policy{Type: mockType}},
84+
"n2a_3": {Policy: &cb.Policy{Type: mockType}},
8585
},
8686
},
87-
"nest2b": &cb.ConfigGroup{
87+
"nest2b": {
8888
Policies: map[string]*cb.ConfigPolicy{
89-
"n2b_1": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
90-
"n2b_2": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
91-
"n2b_3": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
89+
"n2b_1": {Policy: &cb.Policy{Type: mockType}},
90+
"n2b_2": {Policy: &cb.Policy{Type: mockType}},
91+
"n2b_3": {Policy: &cb.Policy{Type: mockType}},
9292
},
9393
},
9494
},

0 commit comments

Comments
 (0)