[FAB-1686]Remove unused arg,method,variable

https://jira.hyperledger.org/browse/FAB-1686 Change-Id: I0b2d784f52f4f38f6afa03ca750188c369b2cc62 Signed-off-by: grapebaba <281165273@qq.com>
hyperledger · Jan 19, 2017 · 524c96e · 524c96e
1 parent 22ec03f
commit 524c96e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/core/ledger/blkstorage/fsblkstorage/blockfile_mgr.go b/core/ledger/blkstorage/fsblkstorage/blockfile_mgr.go
@@ -35,7 +35,6 @@ import (
 var logger = logging.MustGetLogger("kvledger")
 
 const (
-	blockIndexCF    = "blockIndexCF"
 	blockfilePrefix = "blockfile_"
 )
 

diff --git a/core/ledger/blkstorage/fsblkstorage/blockindex.go b/core/ledger/blkstorage/fsblkstorage/blockindex.go
@@ -76,7 +76,7 @@ func (index *blockIndex) getLastBlockIndexed() (uint64, error) {
 }
 
 func (index *blockIndex) indexBlock(blockIdxInfo *blockIdxInfo) error {
-	// do not index anyting
+	// do not index anything
 	if len(index.indexItemsMap) == 0 {
 		logger.Debug("Not indexing block... as nothing to index")
 		return nil
@@ -100,7 +100,7 @@ func (index *blockIndex) indexBlock(blockIdxInfo *blockIdxInfo) error {
 		batch.Put(constructBlockNumKey(blockIdxInfo.blockNum), flpBytes)
 	}
 
-	//Index3 Used to find a transactin by it's transaction id
+	//Index3 Used to find a transaction by it's transaction id
 	if _, ok := index.indexItemsMap[blkstorage.IndexableAttrTxID]; ok {
 		for _, txoffset := range txOffsets {
 			txFlp := newFileLocationPointer(flp.fileSuffixNum, flp.offset, txoffset.loc)
@@ -217,10 +217,6 @@ func constructBlockNumTranNumKey(blockNum uint64, txNum uint64) []byte {
 	return append([]byte{blockNumTranNumIdxKeyPrefix}, key...)
 }
 
-func constructTxID(blockNum uint64, txNum int) string {
-	return fmt.Sprintf("%d:%d", blockNum, txNum)
-}
-
 func encodeBlockNum(blockNum uint64) []byte {
 	return proto.EncodeVarint(blockNum)
 }
@@ -246,9 +242,9 @@ type fileLocPointer struct {
 	locPointer
 }
 
-func newFileLocationPointer(fileSuffixNum int, begginingOffset int, relativeLP *locPointer) *fileLocPointer {
+func newFileLocationPointer(fileSuffixNum int, beginningOffset int, relativeLP *locPointer) *fileLocPointer {
 	flp := &fileLocPointer{fileSuffixNum: fileSuffixNum}
-	flp.offset = begginingOffset + relativeLP.offset
+	flp.offset = beginningOffset + relativeLP.offset
 	flp.bytesLength = relativeLP.bytesLength
 	return flp
 }

diff --git a/core/ledger/blkstorage/fsblkstorage/pkg_test.go b/core/ledger/blkstorage/fsblkstorage/pkg_test.go
@@ -96,7 +96,7 @@ func (w *testBlockfileMgrWrapper) testGetBlockByNumber(blocks []*common.Block, s
 	// test getting the last block
 	b, err := w.blockfileMgr.retrieveBlockByNumber(math.MaxUint64)
 	iLastBlock := len(blocks) - 1
-	testutil.AssertNoError(w.t, err, fmt.Sprintf("Error while retrieving last block from blockfileMgr"))
+	testutil.AssertNoError(w.t, err, "Error while retrieving last block from blockfileMgr")
 	testutil.AssertEquals(w.t, b, blocks[iLastBlock])
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,6 @@ import ( @@
     var logger = logging.MustGetLogger("kvledger")
     const (
-    	blockIndexCF    = "blockIndexCF"
     	blockfilePrefix = "blockfile_"
     )
@@ Expand Down @@