[FAB-7802] Automatic format fix using gofmt

robert-zaremba · robert-zaremba · commit e14f2080d23e · 2018-01-18T17:28:35.000+01:00
gofmt -w -s

Many developers have integrated `gofmt`  auto-formatting. S
Some code changes can automatically cause other changes caused through
`gofmt` integration, not related to the intent of the task.

For clarity in future pull-requests, the gofmt issues should be solved
once and for all.

This change doesn't break the code, because it uses official `gofmt` to do
the auto code formatting.

Change-Id: Ife1c2e112dc4f188fb6a90916587af453a133099
Signed-off-by: Robert Zaremba &lt;robert.zaremba@scale-it.pl&gt;
diff --git a/common/capabilities/application_test.go b/common/capabilities/application_test.go
@@ -21,7 +21,7 @@ func TestApplicationV10(t *testing.T) {
 
 func TestApplicationV11(t *testing.T) {
 	op := NewApplicationProvider(map[string]*cb.Capability{
-		ApplicationV1_1: &cb.Capability{},
+		ApplicationV1_1: {},
 	})
 	assert.NoError(t, op.Supported())
 	assert.True(t, op.ForbidDuplicateTXIdInBlock())
diff --git a/common/capabilities/capabilities_test.go b/common/capabilities/capabilities_test.go
@@ -32,7 +32,7 @@ func TestSatisfied(t *testing.T) {
 
 func TestNotSatisfied(t *testing.T) {
 	capsMap := map[string]*cb.Capability{
-		"FakeCapability": &cb.Capability{},
+		"FakeCapability": {},
 	}
 	for _, provider := range []*registry{
 		NewChannelProvider(capsMap).registry,
diff --git a/common/capabilities/channel_test.go b/common/capabilities/channel_test.go
@@ -23,7 +23,7 @@ func TestChannelV10(t *testing.T) {
 
 func TestChannelV11(t *testing.T) {
 	op := NewChannelProvider(map[string]*cb.Capability{
-		ChannelV1_1: &cb.Capability{},
+		ChannelV1_1: {},
 	})
 	assert.NoError(t, op.Supported())
 	assert.True(t, op.MSPVersion() == msp.MSPv1_1)
diff --git a/common/capabilities/orderer_test.go b/common/capabilities/orderer_test.go
@@ -22,7 +22,7 @@ func TestOrdererV10(t *testing.T) {
 
 func TestOrdererV11(t *testing.T) {
 	op := NewOrdererProvider(map[string]*cb.Capability{
-		OrdererV1_1: &cb.Capability{},
+		OrdererV1_1: {},
 	})
 	assert.NoError(t, op.Supported())
 	assert.True(t, op.SetChannelModPolicyDuringCreate())
diff --git a/common/channelconfig/bundle_test.go b/common/channelconfig/bundle_test.go
@@ -221,10 +221,10 @@ func TestPrevalidation(t *testing.T) {
 		err := preValidate(&cb.Config{
 			ChannelGroup: &cb.ConfigGroup{
 				Groups: map[string]*cb.ConfigGroup{
-					OrdererGroupKey: &cb.ConfigGroup{},
+					OrdererGroupKey: {},
 				},
 				Values: map[string]*cb.ConfigValue{
-					CapabilitiesKey: &cb.ConfigValue{},
+					CapabilitiesKey: {},
 				},
 			},
 		})
@@ -237,12 +237,12 @@ func TestPrevalidation(t *testing.T) {
 		err := preValidate(&cb.Config{
 			ChannelGroup: &cb.ConfigGroup{
 				Groups: map[string]*cb.ConfigGroup{
-					ApplicationGroupKey: &cb.ConfigGroup{
+					ApplicationGroupKey: {
 						Values: map[string]*cb.ConfigValue{
-							CapabilitiesKey: &cb.ConfigValue{},
+							CapabilitiesKey: {},
 						},
 					},
-					OrdererGroupKey: &cb.ConfigGroup{},
+					OrdererGroupKey: {},
 				},
 			},
 		})
@@ -255,19 +255,19 @@ func TestPrevalidation(t *testing.T) {
 		err := preValidate(&cb.Config{
 			ChannelGroup: &cb.ConfigGroup{
 				Groups: map[string]*cb.ConfigGroup{
-					ApplicationGroupKey: &cb.ConfigGroup{
+					ApplicationGroupKey: {
 						Values: map[string]*cb.ConfigValue{
-							CapabilitiesKey: &cb.ConfigValue{},
+							CapabilitiesKey: {},
 						},
 					},
-					OrdererGroupKey: &cb.ConfigGroup{
+					OrdererGroupKey: {
 						Values: map[string]*cb.ConfigValue{
-							CapabilitiesKey: &cb.ConfigValue{},
+							CapabilitiesKey: {},
 						},
 					},
 				},
 				Values: map[string]*cb.ConfigValue{
-					CapabilitiesKey: &cb.ConfigValue{},
+					CapabilitiesKey: {},
 				},
 			},
 		})
diff --git a/common/channelconfig/util_test.go b/common/channelconfig/util_test.go
@@ -40,6 +40,6 @@ func TestUtilsBasic(t *testing.T) {
 	basicTest(t, KafkaBrokersValue([]string{"foo:1", "bar:2"}))
 	basicTest(t, MSPValue(&mspprotos.MSPConfig{}))
 	basicTest(t, CapabilitiesValue(map[string]bool{"foo": true, "bar": false}))
-	basicTest(t, AnchorPeersValue([]*pb.AnchorPeer{&pb.AnchorPeer{}, &pb.AnchorPeer{}}))
+	basicTest(t, AnchorPeersValue([]*pb.AnchorPeer{{}, {}}))
 	basicTest(t, ChannelCreationPolicyValue(&cb.Policy{}))
 }
diff --git a/common/configtx/update_test.go b/common/configtx/update_test.go
@@ -128,7 +128,7 @@ func TestPolicyForItem(t *testing.T) {
 		pm: &mockpolicies.Manager{
 			Policy: rootPolicy,
 			SubManagersMap: map[string]*mockpolicies.Manager{
-				"foo": &mockpolicies.Manager{
+				"foo": {
 					Policy: fooPolicy,
 				},
 			},
diff --git a/common/resourcesconfig/apis_test.go b/common/resourcesconfig/apis_test.go
@@ -26,12 +26,12 @@ const (
 
 var sampleAPIsGroup = &cb.ConfigGroup{
 	Values: map[string]*cb.ConfigValue{
-		sampleAPI1Name: &cb.ConfigValue{
+		sampleAPI1Name: {
 			Value: utils.MarshalOrPanic(&pb.APIResource{
 				PolicyRef: sampleAPI1PolicyRef,
 			}),
 		},
-		sampleAPI2Name: &cb.ConfigValue{
+		sampleAPI2Name: {
 			Value: utils.MarshalOrPanic(&pb.APIResource{
 				PolicyRef: sampleAPI2PolicyRef,
 			}),
@@ -57,7 +57,7 @@ func TestGreenAPIsPath(t *testing.T) {
 func TestBadSubgroupsAPIsGroup(t *testing.T) {
 	ccg, err := newAPIsGroup(&cb.ConfigGroup{
 		Groups: map[string]*cb.ConfigGroup{
-			"subGroup": &cb.ConfigGroup{},
+			"subGroup": {},
 		},
 	})
 
diff --git a/common/resourcesconfig/bundle_test.go b/common/resourcesconfig/bundle_test.go
@@ -51,7 +51,7 @@ func TestBundleFailure(t *testing.T) {
 		Config: &cb.Config{
 			ChannelGroup: &cb.ConfigGroup{
 				Groups: map[string]*cb.ConfigGroup{
-					"badsubgroup": &cb.ConfigGroup{},
+					"badsubgroup": {},
 				},
 			},
 		},
diff --git a/common/resourcesconfig/chaincode_test.go b/common/resourcesconfig/chaincode_test.go
@@ -29,19 +29,19 @@ var (
 
 var sampleChaincodeGroup = &cb.ConfigGroup{
 	Values: map[string]*cb.ConfigValue{
-		"ChaincodeIdentifier": &cb.ConfigValue{
+		"ChaincodeIdentifier": {
 			Value: utils.MarshalOrPanic(&pb.ChaincodeIdentifier{
 				Version: sampleChaincodeVersion,
 				Hash:    sampleChaincodeHash,
 			}),
 		},
-		"ChaincodeValidation": &cb.ConfigValue{
+		"ChaincodeValidation": {
 			Value: utils.MarshalOrPanic(&pb.ChaincodeValidation{
 				Name:     sampleChaincodeValidationName,
 				Argument: sampleChaincodeValidationArg,
 			}),
 		},
-		"ChaincodeEndorsement": &cb.ConfigValue{
+		"ChaincodeEndorsement": {
 			Value: utils.MarshalOrPanic(&pb.ChaincodeEndorsement{
 				Name: sampleChaincodeEndorsementName,
 			}),
@@ -68,7 +68,7 @@ func TestGreenChaincodePath(t *testing.T) {
 func TestBadSubgroupsChaincodeGroup(t *testing.T) {
 	ccg, err := newChaincodeGroup("bar", &cb.ConfigGroup{
 		Groups: map[string]*cb.ConfigGroup{
-			"subGroup": &cb.ConfigGroup{},
+			"subGroup": {},
 		},
 	})
 
diff --git a/common/resourcesconfig/chaincodes_test.go b/common/resourcesconfig/chaincodes_test.go
@@ -43,7 +43,7 @@ func TestGreenChaincodesPath(t *testing.T) {
 func TestChaincodesWithValues(t *testing.T) {
 	ccsg, err := newChaincodesGroup(&cb.ConfigGroup{
 		Values: map[string]*cb.ConfigValue{
-			"foo": &cb.ConfigValue{},
+			"foo": {},
 		},
 	})
 
diff --git a/common/resourcesconfig/peerpolicies_test.go b/common/resourcesconfig/peerpolicies_test.go
@@ -30,7 +30,7 @@ var (
 			"bar": dummyPolicy,
 		},
 		Groups: map[string]*cb.ConfigGroup{
-			"subGroup": &cb.ConfigGroup{
+			"subGroup": {
 				Policies: map[string]*cb.ConfigPolicy{
 					"other": dummyPolicy,
 				},
@@ -48,9 +48,9 @@ func TestGreenPeerPoliciesPath(t *testing.T) {
 func TestPeerPolicieesWithValues(t *testing.T) {
 	_, err := newPeerPoliciesGroup(&cb.ConfigGroup{
 		Groups: map[string]*cb.ConfigGroup{
-			"bar": &cb.ConfigGroup{
+			"bar": {
 				Values: map[string]*cb.ConfigValue{
-					"foo": &cb.ConfigValue{},
+					"foo": {},
 				},
 			},
 		},
diff --git a/common/resourcesconfig/resources_test.go b/common/resourcesconfig/resources_test.go
@@ -37,7 +37,7 @@ func TestBadPathResourceGroup(t *testing.T) {
 	t.Run("BadValues", func(t *testing.T) {
 		rg, err := newResourceGroup(&cb.ConfigGroup{
 			Values: map[string]*cb.ConfigValue{
-				"foo": &cb.ConfigValue{},
+				"foo": {},
 			},
 		})
 		assert.Nil(t, rg)
@@ -48,7 +48,7 @@ func TestBadPathResourceGroup(t *testing.T) {
 	t.Run("BadSubGroup", func(t *testing.T) {
 		rg, err := newResourceGroup(&cb.ConfigGroup{
 			Groups: map[string]*cb.ConfigGroup{
-				"bar": &cb.ConfigGroup{},
+				"bar": {},
 			},
 		})
 		assert.Nil(t, rg)
diff --git a/common/tools/configtxgen/encoder/encoder.go b/common/tools/configtxgen/encoder/encoder.go
@@ -379,13 +379,13 @@ func NewChannelCreateConfigUpdate(channelID string, orderingSystemChannelGroup *
 				Type: int32(cb.ConfigType_RESOURCE),
 				ChannelGroup: &cb.ConfigGroup{
 					Groups: map[string]*cb.ConfigGroup{
-						resourcesconfig.ChaincodesGroupKey: &cb.ConfigGroup{
+						resourcesconfig.ChaincodesGroupKey: {
 							ModPolicy: defaultModPolicy,
 						},
-						resourcesconfig.PeerPoliciesGroupKey: &cb.ConfigGroup{
+						resourcesconfig.PeerPoliciesGroupKey: {
 							ModPolicy: defaultModPolicy,
 						},
-						resourcesconfig.APIsGroupKey: &cb.ConfigGroup{
+						resourcesconfig.APIsGroupKey: {
 							ModPolicy: defaultModPolicy,
 						},
 					},
@@ -415,7 +415,7 @@ func MakeChannelCreationTransaction(channelID string, signer crypto.LocalSigner,
 			return nil, errors.Wrap(err, "creating signature header failed")
 		}
 
-		newConfigUpdateEnv.Signatures = []*cb.ConfigSignature{&cb.ConfigSignature{
+		newConfigUpdateEnv.Signatures = []*cb.ConfigSignature{{
 			SignatureHeader: utils.MarshalOrPanic(sigHeader),
 		}}
 
diff --git a/common/tools/configtxgen/encoder/encoder_test.go b/common/tools/configtxgen/encoder/encoder_test.go
@@ -225,23 +225,23 @@ func TestNewChannelGroup(t *testing.T) {
 
 	t.Run("Add application unknown MSP", func(t *testing.T) {
 		config := genesisconfig.Load(genesisconfig.SampleDevModeSoloProfile)
-		config.Application = &genesisconfig.Application{Organizations: []*genesisconfig.Organization{&genesisconfig.Organization{Name: "FakeOrg"}}}
+		config.Application = &genesisconfig.Application{Organizations: []*genesisconfig.Organization{{Name: "FakeOrg"}}}
 		group, err := NewChannelGroup(config)
 		assert.Error(t, err)
 		assert.Nil(t, group)
 	})
 
 	t.Run("Add consortiums unknown MSP", func(t *testing.T) {
 		config := genesisconfig.Load(genesisconfig.SampleDevModeSoloProfile)
-		config.Consortiums["fakeorg"] = &genesisconfig.Consortium{Organizations: []*genesisconfig.Organization{&genesisconfig.Organization{Name: "FakeOrg"}}}
+		config.Consortiums["fakeorg"] = &genesisconfig.Consortium{Organizations: []*genesisconfig.Organization{{Name: "FakeOrg"}}}
 		group, err := NewChannelGroup(config)
 		assert.Error(t, err)
 		assert.Nil(t, group)
 	})
 
 	t.Run("Add orderer unknown MSP", func(t *testing.T) {
 		config := genesisconfig.Load(genesisconfig.SampleDevModeSoloProfile)
-		config.Orderer = &genesisconfig.Orderer{Organizations: []*genesisconfig.Organization{&genesisconfig.Organization{Name: "FakeOrg"}}}
+		config.Orderer = &genesisconfig.Orderer{Organizations: []*genesisconfig.Organization{{Name: "FakeOrg"}}}
 		group, err := NewChannelGroup(config)
 		assert.Error(t, err)
 		assert.Nil(t, group)
diff --git a/common/tools/protolator/blackbox_test.go b/common/tools/protolator/blackbox_test.go
@@ -79,17 +79,17 @@ func TestResourcesConfig(t *testing.T) {
 		Type: int32(cb.ConfigType_RESOURCE),
 		ChannelGroup: &cb.ConfigGroup{
 			Groups: map[string]*cb.ConfigGroup{
-				"Chaincodes": &cb.ConfigGroup{
+				"Chaincodes": {
 					Groups: map[string]*cb.ConfigGroup{
-						"cc1": &cb.ConfigGroup{
+						"cc1": {
 							Values: map[string]*cb.ConfigValue{
-								"ChaincodeIdentifier": &cb.ConfigValue{
+								"ChaincodeIdentifier": {
 									Value: utils.MarshalOrPanic(&pb.ChaincodeIdentifier{
 										Hash:    []byte("somehashvalue"),
 										Version: "aversionstring",
 									}),
 								},
-								"ChaincodeValidation": &cb.ConfigValue{
+								"ChaincodeValidation": {
 									Value: utils.MarshalOrPanic(
 										&pb.ChaincodeValidation{
 											Name: "vscc",
@@ -98,7 +98,7 @@ func TestResourcesConfig(t *testing.T) {
 											}),
 										}),
 								},
-								"ChaincodeEndorsement": &cb.ConfigValue{
+								"ChaincodeEndorsement": {
 									Value: utils.MarshalOrPanic(&pb.ChaincodeEndorsement{
 										Name: "escc",
 									}),
@@ -107,17 +107,17 @@ func TestResourcesConfig(t *testing.T) {
 						},
 					},
 				},
-				"APIs": &cb.ConfigGroup{
+				"APIs": {
 					Values: map[string]*cb.ConfigValue{
-						"Test": &cb.ConfigValue{
+						"Test": {
 							Value: utils.MarshalOrPanic(&pb.APIResource{PolicyRef: "Foo"}),
 						},
-						"Another": &cb.ConfigValue{
+						"Another": {
 							Value: utils.MarshalOrPanic(&pb.APIResource{PolicyRef: "Bar"}),
 						},
 					},
 				},
-				"PeerPolicies": &cb.ConfigGroup{},
+				"PeerPolicies": {},
 			},
 		},
 	}
diff --git a/core/handlers/library/registry_test.go b/core/handlers/library/registry_test.go
@@ -16,8 +16,8 @@ import (
 
 func TestInitRegistry(t *testing.T) {
 	r := InitRegistry(Config{
-		AuthFilters: []*HandlerConfig{&HandlerConfig{Name: "DefaultAuth"}},
-		Decorators:  []*HandlerConfig{&HandlerConfig{Name: "DefaultDecorator"}},
+		AuthFilters: []*HandlerConfig{{Name: "DefaultAuth"}},
+		Decorators:  []*HandlerConfig{{Name: "DefaultDecorator"}},
 	})
 	assert.NotNil(t, r)
 	authHandlers := r.Lookup(Auth)
diff --git a/core/ledger/cceventmgmt/mgmt_test.go b/core/ledger/cceventmgmt/mgmt_test.go
@@ -81,7 +81,7 @@ func TestLSCCListener(t *testing.T) {
 	sampleChaincodeDataBytes, err := proto.Marshal(sampleChaincodeData)
 	assert.NoError(t, err, "")
 	lsccStateListener.HandleStateUpdates(channelName, []*kvrwset.KVWrite{
-		&kvrwset.KVWrite{Key: cc1Def.Name, Value: sampleChaincodeDataBytes},
+		{Key: cc1Def.Name, Value: sampleChaincodeDataBytes},
 	})
 	assert.Contains(t, handler1.eventsRecieved, &mockEvent{cc1Def, cc1DBArtifactsTar})
 }
diff --git a/core/ledger/kvledger/state_listener_test.go b/core/ledger/kvledger/state_listener_test.go
@@ -83,7 +83,7 @@ func TestStateListener(t *testing.T) {
 	assert.NoError(t, lgr.CommitWithPvtData(&ledger.BlockAndPvtData{Block: blk3}))
 	assert.Equal(t, channelid, mockListener.channelName)
 	assert.Equal(t, []*kvrwset.KVWrite{
-		&kvrwset.KVWrite{Key: "key4", Value: []byte("value4")},
+		{Key: "key4", Value: []byte("value4")},
 	}, mockListener.kvWrites)
 }
 
diff --git a/core/ledger/kvledger/txmgmt/statedb/statecouchdb/statecouchdb.go b/core/ledger/kvledger/txmgmt/statedb/statecouchdb/statecouchdb.go
@@ -736,7 +736,7 @@ func (vdb *VersionedDB) LoadCommittedVersions(keys []*statedb.CompositeKey) erro
 	// Call the batch retrieve if there is one or more keys to retrieve
 	if len(missingKeys) > 0 {
 
-		for namespace, _ := range missingKeys {
+		for namespace := range missingKeys {
 			// TODO: For each namespace, we need to parallely load missing keys into the cache
 			// The following codes need be moved to goroutine and introduce RWlock for cache.
 
diff --git a/core/ledger/kvledger/txmgmt/validator/valimpl/helper_test.go b/core/ledger/kvledger/txmgmt/validator/valimpl/helper_test.go
@@ -29,7 +29,7 @@ func TestPreprocessProtoBlock(t *testing.T) {
 	assert.NoError(t, err)
 	// bad envelope
 	gb = testutil.ConstructTestBlock(t, 11, 1, 1)
-	gb.Data = &common.BlockData{Data: [][]byte{[]byte{123}}}
+	gb.Data = &common.BlockData{Data: [][]byte{{123}}}
 	gb.Metadata.Metadata[common.BlockMetadataIndex_TRANSACTIONS_FILTER] =
 		lutils.NewTxValidationFlags(len(gb.Data.Data))
 	_, err = preprocessProtoBlock(nil, gb, false)
@@ -70,7 +70,7 @@ func TestPreprocessProtoBlock(t *testing.T) {
 	var blockNum uint64 = 15
 	txid := "testtxid1234"
 	gb = testutil.ConstructBlockWithTxid(t, blockNum, []byte{123},
-		[][]byte{[]byte{123}}, []string{txid}, false)
+		[][]byte{{123}}, []string{txid}, false)
 	flags = lutils.NewTxValidationFlags(len(gb.Data.Data))
 	flags.SetFlag(0, peer.TxValidationCode_BAD_HEADER_EXTENSION)
 	gb.Metadata.Metadata[common.BlockMetadataIndex_TRANSACTIONS_FILTER] = flags
diff --git a/core/peer/configtx_test.go b/core/peer/configtx_test.go
@@ -193,7 +193,7 @@ func (h *testHelper) sampleResourceConfig(version uint64, entries ...string) *co
 		ChannelGroup: &common.ConfigGroup{
 			Version: version,
 			Groups: map[string]*common.ConfigGroup{
-				resourcesconfig.ChaincodesGroupKey: &common.ConfigGroup{
+				resourcesconfig.ChaincodesGroupKey: {
 					Groups:    ccGroups,
 					ModPolicy: modPolicy,
 				},
@@ -295,7 +295,7 @@ func (h *testHelper) computeDeltaResConfTx(t *testing.T, chainid string, source,
 	sigHeader, err := localmsp.NewSigner().NewSignatureHeader()
 	assert.NoError(t, err)
 
-	confUpdateEnv.Signatures = []*common.ConfigSignature{&common.ConfigSignature{
+	confUpdateEnv.Signatures = []*common.ConfigSignature{{
 		SignatureHeader: utils.MarshalOrPanic(sigHeader)}}
 
 	sigs, err := localmsp.NewSigner().Sign(util.ConcatenateBytes(confUpdateEnv.Signatures[0].SignatureHeader, confUpdateEnv.ConfigUpdate))
diff --git a/core/scc/lscc/lscc_test.go b/core/scc/lscc/lscc_test.go
diff --git a/events/producer/producer_test.go b/events/producer/producer_test.go
diff --git a/test/chaincodes/BadImport/main.go b/test/chaincodes/BadImport/main.go

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func TestSatisfied(t *testing.T) {`
`32`	`32`
`33`	`33`	`func TestNotSatisfied(t *testing.T) {`
`34`	`34`	`capsMap := map[string]*cb.Capability{`
`35`		`- "FakeCapability": &cb.Capability{},`
	`35`	`+ "FakeCapability": {},`
`36`	`36`	`}`
`37`	`37`	`for _, provider := range []*registry{`
`38`	`38`	`NewChannelProvider(capsMap).registry,`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@ func TestUtilsBasic(t *testing.T) {`
`40`	`40`	`basicTest(t, KafkaBrokersValue([]string{"foo:1", "bar:2"}))`
`41`	`41`	`basicTest(t, MSPValue(&mspprotos.MSPConfig{}))`
`42`	`42`	`basicTest(t, CapabilitiesValue(map[string]bool{"foo": true, "bar": false}))`
`43`		`- basicTest(t, AnchorPeersValue([]*pb.AnchorPeer{&pb.AnchorPeer{}, &pb.AnchorPeer{}}))`
	`43`	`+ basicTest(t, AnchorPeersValue([]*pb.AnchorPeer{{}, {}}))`
`44`	`44`	`basicTest(t, ChannelCreationPolicyValue(&cb.Policy{}))`
`45`	`45`	`}`