Fix paging next,prev and fix rebase miss

bosnet · Nov 21, 2018 · 92634ee · 92634ee
1 parent 3cf9e45
commit 92634ee
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/lib/block/operation.go b/lib/block/operation.go
@@ -269,7 +269,7 @@ func LoadBlockOperationsInsideIterator(
 
 	return (func() (BlockOperation, bool, []byte) {
 			item, hasNext := iterFunc()
-			if !hasNext {
+			if !hasNext && (item.Key == nil || item.Value == nil) {
 				return BlockOperation{}, false, item.Key
 			}
 

diff --git a/lib/block/transaction.go b/lib/block/transaction.go
@@ -342,7 +342,7 @@ func LoadBlockTransactionsInsideIterator(
 
 	return (func() (BlockTransaction, bool, []byte) {
 			item, hasNext := iterFunc()
-			if !hasNext {
+			if !hasNext && (item.Key == nil || item.Value == nil) {
 				return BlockTransaction{}, false, item.Key
 			}
 

diff --git a/lib/node/runner/api/operation.go b/lib/node/runner/api/operation.go
@@ -58,6 +58,9 @@ func (api NetworkHandlerAPI) GetOperationsByAccountHandler(w http.ResponseWriter
 		}
 		for {
 			t, hasNext, _ := iterFunc()
+			if t.BlockOrder() != nil {
+				order = t.BlockOrder()
+			}
 			if !hasNext {
 				break
 			}
@@ -76,7 +79,6 @@ func (api NetworkHandlerAPI) GetOperationsByAccountHandler(w http.ResponseWriter
 			r := resource.NewOperation(&t)
 			r.Block = blk
 			txs = append(txs, r)
-			order = t.BlockOrder()
 		}
 		closeFunc()
 		return txs

diff --git a/lib/node/runner/api/transaction.go b/lib/node/runner/api/transaction.go
@@ -35,10 +35,12 @@ func (api NetworkHandlerAPI) GetTransactionsHandler(w http.ResponseWriter, r *ht
 		iterFunc, closeFunc := block.GetBlockTransactions(api.storage, options)
 		for {
 			t, hasNext, _ := iterFunc()
+			if t.BlockOrder() != nil {
+				order = t.BlockOrder()
+			}
 			if !hasNext {
 				break
 			}
-			order = t.BlockOrder()
 			txs = append(txs, resource.NewTransaction(&t))
 		}
 		closeFunc()
@@ -127,10 +129,12 @@ func (api NetworkHandlerAPI) GetTransactionsByAccountHandler(w http.ResponseWrit
 		iterFunc, closeFunc := block.GetBlockTransactionsByAccount(api.storage, address, options)
 		for {
 			t, hasNext, _ := iterFunc()
+			if t.BlockOrder() != nil {
+				order = t.BlockOrder()
+			}
 			if !hasNext {
 				break
 			}
-			order = t.BlockOrder()
 			txs = append(txs, resource.NewTransaction(&t))
 		}
 		closeFunc()

diff --git a/lib/node/runner/api/transaction_test.go b/lib/node/runner/api/transaction_test.go
@@ -416,7 +416,6 @@ 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 {

diff --git a/lib/node/runner/api/tx_operations.go b/lib/node/runner/api/tx_operations.go
@@ -102,14 +102,15 @@ func (api NetworkHandlerAPI) getOperationsByTxHash(txHash string, blk *block.Blo
 	iterFunc, closeFunc := block.GetBlockOperationsByTxHash(api.storage, txHash, options)
 	for {
 		o, hasNext, _ := iterFunc()
+		if o.BlockOrder() != nil {
+			order = o.BlockOrder()
+		}
 		if !hasNext {
 			break
 		}
 		rs := resource.NewOperation(&o)
 		rs.Block = blk
 		txs = append(txs, rs)
-		order = o.BlockOrder()
-		txs = append(txs, resource.NewOperation(&o))
 	}
 	closeFunc()
 	return