'gofmt -l -s -w' fixes

Go 1.19 is more unforgiving

Signed-off-by: James Taylor <jamest@uk.ibm.com>

bccsp/factory/opts_test.go

@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-		 http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

bccsp/factory/swfactory.go

@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-		 http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

bccsp/factory/swfactory_test.go

@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-		 http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

bccsp/keystore.go

@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-		 http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

bccsp/pkcs11/ecdsakey.go

@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-		 http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

bccsp/pkcs11/pkcs11.go

@@ -442,19 +442,18 @@ func (csp *impl) getECKey(ski []byte) (pubKey *ecdsa.PublicKey, isPriv bool, err
 
 // RFC 5480, 2.1.1.1. Named Curve
 //
-// secp224r1 OBJECT IDENTIFIER ::= {
-//   iso(1) identified-organization(3) certicom(132) curve(0) 33 }
+//	secp224r1 OBJECT IDENTIFIER ::= {
+//	  iso(1) identified-organization(3) certicom(132) curve(0) 33 }
 //
-// secp256r1 OBJECT IDENTIFIER ::= {
-//   iso(1) member-body(2) us(840) ansi-X9-62(10045) curves(3)
-//   prime(1) 7 }
+//	secp256r1 OBJECT IDENTIFIER ::= {
+//	  iso(1) member-body(2) us(840) ansi-X9-62(10045) curves(3)
+//	  prime(1) 7 }
 //
-// secp384r1 OBJECT IDENTIFIER ::= {
-//   iso(1) identified-organization(3) certicom(132) curve(0) 34 }
-//
-// secp521r1 OBJECT IDENTIFIER ::= {
-//   iso(1) identified-organization(3) certicom(132) curve(0) 35 }
+//	secp384r1 OBJECT IDENTIFIER ::= {
+//	  iso(1) identified-organization(3) certicom(132) curve(0) 34 }
 //
+//	secp521r1 OBJECT IDENTIFIER ::= {
+//	  iso(1) identified-organization(3) certicom(132) curve(0) 35 }
 var (
 	oidNamedCurveP224 = asn1.ObjectIdentifier{1, 3, 132, 0, 33}
 	oidNamedCurveP256 = asn1.ObjectIdentifier{1, 2, 840, 10045, 3, 1, 7}
@@ -748,18 +747,19 @@ func (csp *impl) findKeyPairFromSKI(session pkcs11.SessionHandle, ski []byte, ke
 // 00000040  06 04
 //
 // cf. correct field:
-//   0  89: SEQUENCE {
-//   2  19:   SEQUENCE {
-//   4   7:     OBJECT IDENTIFIER ecPublicKey (1 2 840 10045 2 1)
-//  13   8:     OBJECT IDENTIFIER prime256v1 (1 2 840 10045 3 1 7)
-//        :     }
-//  23  66:   BIT STRING
-//        :     04 CE 30 31 6D 5A FD D3 53 2D 54 9A 27 54 D8 7C
-//        :     D9 80 35 91 09 2D 6F 06 5A 8E E3 CB C0 01 B7 C9
-//        :     13 5D 70 D4 E5 62 F2 1B 10 93 F7 D5 77 41 BA 9D
-//        :     93 3E 18 3E 00 C6 0A 0E D2 36 CC 7F BE 50 16 EF
-//        :     06
-//        :   }
+//
+//	 0  89: SEQUENCE {
+//	 2  19:   SEQUENCE {
+//	 4   7:     OBJECT IDENTIFIER ecPublicKey (1 2 840 10045 2 1)
+//	13   8:     OBJECT IDENTIFIER prime256v1 (1 2 840 10045 3 1 7)
+//	      :     }
+//	23  66:   BIT STRING
+//	      :     04 CE 30 31 6D 5A FD D3 53 2D 54 9A 27 54 D8 7C
+//	      :     D9 80 35 91 09 2D 6F 06 5A 8E E3 CB C0 01 B7 C9
+//	      :     13 5D 70 D4 E5 62 F2 1B 10 93 F7 D5 77 41 BA 9D
+//	      :     93 3E 18 3E 00 C6 0A 0E D2 36 CC 7F BE 50 16 EF
+//	      :     06
+//	      :   }
 //
 // as a short-term workaround, remove the trailing byte if:
 //   - receiving an even number of bytes == 2*prime-coordinate +2 bytes
@@ -770,7 +770,9 @@ func (csp *impl) findKeyPairFromSKI(session pkcs11.SessionHandle, ski []byte, ke
 //
 // SoftHSM reports extra two bytes before the uncompressed point
 // 0x04 || <Length*2+1>
-//                 VV< Actual start of point
+//
+//	VV< Actual start of point
+//
 // 00000000  04 41 04 6c c8 57 32 13  02 12 6a 19 23 1d 5a 64  |.A.l.W2...j.#.Zd|
 // 00000010  33 0c eb 75 4d e8 99 22  92 35 96 b2 39 58 14 1e  |3..uM..".5..9X..|
 // 00000020  19 de ef 32 46 50 68 02  24 62 36 db ed b1 84 7b  |...2FPh.$b6....{|

bccsp/signer/signer_test.go

@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-		 http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

bccsp/sw/aes_test.go

@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-		 http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

bccsp/sw/aeskey.go

@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-		 http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

bccsp/sw/dummyks.go

@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-		 http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

bccsp/sw/dummyks_test.go

@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-		 http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

bccsp/sw/ecdsa.go

@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-		 http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

bccsp/sw/ecdsakey.go

@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-		 http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

bccsp/sw/impl.go

@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-		 http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

cmd/cryptogen/main.go

@@ -199,7 +199,7 @@ PeerOrgs:
       Count: 1
 `
 
-//command line flags
+// command line flags
 var (
 	app = kingpin.New("cryptogen", "Utility for generating Hyperledger Fabric key material")
 

common/capabilities/application.go

@@ -108,8 +108,8 @@ func (ap *ApplicationProvider) V1_3Validation() bool {
 
 // V2_0Validation returns true if this channel supports transaction validation
 // as introduced in v2.0. This includes:
-//  - new chaincode lifecycle
-//  - implicit per-org collections
+//   - new chaincode lifecycle
+//   - implicit per-org collections
 func (ap *ApplicationProvider) V2_0Validation() bool {
 	return ap.v20
 }

common/configtx/validator.go

@@ -42,9 +42,9 @@ type ValidatorImpl struct {
 
 // validateConfigID makes sure that the config element names (ie map key of
 // ConfigGroup) comply with the following restrictions
-//      1. Contain only ASCII alphanumerics, dots '.', dashes '-'
-//      2. Are shorter than 250 characters.
-//      3. Are not the strings "." or "..".
+//  1. Contain only ASCII alphanumerics, dots '.', dashes '-'
+//  2. Are shorter than 250 characters.
+//  3. Are not the strings "." or "..".
 func validateConfigID(configID string) error {
 	re, _ := regexp.Compile(configAllowedChars)
 	// Length
@@ -69,17 +69,16 @@ func validateConfigID(configID string) error {
 
 // ValidateChannelID makes sure that proposed channel IDs comply with the
 // following restrictions:
-//      1. Contain only lower case ASCII alphanumerics, dots '.', and dashes '-'
-//      2. Are shorter than 250 characters.
-//      3. Start with a letter
+//  1. Contain only lower case ASCII alphanumerics, dots '.', and dashes '-'
+//  2. Are shorter than 250 characters.
+//  3. Start with a letter
 //
 // This is the intersection of the Kafka restrictions and CouchDB restrictions
 // with the following exception: '.' is converted to '_' in the CouchDB naming
 // This is to accommodate existing channel names with '.', especially in the
 // behave tests which rely on the dot notation for their sluggification.
 //
 // note: this function is a copy of the same in core/tx/endorser/parser.go
-//
 func ValidateChannelID(channelID string) error {
 	re, _ := regexp.Compile(ChannelAllowedChars)
 	// Length

common/flogging/fabenc/formatter.go

@@ -19,9 +19,9 @@ import (
 )
 
 // formatRegexp is broken into three groups:
-//   1. the format verb
-//   2. an optional colon that is ungrouped with '?:'
-//   3. an optional, non-greedy format directive
+//  1. the format verb
+//  2. an optional colon that is ungrouped with '?:'
+//  3. an optional, non-greedy format directive
 //
 // The grouping simplifies the verb proccssing during spec parsing.
 var formatRegexp = regexp.MustCompile(`%{(color|id|level|message|module|shortfunc|time)(?::(.*?))?}`)
@@ -44,7 +44,6 @@ var formatRegexp = regexp.MustCompile(`%{(color|id|level|message|module|shortfun
 //   - level: a fmt style string formatter without the leading %
 //   - message: a fmt style string formatter without the leading %
 //   - module: a fmt style string formatter without the leading %
-//
 func ParseFormat(spec string) ([]Formatter, error) {
 	cursor := 0
 	formatters := []Formatter{}

common/flogging/loggerlevels.go

@@ -38,7 +38,8 @@ func (l *LoggerLevels) DefaultLevel() zapcore.Level {
 // ActivateSpec is used to modify logging levels.
 //
 // The logging specification has the following form:
-//   [<logger>[,<logger>...]=]<level>[:[<logger>[,<logger>...]=]<level>...]
+//
+//	[<logger>[,<logger>...]=]<level>[:[<logger>[,<logger>...]=]<level>...]
 func (l *LoggerLevels) ActivateSpec(spec string) error {
 	l.mutex.Lock()
 	defer l.mutex.Unlock()

common/ledger/blkstorage/block_serialization.go

@@ -19,7 +19,7 @@ type serializedBlockInfo struct {
 	metadata    *common.BlockMetadata
 }
 
-//The order of the transactions must be maintained for history
+// The order of the transactions must be maintained for history
 type txindexInfo struct {
 	txID string
 	loc  *locPointer

common/ledger/blkstorage/block_stream.go

@@ -48,9 +48,9 @@ type blockPlacementInfo struct {
 	blockBytesOffset int64
 }
 
-///////////////////////////////////
+// /////////////////////////////////
 // blockfileStream functions
-////////////////////////////////////
+// //////////////////////////////////
 func newBlockfileStream(rootDir string, fileNum int, startOffset int64) (*blockfileStream, error) {
 	filePath := deriveBlockfilePath(rootDir, fileNum)
 	logger.Debugf("newBlockfileStream(): filePath=[%s], startOffset=[%d]", filePath, startOffset)
@@ -142,9 +142,9 @@ func (s *blockfileStream) close() error {
 	return errors.WithStack(s.file.Close())
 }
 
-///////////////////////////////////
+// /////////////////////////////////
 // blockStream functions
-////////////////////////////////////
+// //////////////////////////////////
 func newBlockStream(rootDir string, startFileNum int, startOffset int64, endFileNum int) (*blockStream, error) {
 	startFileStream, err := newBlockfileStream(rootDir, startFileNum, startOffset)
 	if err != nil {

common/ledger/blkstorage/blockfile_mgr.go

@@ -48,10 +48,12 @@ type blockfileMgr struct {
 /*
 Creates a new manager that will manage the files used for block persistence.
 This manager manages the file system FS including
-  -- the directory where the files are stored
-  -- the individual files where the blocks are stored
-  -- the blockfilesInfo which tracks the latest file being persisted to
-  -- the index which tracks what block and transaction is in what file
+
+	-- the directory where the files are stored
+	-- the individual files where the blocks are stored
+	-- the blockfilesInfo which tracks the latest file being persisted to
+	-- the index which tracks what block and transaction is in what file
+
 When a new blockfile manager is started (i.e. only on start-up), it checks
 if this start-up is the first time the system is coming up or is this a restart
 of the system.
@@ -62,29 +64,32 @@ i.e blockfile_000000, blockfile_000001, etc..
 
 Each transaction in a block is stored with information about the number of
 bytes in that transaction
- Adding txLoc [fileSuffixNum=0, offset=3, bytesLength=104] for tx [1:0] to index
- Adding txLoc [fileSuffixNum=0, offset=107, bytesLength=104] for tx [1:1] to index
+
+	Adding txLoc [fileSuffixNum=0, offset=3, bytesLength=104] for tx [1:0] to index
+	Adding txLoc [fileSuffixNum=0, offset=107, bytesLength=104] for tx [1:1] to index
+
 Each block is stored with the total encoded length of that block as well as the
 tx location offsets.
 
 Remember that these steps are only done once at start-up of the system.
 At start up a new manager:
-  *) Checks if the directory for storing files exists, if not creates the dir
-  *) Checks if the key value database exists, if not creates one
-       (will create a db dir)
-  *) Determines the blockfilesInfo used for storage
-		-- Loads from db if exist, if not instantiate a new blockfilesInfo
-		-- If blockfilesInfo was loaded from db, compares to FS
-		-- If blockfilesInfo and file system are not in sync, syncs blockfilesInfo from FS
-  *) Starts a new file writer
-		-- truncates file per blockfilesInfo to remove any excess past last block
-  *) Determines the index information used to find tx and blocks in
-  the file blkstorage
-		-- Instantiates a new blockIdxInfo
-		-- Loads the index from the db if exists
-		-- syncIndex comparing the last block indexed to what is in the FS
-		-- If index and file system are not in sync, syncs index from the FS
-  *)  Updates blockchain info used by the APIs
+
+	  *) Checks if the directory for storing files exists, if not creates the dir
+	  *) Checks if the key value database exists, if not creates one
+	       (will create a db dir)
+	  *) Determines the blockfilesInfo used for storage
+			-- Loads from db if exist, if not instantiate a new blockfilesInfo
+			-- If blockfilesInfo was loaded from db, compares to FS
+			-- If blockfilesInfo and file system are not in sync, syncs blockfilesInfo from FS
+	  *) Starts a new file writer
+			-- truncates file per blockfilesInfo to remove any excess past last block
+	  *) Determines the index information used to find tx and blocks in
+	  the file blkstorage
+			-- Instantiates a new blockIdxInfo
+			-- Loads the index from the db if exists
+			-- syncIndex comparing the last block indexed to what is in the FS
+			-- If index and file system are not in sync, syncs index from the FS
+	  *)  Updates blockchain info used by the APIs
 */
 func newBlockfileMgr(id string, conf *Conf, indexConfig *IndexConfig, indexStore *leveldbhelper.DBHandle) (*blockfileMgr, error) {
 	logger.Debugf("newBlockfileMgr() initializing file-based block storage for ledger: %s ", id)
@@ -658,7 +663,7 @@ func (mgr *blockfileMgr) fetchRawBytes(lp *fileLocPointer) ([]byte, error) {
 	return b, nil
 }
 
-//Get the current blockfilesInfo information that is stored in the database
+// Get the current blockfilesInfo information that is stored in the database
 func (mgr *blockfileMgr) loadBlkfilesInfo() (*blockfilesInfo, error) {
 	var b []byte
 	var err error