fix(simapp): do not overwrite tx options (backport #17920) (#17926)

Co-authored-by: Julien Robert <julien@rbrt.fr>

baseapp/testutil/mock/mocks.go

@@ -140,3 +140,96 @@ func (mr *MockProposalTxVerifierMockRecorder) ProcessProposalVerifyTx(txBz inter
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProcessProposalVerifyTx", reflect.TypeOf((*MockProposalTxVerifier)(nil).ProcessProposalVerifyTx), txBz)
 }
+
+// TxDecode mocks base method.
+func (m *MockProposalTxVerifier) TxDecode(txBz []byte) (types.Tx, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "TxDecode", txBz)
+	ret0, _ := ret[0].(types.Tx)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// TxDecode indicates an expected call of TxDecode.
+func (mr *MockProposalTxVerifierMockRecorder) TxDecode(txBz interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TxDecode", reflect.TypeOf((*MockProposalTxVerifier)(nil).TxDecode), txBz)
+}
+
+// TxEncode mocks base method.
+func (m *MockProposalTxVerifier) TxEncode(tx types.Tx) ([]byte, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "TxEncode", tx)
+	ret0, _ := ret[0].([]byte)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// TxEncode indicates an expected call of TxEncode.
+func (mr *MockProposalTxVerifierMockRecorder) TxEncode(tx interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TxEncode", reflect.TypeOf((*MockProposalTxVerifier)(nil).TxEncode), tx)
+}
+
+// MockTxSelector is a mock of TxSelector interface.
+type MockTxSelector struct {
+	ctrl     *gomock.Controller
+	recorder *MockTxSelectorMockRecorder
+}
+
+// MockTxSelectorMockRecorder is the mock recorder for MockTxSelector.
+type MockTxSelectorMockRecorder struct {
+	mock *MockTxSelector
+}
+
+// NewMockTxSelector creates a new mock instance.
+func NewMockTxSelector(ctrl *gomock.Controller) *MockTxSelector {
+	mock := &MockTxSelector{ctrl: ctrl}
+	mock.recorder = &MockTxSelectorMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *MockTxSelector) EXPECT() *MockTxSelectorMockRecorder {
+	return m.recorder
+}
+
+// Clear mocks base method.
+func (m *MockTxSelector) Clear() {
+	m.ctrl.T.Helper()
+	m.ctrl.Call(m, "Clear")
+}
+
+// Clear indicates an expected call of Clear.
+func (mr *MockTxSelectorMockRecorder) Clear() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Clear", reflect.TypeOf((*MockTxSelector)(nil).Clear))
+}
+
+// SelectTxForProposal mocks base method.
+func (m *MockTxSelector) SelectTxForProposal(maxTxBytes, maxBlockGas uint64, memTx types.Tx, txBz []byte) bool {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SelectTxForProposal", maxTxBytes, maxBlockGas, memTx, txBz)
+	ret0, _ := ret[0].(bool)
+	return ret0
+}
+
+// SelectTxForProposal indicates an expected call of SelectTxForProposal.
+func (mr *MockTxSelectorMockRecorder) SelectTxForProposal(maxTxBytes, maxBlockGas, memTx, txBz interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SelectTxForProposal", reflect.TypeOf((*MockTxSelector)(nil).SelectTxForProposal), maxTxBytes, maxBlockGas, memTx, txBz)
+}
+
+// SelectedTxs mocks base method.
+func (m *MockTxSelector) SelectedTxs() [][]byte {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SelectedTxs")
+	ret0, _ := ret[0].([][]byte)
+	return ret0
+}
+
+// SelectedTxs indicates an expected call of SelectedTxs.
+func (mr *MockTxSelectorMockRecorder) SelectedTxs() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SelectedTxs", reflect.TypeOf((*MockTxSelector)(nil).SelectedTxs))
+}