From cff2d43d1e1494f67c09ee8dd795278127998b38 Mon Sep 17 00:00:00 2001
From: William Banfield <wbanfield@gmail.com>
Date: Tue, 15 Mar 2022 10:21:56 -0400
Subject: [PATCH] move TxsToTxRecords as helper function for state tests

---
 internal/state/execution_test.go | 19 +++++++++++++++----
 types/tx.go                      | 13 -------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/internal/state/execution_test.go b/internal/state/execution_test.go
index 5c18aa3f9..e62735a4a 100644
--- a/internal/state/execution_test.go
+++ b/internal/state/execution_test.go
@@ -672,7 +672,7 @@ func TestPrepareProposalRemoveTxs(t *testing.T) {
 	mp := &mpmocks.Mempool{}
 	mp.On("ReapMaxBytesMaxGas", mock.Anything, mock.Anything).Return(types.Txs(txs))
 
-	trs := types.TxsToTxRecords(types.Txs(txs))
+	trs := txsToTxRecords(types.Txs(txs))
 	trs[0].Action = abci.TxRecord_REMOVED
 	trs[1].Action = abci.TxRecord_REMOVED
 	mp.On("RemoveTxByKey", mock.Anything).Return(nil).Twice()
@@ -734,7 +734,7 @@ func TestPrepareProposalAddedTxsIncluded(t *testing.T) {
 	mp.On("ReapMaxBytesMaxGas", mock.Anything, mock.Anything).Return(types.Txs(txs[2:]))
 	mp.On("CheckTx", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil).Twice()
 
-	trs := types.TxsToTxRecords(types.Txs(txs))
+	trs := txsToTxRecords(types.Txs(txs))
 	trs[0].Action = abci.TxRecord_ADDED
 	trs[1].Action = abci.TxRecord_ADDED
 
@@ -792,7 +792,7 @@ func TestPrepareProposalReorderTxs(t *testing.T) {
 	mp := &mpmocks.Mempool{}
 	mp.On("ReapMaxBytesMaxGas", mock.Anything, mock.Anything).Return(types.Txs(txs))
 
-	trs := types.TxsToTxRecords(types.Txs(txs))
+	trs := txsToTxRecords(types.Txs(txs))
 	trs = trs[2:]
 	trs = append(trs[len(trs)/2:], trs[:len(trs)/2]...)
 
@@ -850,7 +850,7 @@ func TestPrepareProposalModifiedTxFalse(t *testing.T) {
 	mp := &mpmocks.Mempool{}
 	mp.On("ReapMaxBytesMaxGas", mock.Anything, mock.Anything).Return(types.Txs(txs))
 
-	trs := types.TxsToTxRecords(types.Txs(txs))
+	trs := txsToTxRecords(types.Txs(txs))
 	trs = append(trs[len(trs)/2:], trs[:len(trs)/2]...)
 	trs = trs[1:]
 	trs[0].Action = abci.TxRecord_REMOVED
@@ -905,3 +905,14 @@ func makeBlockID(hash []byte, partSetSize uint32, partSetHash []byte) types.Bloc
 		},
 	}
 }
+
+func txsToTxRecords(txs []types.Tx) []*abci.TxRecord {
+	trs := make([]*abci.TxRecord, len(txs))
+	for i, tx := range txs {
+		trs[i] = &abci.TxRecord{
+			Action: abci.TxRecord_UNMODIFIED,
+			Tx:     tx,
+		}
+	}
+	return trs
+}
diff --git a/types/tx.go b/types/tx.go
index 0e7c6a046..1baa8ad70 100644
--- a/types/tx.go
+++ b/types/tx.go
@@ -293,19 +293,6 @@ func containsAllTxs(super, sub []Tx) (int, bool) {
 	return -1, true
 }
 
-// TxsToTxRecords converts from a list of Txs to a list of TxRecords. All of the
-// resulting TxRecords are returned with the status TxRecord_UNMODIFIED.
-func TxsToTxRecords(txs []Tx) []*abci.TxRecord {
-	trs := make([]*abci.TxRecord, len(txs))
-	for i, tx := range txs {
-		trs[i] = &abci.TxRecord{
-			Action: abci.TxRecord_UNMODIFIED,
-			Tx:     tx,
-		}
-	}
-	return trs
-}
-
 // TxProof represents a Merkle proof of the presence of a transaction in the Merkle tree.
 type TxProof struct {
 	RootHash tmbytes.HexBytes `json:"root_hash"`