Remove Prev,NextOrder in BlockOrder and change operation handelrs

Author: anarcher

lib/block/operation.go

@@ -240,6 +240,10 @@ func (bo BlockOperation) NewBlockOperationSourceAndTypeKey() string {
 	*/
 }
 
+func (bo BlockOperation) BlockOrder() *BlockOrder {
+	return bo.order
+}
+
 func ExistsBlockOperation(st *storage.LevelDBBackend, hash string) (bool, error) {
 	return st.Has(GetBlockOperationKey(hash))
 }

lib/block/order.go

@@ -51,42 +51,3 @@ func (o *BlockOrder) formatText(xs []uint64) string {
 func (o *BlockOrder) String() string {
 	return o.formatText(o.parts)
 }
-
-func (o *BlockOrder) NextString() string {
-	return o.formatText(o.NextOrder())
-}
-
-func (o *BlockOrder) PrevString() string {
-	return o.formatText(o.PrevOrder())
-}
-
-func (o *BlockOrder) NextOrder() (xs []uint64) {
-	if o == nil || len(o.parts) <= 0 {
-		return
-	}
-	for i, x := range o.parts {
-		if i == len(xs)-1 {
-			x++
-		}
-		xs = append(xs, x)
-	}
-	return
-}
-
-func (o *BlockOrder) PrevOrder() []uint64 {
-	if o == nil || len(o.parts) <= 0 {
-		return []uint64{}
-	}
-	return blockOrderPrevOrder(o.parts, len(o.parts)-1)
-}
-
-func blockOrderPrevOrder(xs []uint64, pos int) []uint64 {
-	if pos == 0 || len(xs)-1 < pos {
-		return xs
-	}
-	if xs[pos] > 0 {
-		xs[pos]--
-		return xs
-	}
-	return blockOrderPrevOrder(xs, pos-1)
-}

lib/node/runner/api/operation.go

@@ -24,16 +24,26 @@ func (api NetworkHandlerAPI) GetOperationsByAccountHandler(w http.ResponseWriter
 		return
 	}
 
-	options := p.ListOptions()
-
 	oTypeStr := r.URL.Query().Get("type")
 	if len(oTypeStr) > 0 && !operation.IsValidOperationType(oTypeStr) {
 		httputils.WriteJSONError(w, errors.InvalidQueryString)
 		return
 	}
 
 	oType := operation.OperationType(oTypeStr)
-	var cursor []byte
+
+	prefix := block.GetBlockOperationKeyPrefixSourceAndType(address, oType)
+	if len(oType) > 0 {
+		prefix = block.GetBlockOperationKeyPrefixSource(address)
+	}
+
+	options, err := p.PageCursorListOptions(prefix)
+	if err != nil {
+		httputils.WriteJSONError(w, err)
+		return
+	}
+
+	var order *block.BlockOrder
 	readFunc := func() []resource.Resource {
 		var txs []resource.Resource
 
@@ -45,11 +55,11 @@ func (api NetworkHandlerAPI) GetOperationsByAccountHandler(w http.ResponseWriter
 			iterFunc, closeFunc = block.GetBlockOperationsBySource(api.storage, address, options)
 		}
 		for {
-			t, hasNext, c := iterFunc()
-			cursor = c
+			t, hasNext, _ := iterFunc()
 			if !hasNext {
 				break
 			}
+			order = t.BlockOrder()
 			txs = append(txs, resource.NewOperation(&t))
 		}
 		closeFunc()
@@ -79,6 +89,6 @@ func (api NetworkHandlerAPI) GetOperationsByAccountHandler(w http.ResponseWriter
 	}
 
 	txs := readFunc()
-	list := p.ResourceList(txs, cursor)
+	list := p.ResourceListWithOrder(txs, order)
 	httputils.MustWriteJSON(w, 200, list)
 }

lib/node/runner/api/pagequery.go

@@ -86,12 +86,7 @@ func (p *PageQuery) ResourceList(rs []resource.Resource, cursor []byte) *resourc
 }
 
 func (p *PageQuery) ResourceListWithOrder(rs []resource.Resource, order *block.BlockOrder) *resource.ResourceList {
-	var cursor []byte
-	if p.reverse == false {
-		cursor = []byte(order.NextString())
-	} else {
-		cursor = []byte(order.PrevString())
-	}
+	cursor := []byte(order.String())
 	return p.ResourceList(rs, cursor)
 }
 

