Add BlockIndexes for building indexes of blocks

Author: anarcher

lib/block/block.go

@@ -2,7 +2,6 @@ package block
 
 import (
 	"encoding/json"
-	"fmt"
 
 	"github.com/btcsuite/btcutil/base58"
 
@@ -61,30 +60,16 @@ func getTransactionRoot(txs []string) string {
 	return common.MustMakeObjectHashString(txs) // TODO make root
 }
 
-func getBlockKey(hash string) string {
-	return fmt.Sprintf("%s%s", common.BlockPrefixHash, hash)
-}
-
-func getBlockKeyPrefixHeight(height uint64) string {
-	return fmt.Sprintf("%s%020d", common.BlockPrefixHeight, height)
-}
-
 //GetBlockKeyPrefixHeight returns index key by height. It is used to make cursor as height.
 func GetBlockKeyPrefixHeight(height uint64) string {
-	return getBlockKeyPrefixHeight(height)
-}
-
-func (b Block) NewBlockKeyConfirmed() string {
-	return fmt.Sprintf(
-		"%s%s-%s%s",
-		common.BlockPrefixConfirmed, b.ProposedTime,
-		common.EncodeUint64ToString(b.Height),
-		common.GetUniqueIDFromUUID(),
-	)
+	i := &BlockIndexes{}
+	return i.KeyHeight(height)
 }
 
 func (b *Block) Save(st *storage.LevelDBBackend) (err error) {
-	key := getBlockKey(b.Hash)
+	indexes := &BlockIndexes{}
+
+	key := indexes.KeyBlock(b.Hash)
 	if b.Confirmed == "" {
 		b.Confirmed = common.NowISO8601()
 	}
@@ -101,10 +86,10 @@ func (b *Block) Save(st *storage.LevelDBBackend) (err error) {
 		return
 	}
 
-	if err = st.New(b.NewBlockKeyConfirmed(), b.Hash); err != nil {
+	if err = st.New(indexes.KeyConfirmed(b), b.Hash); err != nil {
 		return
 	}
-	if err = st.New(getBlockKeyPrefixHeight(b.Height), b.Hash); err != nil {
+	if err = st.New(indexes.KeyHeight(b.Height), b.Hash); err != nil {
 		return
 	}
 
@@ -125,22 +110,26 @@ func (b Block) NextBlock(st *storage.LevelDBBackend) (Block, error) {
 }
 
 func GetBlock(st *storage.LevelDBBackend, hash string) (bt Block, err error) {
-	err = st.Get(getBlockKey(hash), &bt)
+	i := &BlockIndexes{}
+	err = st.Get(i.KeyBlock(hash), &bt)
 	return
 }
 
 func GetBlockHeader(st *storage.LevelDBBackend, hash string) (bt Header, err error) {
-	err = st.Get(getBlockKey(hash), &bt)
+	i := &BlockIndexes{}
+	err = st.Get(i.KeyBlock(hash), &bt)
 	return
 }
 
 func ExistsBlock(st *storage.LevelDBBackend, hash string) (exists bool, err error) {
-	exists, err = st.Has(getBlockKey(hash))
+	i := &BlockIndexes{}
+	exists, err = st.Has(i.KeyBlock(hash))
 	return
 }
 
 func ExistsBlockByHeight(st *storage.LevelDBBackend, height uint64) (exists bool, err error) {
-	exists, err = st.Has(getBlockKeyPrefixHeight(height))
+	i := &BlockIndexes{}
+	exists, err = st.Has(i.KeyHeight(height))
 	return
 }
 
@@ -222,7 +211,8 @@ func GetBlockHeadersByConfirmed(st *storage.LevelDBBackend, options storage.List
 
 func GetBlockByHeight(st *storage.LevelDBBackend, height uint64) (bt Block, err error) {
 	var hash string
-	if err = st.Get(getBlockKeyPrefixHeight(height), &hash); err != nil {
+	i := &BlockIndexes{}
+	if err = st.Get(i.KeyHeight(height), &hash); err != nil {
 		return
 	}
 
@@ -231,7 +221,8 @@ func GetBlockByHeight(st *storage.LevelDBBackend, height uint64) (bt Block, err
 
 func GetBlockHeaderByHeight(st *storage.LevelDBBackend, height uint64) (bt Header, err error) {
 	var hash string
-	if err = st.Get(getBlockKeyPrefixHeight(height), &hash); err != nil {
+	i := &BlockIndexes{}
+	if err = st.Get(i.KeyHeight(height), &hash); err != nil {
 		return
 	}
 
@@ -252,7 +243,8 @@ func GetLatestBlock(st *storage.LevelDBBackend) Block {
 }
 
 func WalkBlocks(st *storage.LevelDBBackend, option *storage.WalkOption, walkFunc func(*Block, []byte) (bool, error)) error {
-	err := st.Walk(common.BlockPrefixHeight, option, func(key, value []byte) (bool, error) {
+	i := &BlockIndexes{}
+	err := st.Walk(i.PrefixHeight(), option, func(key, value []byte) (bool, error) {
 		var hash string
 		if err := json.Unmarshal(value, &hash); err != nil {
 			return false, err

lib/block/block_indexes.go

@@ -0,0 +1,39 @@
+package block
+
+import (
+	"fmt"
+
+	"boscoin.io/sebak/lib/common"
+	"boscoin.io/sebak/lib/storage"
+)
+
+type BlockIndexes struct {
+}
+
+func (BlockIndexes) KeyHeight(height uint64) string {
+	idx := storage.NewIndex()
+	idx.WritePrefix(common.BlockPrefixHeight, common.EncodeUint64ToString(height))
+	return idx.String()
+}
+
+func (BlockIndexes) KeyBlock(hash string) string {
+	idx := storage.NewIndex()
+	idx.WritePrefix(common.BlockPrefixHash, hash)
+	return idx.String()
+}
+
+func (BlockIndexes) KeyConfirmed(b *Block) string {
+	idx := storage.NewIndex()
+	idx.WritePrefix(common.BlockPrefixConfirmed, b.ProposedTime)
+	idx.WritePrefix(common.EncodeUint64ToString(b.Height))
+	idx.WriteOrder(common.GetUniqueIDFromUUID())
+	return idx.String()
+}
+
+func (BlockIndexes) PrefixHeight() string {
+	return fmt.Sprintf("%s", common.BlockPrefixHeight)
+}
+
+func (BlockIndexes) PrefixHash() string {
+	return fmt.Sprintf("%s", common.BlockPrefixHash)
+}

lib/node/runner/api_block.go

@@ -41,7 +41,8 @@ func (nh NetworkHandlerNode) GetBlocksHandler(w http.ResponseWriter, r *http.Req
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		options.SetCursor([]byte(cursorBlock.NewBlockKeyConfirmed()))
+		indexes := &block.BlockIndexes{}
+		options.SetCursor([]byte(indexes.KeyConfirmed(&cursorBlock)))
 	}
 
 	var bs []*block.Block