diff --git a/internal/state/execution.go b/internal/state/execution.go index e71fc24d8..db3f374ab 100644 --- a/internal/state/execution.go +++ b/internal/state/execution.go @@ -150,17 +150,17 @@ func (blockExec *BlockExecutor) CreateProposalBlock( return nil, err } - for _, rtx := range txrSet.GetRemovedTxs() { + for _, rtx := range txrSet.RemovedTxs() { if err := blockExec.mempool.RemoveTxByKey(rtx.Key()); err != nil { blockExec.logger.Debug("error removing transaction from the mempool", "error", err, "tx hash", rtx.Hash()) } } - for _, atx := range txrSet.GetAddedTxs() { + for _, atx := range txrSet.AddedTxs() { if err := blockExec.mempool.CheckTx(ctx, atx, nil, mempool.TxInfo{}); err != nil { blockExec.logger.Error("error adding tx to the mempool", "error", err, "tx hash", atx.Hash()) } } - itxs := txrSet.GetIncludedTxs() + itxs := txrSet.IncludedTxs() return state.MakeBlock(height, itxs, commit, evidence, proposerAddr), nil } diff --git a/types/tx.go b/types/tx.go index f61e9082f..6b67922f8 100644 --- a/types/tx.go +++ b/types/tx.go @@ -148,20 +148,20 @@ func NewTxRecordSet(trs []*abci.TxRecord) TxRecordSet { return txrSet } -// GetAddedTxs returns the transactions marked for inclusion in a block. This +// AddedTxs returns the transactions marked for inclusion in a block. This // list maintains the order that the transactions were included in the list of // TxRecords that were used to construct the TxRecordSet. -func (t TxRecordSet) GetIncludedTxs() []Tx { +func (t TxRecordSet) IncludedTxs() []Tx { return t.included } -// GetAddedTxs returns the transactions added by the application. -func (t TxRecordSet) GetAddedTxs() []Tx { +// AddedTxs returns the transactions added by the application. +func (t TxRecordSet) AddedTxs() []Tx { return t.added } -// GetRemovedTxs returns the transactions marked for removal by the application. -func (t TxRecordSet) GetRemovedTxs() []Tx { +// RemovedTxs returns the transactions marked for removal by the application. +func (t TxRecordSet) RemovedTxs() []Tx { return t.removed }