Make BlockOperation with BlockTransaction.Index

- For building blockoperation's indexes, tx.Index is needed.

Author: anarcher

lib/block/operation.go

@@ -33,14 +33,15 @@ type BlockOperation struct {
 
 	// transaction will be used only for `Save` time.
 	transaction transaction.Transaction
+	txIndex     uint64
 	isSaved     bool
 }
 
 func NewBlockOperationKey(opHash, txHash string) string {
 	return fmt.Sprintf("%s-%s", opHash, txHash)
 }
 
-func NewBlockOperationFromOperation(op operation.Operation, tx transaction.Transaction, blockHeight, index uint64) (BlockOperation, error) {
+func NewBlockOperationFromOperation(op operation.Operation, tx transaction.Transaction, blockHeight, txIndex, index uint64) (BlockOperation, error) {
 	body, err := op.B.Serialize()
 	if err != nil {
 		return BlockOperation{}, err
@@ -62,6 +63,7 @@ func NewBlockOperationFromOperation(op operation.Operation, tx transaction.Trans
 		Index:  index,
 
 		transaction: tx,
+		txIndex:     index,
 	}, nil
 }
 

lib/block/operation_test.go

@@ -16,7 +16,7 @@ func TestNewBlockOperationFromOperation(t *testing.T) {
 	_, tx := transaction.TestMakeTransaction(conf.NetworkID, 1)
 
 	op := tx.B.Operations[0]
-	bo, err := NewBlockOperationFromOperation(op, tx, 0, 0)
+	bo, err := NewBlockOperationFromOperation(op, tx, 0, 1, 0)
 	require.NoError(t, err)
 
 	require.Equal(t, bo.Type, op.H.Type)

lib/block/test.go

@@ -128,7 +128,7 @@ func TestMakeNewBlockOperation(networkID []byte, n int) (bos []BlockOperation) {
 	_, tx := transaction.TestMakeTransaction(networkID, n)
 
 	for i, op := range tx.B.Operations {
-		bo, err := NewBlockOperationFromOperation(op, tx, 0, uint64(i))
+		bo, err := NewBlockOperationFromOperation(op, tx, 0, 1, uint64(i))
 		if err != nil {
 			panic(err)
 		}

lib/block/transaction.go

@@ -212,7 +212,7 @@ func (bt *BlockTransaction) SaveBlockOperation(st *storage.LevelDBBackend, op op
 	}
 
 	var bo BlockOperation
-	bo, err = NewBlockOperationFromOperation(op, bt.Transaction(), bt.blockHeight, index)
+	bo, err = NewBlockOperationFromOperation(op, bt.Transaction(), bt.blockHeight, bt.Index, index)
 	if err != nil {
 		return
 	}

lib/node/runner/api/base_test.go

@@ -64,9 +64,9 @@ func prepareOpsWithoutSave(count int, st *storage.LevelDBBackend) (*keypair.Full
 	}
 
 	theBlock := block.TestMakeNewBlockWithPrevBlock(block.GetLatestBlock(st), txHashes)
-	for _, tx := range txs {
-		for i, op := range tx.B.Operations {
-			bo, err := block.NewBlockOperationFromOperation(op, tx, theBlock.Height, uint64(i))
+	for i, tx := range txs {
+		for j, op := range tx.B.Operations {
+			bo, err := block.NewBlockOperationFromOperation(op, tx, theBlock.Height, uint64(i), uint64(j))
 			if err != nil {
 				panic(err)
 			}

lib/node/runner/api/tx_operations_test.go

@@ -77,7 +77,7 @@ func TestGetOperationsByTxHashHandlerStream(t *testing.T) {
 
 	boMap := make(map[string]block.BlockOperation)
 	for i, op := range tx.B.Operations {
-		bo, err := block.NewBlockOperationFromOperation(op, tx, 0, uint64(i))
+		bo, err := block.NewBlockOperationFromOperation(op, tx, 0, 1, uint64(i))
 		require.NoError(t, err)
 		boMap[bo.Hash] = bo
 	}