[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>
hyperledger · Nov 2, 2017 · dcf36eb · dcf36eb
1 parent 75709bc
commit dcf36eb
Show file tree

Hide file tree

Showing 74 changed files with 401 additions and 391 deletions.
diff --git a/common/cauthdsl/cauthdsl_builder.go b/common/cauthdsl/cauthdsl_builder.go
@@ -57,7 +57,7 @@ func init() {
 // Envelope builds an envelope message embedding a SignaturePolicy
 func Envelope(policy *cb.SignaturePolicy, identities [][]byte) *cb.SignaturePolicyEnvelope {
 	ids := make([]*msp.MSPPrincipal, len(identities))
-	for i, _ := range ids {
+	for i := range ids {
 		ids[i] = &msp.MSPPrincipal{PrincipalClassification: msp.MSPPrincipal_IDENTITY, Principal: identities[i]}
 	}
 

diff --git a/common/cauthdsl/cauthdsl_test.go b/common/cauthdsl/cauthdsl_test.go
@@ -184,13 +184,13 @@ func TestNilSignaturePolicyEnvelope(t *testing.T) {
 
 func TestDeduplicate(t *testing.T) {
 	ids := []*cb.SignedData{
-		&cb.SignedData{
+		{
 			Identity: []byte("id1"),
 		},
-		&cb.SignedData{
+		{
 			Identity: []byte("id2"),
 		},
-		&cb.SignedData{
+		{
 			Identity: []byte("id3"),
 		},
 	}

diff --git a/common/cauthdsl/policy_test.go b/common/cauthdsl/policy_test.go
@@ -67,7 +67,7 @@ func TestAccept(t *testing.T) {
 	policyID := "policyID"
 	m, err := policies.NewManagerImpl("test", providerMap(), &cb.ConfigGroup{
 		Policies: map[string]*cb.ConfigPolicy{
-			policyID: &cb.ConfigPolicy{Policy: acceptAllPolicy},
+			policyID: {Policy: acceptAllPolicy},
 		},
 	})
 	assert.NoError(t, err)
@@ -83,7 +83,7 @@ func TestReject(t *testing.T) {
 	policyID := "policyID"
 	m, err := policies.NewManagerImpl("test", providerMap(), &cb.ConfigGroup{
 		Policies: map[string]*cb.ConfigPolicy{
-			policyID: &cb.ConfigPolicy{Policy: rejectAllPolicy},
+			policyID: {Policy: rejectAllPolicy},
 		},
 	})
 	assert.NoError(t, err)

diff --git a/common/channelconfig/channel_test.go b/common/channelconfig/channel_test.go
@@ -30,7 +30,7 @@ func TestInterface(t *testing.T) {
 func TestChannelConfig(t *testing.T) {
 	cc, err := NewChannelConfig(&cb.ConfigGroup{
 		Groups: map[string]*cb.ConfigGroup{
-			"UnknownGroupKey": &cb.ConfigGroup{},
+			"UnknownGroupKey": {},
 		},
 	})
 	assert.Error(t, err)

diff --git a/common/channelconfig/realconfig_test.go b/common/channelconfig/realconfig_test.go
@@ -29,7 +29,7 @@ func TestWithRealConfigtx(t *testing.T) {
 		},
 	}
 	conf.Application.Organizations[0].AnchorPeers = []*genesisconfig.AnchorPeer{
-		&genesisconfig.AnchorPeer{
+		{
 			Host: "foo",
 			Port: 7,
 		},

diff --git a/common/configtx/configmap.go b/common/configtx/configmap.go
@@ -133,15 +133,15 @@ func recurseConfigMap(path string, configMap map[string]comparable) (*cb.ConfigG
 	newConfigGroup := cb.NewConfigGroup()
 	proto.Merge(newConfigGroup, group.ConfigGroup)
 
-	for key, _ := range group.Groups {
+	for key := range group.Groups {
 		updatedGroup, err := recurseConfigMap(path+PathSeparator+key, configMap)
 		if err != nil {
 			return nil, err
 		}
 		newConfigGroup.Groups[key] = updatedGroup
 	}
 
-	for key, _ := range group.Values {
+	for key := range group.Values {
 		valuePath := ValuePrefix + path + PathSeparator + key
 		value, ok := configMap[valuePath]
 		if !ok {
@@ -153,7 +153,7 @@ func recurseConfigMap(path string, configMap map[string]comparable) (*cb.ConfigG
 		newConfigGroup.Values[key] = proto.Clone(value.ConfigValue).(*cb.ConfigValue)
 	}
 
-	for key, _ := range group.Policies {
+	for key := range group.Policies {
 		policyPath := PolicyPrefix + path + PathSeparator + key
 		policy, ok := configMap[policyPath]
 		if !ok {

diff --git a/common/configtx/manager.go b/common/configtx/manager.go
@@ -36,8 +36,8 @@ var (
 	configAllowedChars  = "[a-zA-Z0-9.-]+"
 	maxLength           = 249
 	illegalNames        = map[string]struct{}{
-		".":  struct{}{},
-		"..": struct{}{},
+		".":  {},
+		"..": {},
 	}
 )
 

diff --git a/common/configtx/update.go b/common/configtx/update.go
@@ -113,7 +113,7 @@ func (cm *configManager) verifyDeltaSet(deltaSet map[string]comparable, signedDa
 }
 
 func verifyFullProposedConfig(writeSet, fullProposedConfig map[string]comparable) error {
-	for key, _ := range writeSet {
+	for key := range writeSet {
 		if _, ok := fullProposedConfig[key]; !ok {
 			return fmt.Errorf("Writeset contained key %s which did not appear in proposed config", key)
 		}

diff --git a/common/configtx/update_test.go b/common/configtx/update_test.go
@@ -144,7 +144,7 @@ func TestPolicyForItem(t *testing.T) {
 			PolicyManagerVal: &mockpolicies.Manager{
 				Policy: rootPolicy,
 				SubManagersMap: map[string]*mockpolicies.Manager{
-					"foo": &mockpolicies.Manager{
+					"foo": {
 						Policy: fooPolicy,
 					},
 				},

diff --git a/common/policies/policy_test.go b/common/policies/policy_test.go
@@ -37,9 +37,9 @@ func defaultProviders() map[int32]Provider {
 func TestUnnestedManager(t *testing.T) {
 	config := &cb.ConfigGroup{
 		Policies: map[string]*cb.ConfigPolicy{
-			"1": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
-			"2": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
-			"3": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
+			"1": {Policy: &cb.Policy{Type: mockType}},
+			"2": {Policy: &cb.Policy{Type: mockType}},
+			"3": {Policy: &cb.Policy{Type: mockType}},
 		},
 	}
 
@@ -65,30 +65,30 @@ func TestUnnestedManager(t *testing.T) {
 func TestNestedManager(t *testing.T) {
 	config := &cb.ConfigGroup{
 		Policies: map[string]*cb.ConfigPolicy{
-			"n0a": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
-			"n0b": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
-			"n0c": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
+			"n0a": {Policy: &cb.Policy{Type: mockType}},
+			"n0b": {Policy: &cb.Policy{Type: mockType}},
+			"n0c": {Policy: &cb.Policy{Type: mockType}},
 		},
 		Groups: map[string]*cb.ConfigGroup{
-			"nest1": &cb.ConfigGroup{
+			"nest1": {
 				Policies: map[string]*cb.ConfigPolicy{
-					"n1a": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
-					"n1b": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
-					"n1c": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
+					"n1a": {Policy: &cb.Policy{Type: mockType}},
+					"n1b": {Policy: &cb.Policy{Type: mockType}},
+					"n1c": {Policy: &cb.Policy{Type: mockType}},
 				},
 				Groups: map[string]*cb.ConfigGroup{
-					"nest2a": &cb.ConfigGroup{
+					"nest2a": {
 						Policies: map[string]*cb.ConfigPolicy{
-							"n2a_1": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
-							"n2a_2": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
-							"n2a_3": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
+							"n2a_1": {Policy: &cb.Policy{Type: mockType}},
+							"n2a_2": {Policy: &cb.Policy{Type: mockType}},
+							"n2a_3": {Policy: &cb.Policy{Type: mockType}},
 						},
 					},
-					"nest2b": &cb.ConfigGroup{
+					"nest2b": {
 						Policies: map[string]*cb.ConfigPolicy{
-							"n2b_1": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
-							"n2b_2": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
-							"n2b_3": &cb.ConfigPolicy{Policy: &cb.Policy{Type: mockType}},
+							"n2b_1": {Policy: &cb.Policy{Type: mockType}},
+							"n2b_2": {Policy: &cb.Policy{Type: mockType}},
+							"n2b_3": {Policy: &cb.Policy{Type: mockType}},
 						},
 					},
 				},

diff --git a/common/resourcesconfig/bundle_test.go b/common/resourcesconfig/bundle_test.go
@@ -87,7 +87,7 @@ func TestBundleBadSubGroup(t *testing.T) {
 				Groups: map[string]*cb.ConfigGroup{
 					PeerPoliciesGroupKey: &cb.ConfigGroup{
 						Values: map[string]*cb.ConfigValue{
-							"Foo": &cb.ConfigValue{
+							"Foo": {
 								Value: utils.MarshalOrPanic(&pb.Resource{
 									PolicyRef: "foo",
 								}),