lib/node/runner/api/transaction.go

@@ -109,17 +109,21 @@ func (api NetworkHandlerAPI) GetTransactionsByAccountHandler(w http.ResponseWrit
 		return
 	}
 
-	var options = p.ListOptions()
-	var cursor []byte
+	options, err := p.PageCursorListOptions(block.GetBlockTransactionKeyPrefixAccount(address))
+	if err != nil {
+		httputils.WriteJSONError(w, err)
+		return
+	}
+	var order *block.BlockOrder
 	readFunc := func() []resource.Resource {
 		var txs []resource.Resource
 		iterFunc, closeFunc := block.GetBlockTransactionsByAccount(api.storage, address, options)
 		for {
-			t, hasNext, c := iterFunc()
-			cursor = c
+			t, hasNext, _ := iterFunc()
 			if !hasNext {
 				break
 			}
+			order = t.BlockOrder()
 			txs = append(txs, resource.NewTransaction(&t))
 		}
 		closeFunc()
@@ -139,6 +143,6 @@ func (api NetworkHandlerAPI) GetTransactionsByAccountHandler(w http.ResponseWrit
 	}
 
 	txs := readFunc()
-	list := p.ResourceList(txs, cursor)
+	list := p.ResourceListWithOrder(txs, order)
 	httputils.MustWriteJSON(w, 200, list)
 }

lib/node/runner/api/transaction_test.go

@@ -350,6 +350,7 @@ func TestGetTransactionsHandlerPage(t *testing.T) {
 
 		{
 			records, _ := requestFunction(nextLink)
+			println(len(records))
 			require.Equal(t, len(btList[5:]), len(records), "length is not the same")
 
 			for i, r := range records {

lib/node/runner/api/tx_operations.go

@@ -28,7 +28,11 @@ func (api NetworkHandlerAPI) GetOperationsByTxHashHandler(w http.ResponseWriter,
 		return
 	}
 
-	options := p.ListOptions()
+	options, err := p.PageCursorListOptions(block.GetBlockOperationKeyPrefixTxHash(hash))
+	if err != nil {
+		httputils.WriteJSONError(w, err)
+		return
+	}
 
 	if httputils.IsEventStream(r) {
 		event := fmt.Sprintf("txhash-%s", hash)
@@ -41,24 +45,24 @@ func (api NetworkHandlerAPI) GetOperationsByTxHashHandler(w http.ResponseWriter,
 		return
 	}
 
-	ops, cursor := api.getOperationsByTxHash(hash, options)
+	ops, order := api.getOperationsByTxHash(hash, options)
 	if len(ops) < 1 {
 		httputils.WriteJSONError(w, errors.BlockTransactionDoesNotExists)
 		return
 	}
 
-	list := p.ResourceList(ops, cursor)
+	list := p.ResourceListWithOrder(ops, order)
 	httputils.MustWriteJSON(w, 200, list)
 }
 
-func (api NetworkHandlerAPI) getOperationsByTxHash(txHash string, options storage.ListOptions) (txs []resource.Resource, cursor []byte) {
+func (api NetworkHandlerAPI) getOperationsByTxHash(txHash string, options storage.ListOptions) (txs []resource.Resource, order *block.BlockOrder) {
 	iterFunc, closeFunc := block.GetBlockOperationsByTxHash(api.storage, txHash, options)
 	for {
-		o, hasNext, c := iterFunc()
-		cursor = c
+		o, hasNext, _ := iterFunc()
 		if !hasNext {
 			break
 		}
+		order = o.BlockOrder()
 		txs = append(txs, resource.NewOperation(&o))
 	}
 	closeFunc()