diff --git a/action/actctx.go b/action/actctx.go index 478cf1a2b7..30ab79f812 100644 --- a/action/actctx.go +++ b/action/actctx.go @@ -39,8 +39,8 @@ func (act *AbstractAction) SetNonce(val uint64) { act.nonce = val } -// GasLimit returns the gas limit -func (act *AbstractAction) GasLimit() uint64 { return act.gasLimit } +// Gas returns the gas limit +func (act *AbstractAction) Gas() uint64 { return act.gasLimit } // SetGasLimit sets gaslimit func (act *AbstractAction) SetGasLimit(val uint64) { diff --git a/action/builder_test.go b/action/builder_test.go index 8247ce4bb9..c795c3a0f7 100644 --- a/action/builder_test.go +++ b/action/builder_test.go @@ -42,7 +42,7 @@ func TestActionBuilder(t *testing.T) { r.Equal(uint32(version.ProtocolVersion), act.Version()) r.Equal(uint64(2), act.Nonce()) - r.Equal(uint64(10003), act.GasLimit()) + r.Equal(uint64(10003), act.Gas()) r.Equal(big.NewInt(10004), act.GasPrice()) } @@ -98,7 +98,7 @@ func TestBuildRewardingAction(t *testing.T) { r.NoError(err) r.IsType(&ClaimFromRewardingFund{}, elp.Action()) r.Equal(big.NewInt(10004), elp.GasPrice()) - r.Equal(uint64(10000), elp.GasLimit()) + r.Equal(uint64(10000), elp.Gas()) r.Equal(big.NewInt(101), elp.Action().(*ClaimFromRewardingFund).ClaimAmount()) }) t.Run("Debug", func(t *testing.T) { @@ -134,7 +134,7 @@ func TestBuildRewardingAction(t *testing.T) { r.NoError(err) r.IsType(&DepositToRewardingFund{}, elp.Action()) r.EqualValues(big.NewInt(10004), elp.GasPrice()) - r.EqualValues(10000, elp.GasLimit()) + r.EqualValues(10000, elp.Gas()) r.EqualValues(big.NewInt(102), elp.Action().(*DepositToRewardingFund).Amount()) }) }) diff --git a/action/candidate_transfer_ownership_test.go b/action/candidate_transfer_ownership_test.go index 4cdfaf0400..cd315c188d 100644 --- a/action/candidate_transfer_ownership_test.go +++ b/action/candidate_transfer_ownership_test.go @@ -80,7 +80,7 @@ func TestCandidateTransferOwnership(t *testing.T) { } require.Equal(test.serialize, hex.EncodeToString(cr.Serialize())) - require.Equal(test.gasLimit, elp.GasLimit()) + require.Equal(test.gasLimit, elp.Gas()) require.Equal(test.gasPrice, elp.GasPrice()) require.Equal(test.nonce, elp.Nonce()) require.Equal(test.newOwner, cr.NewOwner().String()) diff --git a/action/candidateregister_test.go b/action/candidateregister_test.go index 4acd9ee0b6..64dadc2c69 100644 --- a/action/candidateregister_test.go +++ b/action/candidateregister_test.go @@ -86,7 +86,7 @@ func TestCandidateRegister(t *testing.T) { } require.Equal(test.Serialize, hex.EncodeToString(cr.Serialize())) - require.Equal(test.GasLimit, elp.GasLimit()) + require.Equal(test.GasLimit, elp.Gas()) require.Equal(test.GasPrice, elp.GasPrice()) require.Equal(test.Nonce, elp.Nonce()) diff --git a/action/candidateupdate_test.go b/action/candidateupdate_test.go index d54c9bdaeb..cacb66c3a4 100644 --- a/action/candidateupdate_test.go +++ b/action/candidateupdate_test.go @@ -32,7 +32,7 @@ func TestCandidateUpdate(t *testing.T) { t.Run("proto", func(t *testing.T) { ser := cu.Serialize() require.Equal("0a04746573741229696f31636c36726c32657635646661393838716d677a673278346866617a6d7039766e326736366e671a29696f316a757678356730363365753474733833326e756b7034766763776b32676e6335637539617964", hex.EncodeToString(ser)) - require.Equal(_cuGasLimit, elp.GasLimit()) + require.Equal(_cuGasLimit, elp.Gas()) require.Equal(_cuGasPrice, elp.GasPrice()) require.Equal(_cuNonce, elp.Nonce()) require.Equal(_cuName, cu.Name()) diff --git a/action/envelope.go b/action/envelope.go index 08c60493e7..8baf8f0dc4 100644 --- a/action/envelope.go +++ b/action/envelope.go @@ -22,7 +22,6 @@ type ( TxData Version() uint32 ChainID() uint32 - GasLimit() uint64 Destination() (string, bool) Cost() (*big.Int, error) IntrinsicGas() (uint64, error) @@ -139,7 +138,7 @@ func (elp *envelope) Cost() (*big.Int, error) { return nil, errors.Wrap(err, "failed to get payload's intrinsic gas") } if _, ok := elp.payload.(gasLimitForCost); ok { - gas = elp.GasLimit() + gas = elp.Gas() } if acl := elp.AccessList(); len(acl) > 0 { gas += uint64(len(acl)) * TxAccessListAddressGas diff --git a/action/envelope_test.go b/action/envelope_test.go index 7dc65d288e..c3eec5b672 100644 --- a/action/envelope_test.go +++ b/action/envelope_test.go @@ -17,7 +17,7 @@ func TestEnvelope_Basic(t *testing.T) { evlp, tsf := createEnvelope() req.Equal(uint32(1), evlp.Version()) req.Equal(uint64(10), evlp.Nonce()) - req.Equal(uint64(20010), evlp.GasLimit()) + req.Equal(uint64(20010), evlp.Gas()) req.Equal("11000000000000000000", evlp.GasPrice().String()) c, err := evlp.Cost() req.NoError(err) @@ -122,7 +122,7 @@ func TestEnvelope_Actions(t *testing.T) { require.Equal(elp.Nonce(), evlp.Nonce()) require.Equal(elp.ChainID(), evlp.ChainID()) require.Equal(elp.GasPrice(), evlp.GasPrice()) - require.Equal(elp.GasLimit(), evlp.GasLimit()) + require.Equal(elp.Gas(), evlp.Gas()) } } diff --git a/action/protocol/generic_validator.go b/action/protocol/generic_validator.go index 0b9f167571..e48b0d0b59 100644 --- a/action/protocol/generic_validator.go +++ b/action/protocol/generic_validator.go @@ -41,7 +41,7 @@ func (v *GenericValidator) Validate(ctx context.Context, selp *action.SealedEnve if err != nil { return err } - if intrinsicGas > selp.GasLimit() { + if intrinsicGas > selp.Gas() { return action.ErrIntrinsicGas } diff --git a/action/protocol/staking/handler_stake_migrate.go b/action/protocol/staking/handler_stake_migrate.go index a81c9eb559..9f72adf9dd 100644 --- a/action/protocol/staking/handler_stake_migrate.go +++ b/action/protocol/staking/handler_stake_migrate.go @@ -51,7 +51,7 @@ func (p *Protocol) handleStakeMigrate(ctx context.Context, elp action.Envelope, return nil, nil, gasConsumed, gasToBeDeducted, errCandNotExist } duration := uint64(bucket.StakedDuration / p.helperCtx.BlockInterval(protocol.MustGetBlockCtx(ctx).BlockHeight)) - exec, err := p.constructExecution(candidate.GetIdentifier(), bucket.StakedAmount, duration, elp.Nonce(), elp.GasLimit(), elp.GasPrice()) + exec, err := p.constructExecution(candidate.GetIdentifier(), bucket.StakedAmount, duration, elp.Nonce(), elp.Gas(), elp.GasPrice()) if err != nil { return nil, nil, gasConsumed, gasToBeDeducted, errors.Wrap(err, "failed to construct execution") } diff --git a/action/rlp_tx.go b/action/rlp_tx.go index de1b33939b..2d4c876c4b 100644 --- a/action/rlp_tx.go +++ b/action/rlp_tx.go @@ -146,7 +146,7 @@ func toLegacyTx(ab *AbstractAction, act Action) (*types.Transaction, error) { return types.NewTx(&types.LegacyTx{ Nonce: ab.Nonce(), GasPrice: ab.GasPrice(), - Gas: ab.GasLimit(), + Gas: ab.Gas(), To: to, Value: tx.Value(), Data: data, diff --git a/action/rlp_tx_test.go b/action/rlp_tx_test.go index 56d82edc72..81cafd118e 100644 --- a/action/rlp_tx_test.go +++ b/action/rlp_tx_test.go @@ -36,7 +36,7 @@ func TestGenerateRlp(t *testing.T) { gasPrice: new(big.Int), } builder := (&EnvelopeBuilder{}).SetNonce(ab.Nonce()). - SetGasLimit(ab.GasLimit()).SetGasPrice(ab.GasPrice()) + SetGasLimit(ab.Gas()).SetGasPrice(ab.GasPrice()) for _, v := range []struct { act actionPayload sig []byte diff --git a/action/sealedenvelope_test.go b/action/sealedenvelope_test.go index 77928d99fe..ea24d24903 100644 --- a/action/sealedenvelope_test.go +++ b/action/sealedenvelope_test.go @@ -112,7 +112,7 @@ func TestSealedEnvelope_Actions(t *testing.T) { require.Equal(elp.Nonce(), rlp.Nonce()) require.Equal(elp.GasPrice(), rlp.GasPrice()) - require.Equal(elp.GasLimit(), rlp.Gas()) + require.Equal(elp.Gas(), rlp.Gas()) } } diff --git a/action/signedaction_test.go b/action/signedaction_test.go index 80a2f1a3fb..431f450f8d 100644 --- a/action/signedaction_test.go +++ b/action/signedaction_test.go @@ -46,7 +46,7 @@ func TestSignedTransfer(t *testing.T) { require.EqualValues(1, selp.Nonce()) require.Equal(big.NewInt(2), tsf.Amount()) require.Equal([]byte{}, tsf.Payload()) - require.EqualValues(100000, selp.GasLimit()) + require.EqualValues(100000, selp.Gas()) require.Equal(big.NewInt(10), selp.GasPrice()) require.NotNil(selp.Signature()) } @@ -60,7 +60,7 @@ func TestSignedExecution(t *testing.T) { require.Equal(EmptyAddress, exec.Contract()) require.Equal(uint64(1), selp.Nonce()) require.Equal(big.NewInt(0), exec.Amount()) - require.Equal(uint64(100000), selp.GasLimit()) + require.Equal(uint64(100000), selp.Gas()) require.Equal(big.NewInt(10), selp.GasPrice()) require.Equal([]byte{}, exec.Data()) require.NotNil(selp.Signature()) @@ -73,7 +73,7 @@ func TestSignedCandidateRegister(t *testing.T) { cand := selp.Action().(*CandidateRegister) require.Equal(uint64(1), selp.Nonce()) - require.Equal(_gasLimit, selp.GasLimit()) + require.Equal(_gasLimit, selp.Gas()) require.Equal(_gasPrice, selp.GasPrice()) require.Equal(_candidate1Name, cand.name) require.Equal(identityset.Address(12), cand.operatorAddress) @@ -92,7 +92,7 @@ func TestSignedCandidateUpdate(t *testing.T) { canu := selp.Action().(*CandidateUpdate) require.Equal(uint64(1), selp.Nonce()) - require.Equal(_gasLimit, selp.GasLimit()) + require.Equal(_gasLimit, selp.Gas()) require.Equal(_gasPrice, selp.GasPrice()) require.Equal(_candidate1Name, canu.name) require.NotNil(selp.Signature()) @@ -107,7 +107,7 @@ func TestSignedCreateStake(t *testing.T) { require.Equal(_candidate1Name, exec.candName) require.Equal(uint64(1), selp.Nonce()) require.Equal(big.NewInt(10), exec.Amount()) - require.Equal(_gasLimit, selp.GasLimit()) + require.Equal(_gasLimit, selp.Gas()) require.Equal(_gasPrice, selp.GasPrice()) require.Equal([]byte{}, exec.payload) require.Equal(true, exec.autoStake) @@ -122,7 +122,7 @@ func TestNewUnstakeSignedReclaimStake(t *testing.T) { exec := selp.Action().(*Unstake) require.Equal(uint64(1), selp.Nonce()) require.Equal(uint64(2), exec.bucketIndex) - require.Equal(_gasLimit, selp.GasLimit()) + require.Equal(_gasLimit, selp.Gas()) require.Equal(_gasPrice, selp.GasPrice()) require.Equal([]byte{}, exec.payload) require.NotNil(selp.Signature()) @@ -136,7 +136,7 @@ func TestNewWithdrawStakeSignedReclaimStake(t *testing.T) { exec := selp.Action().(*WithdrawStake) require.Equal(uint64(1), selp.Nonce()) require.Equal(uint64(2), exec.bucketIndex) - require.Equal(_gasLimit, selp.GasLimit()) + require.Equal(_gasLimit, selp.Gas()) require.Equal(_gasPrice, selp.GasPrice()) require.Equal([]byte{}, exec.payload) require.NotNil(selp.Signature()) @@ -151,7 +151,7 @@ func TestSignedChangeCandidate(t *testing.T) { require.Equal(_candidate1Name, exec.candidateName) require.Equal(uint64(1), selp.Nonce()) require.Equal(uint64(2), exec.bucketIndex) - require.Equal(_gasLimit, selp.GasLimit()) + require.Equal(_gasLimit, selp.Gas()) require.Equal(_gasPrice, selp.GasPrice()) require.Equal([]byte{}, exec.payload) require.NotNil(selp.Signature()) @@ -166,7 +166,7 @@ func TestSignedTransferStake(t *testing.T) { require.Equal(identityset.Address(12), exec.voterAddress) require.Equal(uint64(1), selp.Nonce()) require.Equal(uint64(2), exec.bucketIndex) - require.Equal(_gasLimit, selp.GasLimit()) + require.Equal(_gasLimit, selp.Gas()) require.Equal(_gasPrice, selp.GasPrice()) require.Equal([]byte{}, exec.payload) require.NotNil(selp.Signature()) @@ -181,7 +181,7 @@ func TestSignedDepositToStake(t *testing.T) { require.Equal(uint64(2), exec.bucketIndex) require.Equal(uint64(1), selp.Nonce()) require.Equal(big.NewInt(10), exec.Amount()) - require.Equal(_gasLimit, selp.GasLimit()) + require.Equal(_gasLimit, selp.Gas()) require.Equal(_gasPrice, selp.GasPrice()) require.Equal([]byte{}, exec.payload) require.NotNil(selp.Signature()) @@ -197,7 +197,7 @@ func TestSignedRestake(t *testing.T) { require.Equal(uint32(91), exec.duration) require.Equal(true, exec.autoStake) require.Equal(uint64(2), exec.bucketIndex) - require.Equal(_gasLimit, selp.GasLimit()) + require.Equal(_gasLimit, selp.Gas()) require.Equal(_gasPrice, selp.GasPrice()) require.Equal([]byte{}, exec.payload) require.NotNil(selp.Signature()) @@ -211,7 +211,7 @@ func TestSignedCandidateTransferOwnership(t *testing.T) { exec := selp.Action().(*CandidateTransferOwnership) require.Equal(uint64(1), selp.Nonce()) require.Equal(_cand1Addr, exec.newOwner.String()) - require.Equal(_gasLimit, selp.GasLimit()) + require.Equal(_gasLimit, selp.Gas()) require.Equal(_gasPrice, selp.GasPrice()) require.Equal([]byte{}, exec.payload) require.NotNil(selp.Signature()) @@ -225,7 +225,7 @@ func TestSignedMigrateStake(t *testing.T) { exec := selp.Action().(*MigrateStake) require.EqualValues(1, selp.Nonce()) require.EqualValues(9, exec.bucketIndex) - require.Equal(_gasLimit, selp.GasLimit()) + require.Equal(_gasLimit, selp.Gas()) require.Equal(_gasPrice, selp.GasPrice()) require.NotNil(selp.Signature()) } diff --git a/action/stake_changecandidate_test.go b/action/stake_changecandidate_test.go index 36b655156a..1a1132b856 100644 --- a/action/stake_changecandidate_test.go +++ b/action/stake_changecandidate_test.go @@ -23,7 +23,7 @@ func TestChangeCandidate(t *testing.T) { t.Run("proto", func(t *testing.T) { ser := stake.Serialize() require.Equal("080a120a63616e646964617465311a077061796c6f6164", hex.EncodeToString(ser)) - require.Equal(_gaslimit, elp.GasLimit()) + require.Equal(_gaslimit, elp.Gas()) require.Equal(_gasprice, elp.GasPrice()) require.Equal(_nonce, elp.Nonce()) diff --git a/action/stake_transferownership_test.go b/action/stake_transferownership_test.go index e430e55684..418f4d9611 100644 --- a/action/stake_transferownership_test.go +++ b/action/stake_transferownership_test.go @@ -17,7 +17,7 @@ func TestStakingTransfer(t *testing.T) { t.Run("proto", func(t *testing.T) { ser := stake.Serialize() require.Equal("080a1229696f3178707136326177383575717a72636367397935686e727976386c64326e6b7079636333677a611a077061796c6f6164", hex.EncodeToString(ser)) - require.Equal(_gaslimit, elp.GasLimit()) + require.Equal(_gaslimit, elp.Gas()) require.Equal(_gasprice, elp.GasPrice()) require.Equal(_nonce, elp.Nonce()) diff --git a/action/stakeadddeposit_test.go b/action/stakeadddeposit_test.go index 3cf2247d9a..45d16347b9 100644 --- a/action/stakeadddeposit_test.go +++ b/action/stakeadddeposit_test.go @@ -75,7 +75,7 @@ func TestDeposit(t *testing.T) { require.Equal(test.Serialize, hex.EncodeToString(ser)) require.NoError(err) - require.Equal(test.GasLimit, elp.GasLimit()) + require.Equal(test.GasLimit, elp.Gas()) require.Equal(test.GasPrice, elp.GasPrice()) require.Equal(test.Nonce, elp.Nonce()) diff --git a/action/stakecreate_test.go b/action/stakecreate_test.go index 61aac70369..be1ca7b899 100644 --- a/action/stakecreate_test.go +++ b/action/stakecreate_test.go @@ -76,7 +76,7 @@ func TestCreateStake(t *testing.T) { ser := stake.Serialize() require.Equal(test.Serialize, hex.EncodeToString(ser)) - require.Equal(test.GasLimit, elp.GasLimit()) + require.Equal(test.GasLimit, elp.Gas()) require.Equal(test.GasPrice, elp.GasPrice()) require.Equal(test.Nonce, elp.Nonce()) diff --git a/action/stakereclaim_test.go b/action/stakereclaim_test.go index 6346b60d7a..3fc63b9ee3 100644 --- a/action/stakereclaim_test.go +++ b/action/stakereclaim_test.go @@ -35,7 +35,7 @@ func TestUnstake(t *testing.T) { t.Run("proto", func(t *testing.T) { ser := stake.Serialize() require.Equal("080a12077061796c6f6164", hex.EncodeToString(ser)) - require.Equal(_gaslimit, elp.GasLimit()) + require.Equal(_gaslimit, elp.Gas()) require.Equal(_gasprice, elp.GasPrice()) require.Equal(_nonce, elp.Nonce()) require.Equal(_payload, stake.Payload()) @@ -84,7 +84,7 @@ func TestWithdraw(t *testing.T) { t.Run("proto", func(t *testing.T) { ser := stake.Serialize() require.Equal("080a12077061796c6f6164", hex.EncodeToString(ser)) - require.Equal(_gaslimit, elp.GasLimit()) + require.Equal(_gaslimit, elp.Gas()) require.Equal(_gasprice, elp.GasPrice()) require.Equal(_nonce, elp.Nonce()) require.Equal(_payload, stake.Payload()) diff --git a/action/stakerestake_test.go b/action/stakerestake_test.go index 830281d482..48e54ff72a 100644 --- a/action/stakerestake_test.go +++ b/action/stakerestake_test.go @@ -26,7 +26,7 @@ func TestRestake(t *testing.T) { t.Run("proto", func(t *testing.T) { ser := stake.Serialize() require.Equal("080a10e807180122077061796c6f6164", hex.EncodeToString(ser)) - require.Equal(_gaslimit, elp.GasLimit()) + require.Equal(_gaslimit, elp.Gas()) require.Equal(_gasprice, elp.GasPrice()) require.Equal(_nonce, elp.Nonce()) diff --git a/action/transfer_test.go b/action/transfer_test.go index bb8b481370..bbb0e58794 100644 --- a/action/transfer_test.go +++ b/action/transfer_test.go @@ -62,7 +62,7 @@ func TestTransfer(t *testing.T) { require.Error(w.VerifySignature()) require.Equal("10", tsf.Amount().Text(10)) require.Equal([]byte{}, tsf.Payload()) - require.Equal(uint64(100000), elp.GasLimit()) + require.Equal(uint64(100000), elp.Gas()) require.Equal("10", elp.GasPrice().Text(10)) require.Zero(elp.Nonce()) require.Equal(senderKey.PublicKey().HexString(), w.SrcPubkey().HexString()) diff --git a/actpool/actioniterator/actioniterator_test.go b/actpool/actioniterator/actioniterator_test.go index 759aaae95c..a1e5698bc2 100644 --- a/actpool/actioniterator/actioniterator_test.go +++ b/actpool/actioniterator/actioniterator_test.go @@ -123,7 +123,7 @@ func BenchmarkLooping(b *testing.B) { if !ok { break } - if act.GasLimit() < 30 { + if act.Gas() < 30 { ai.PopAccount() } } diff --git a/api/coreservice.go b/api/coreservice.go index 63058bbd61..a67f1cdaa3 100644 --- a/api/coreservice.go +++ b/api/coreservice.go @@ -547,7 +547,7 @@ func (core *coreService) ReadContract(ctx context.Context, callerAddr address.Ad g = core.bc.Genesis() blockGasLimit = g.BlockGasLimitByHeight(core.bc.TipHeight()) ) - if elp.GasLimit() == 0 || blockGasLimit < elp.GasLimit() { + if elp.Gas() == 0 || blockGasLimit < elp.Gas() { elp.SetGas(blockGasLimit) } retval, receipt, err := core.simulateExecution(ctx, callerAddr, elp) diff --git a/api/grpcserver.go b/api/grpcserver.go index 0b821f8675..e6e2b5ab21 100644 --- a/api/grpcserver.go +++ b/api/grpcserver.go @@ -760,7 +760,7 @@ func generateBlockMeta(blkStore *apitypes.BlockWithReceipts) *iotextypes.BlockMe func gasLimitAndUsed(acts []*action.SealedEnvelope, receipts []*action.Receipt) (uint64, uint64) { var gasLimit, gasUsed uint64 for _, tx := range acts { - gasLimit += tx.GasLimit() + gasLimit += tx.Gas() } for _, r := range receipts { gasUsed += r.GasConsumed diff --git a/api/grpcserver_integrity_test.go b/api/grpcserver_integrity_test.go index 64f9dcb532..58e4ac67e9 100644 --- a/api/grpcserver_integrity_test.go +++ b/api/grpcserver_integrity_test.go @@ -1477,7 +1477,7 @@ func TestGrpcServer_ReadContractIntegrity(t *testing.T) { request := &iotexapi.ReadContractRequest{ Execution: exec.Proto().GetCore().GetExecution(), CallerAddress: test.callerAddr, - GasLimit: exec.GasLimit(), + GasLimit: exec.Gas(), GasPrice: big.NewInt(unit.Qev).String(), } diff --git a/api/web3server_marshal.go b/api/web3server_marshal.go index edc947727e..815a5aa732 100644 --- a/api/web3server_marshal.go +++ b/api/web3server_marshal.go @@ -165,7 +165,7 @@ func (obj *getBlockResult) MarshalJSON() ([]byte, error) { return nil, err } for _, tx := range obj.blk.Actions { - gasLimit += tx.GasLimit() + gasLimit += tx.Gas() } for _, r := range obj.blk.Receipts { gasUsed += r.GasConsumed diff --git a/blockchain/block/runnable_test.go b/blockchain/block/runnable_test.go index 5767331a29..1ddc18e14f 100644 --- a/blockchain/block/runnable_test.go +++ b/blockchain/block/runnable_test.go @@ -29,5 +29,5 @@ func TestRunnableActionsBuilder(t *testing.T) { require.Equal(1, len(racs.Actions())) act := racs.Actions()[0] require.Equal(big.NewInt(10), act.GasPrice()) - require.Equal(uint64(100000), act.GasLimit()) + require.Equal(uint64(100000), act.Gas()) } diff --git a/state/factory/workingset.go b/state/factory/workingset.go index dc6c0fb44c..a1ba60bf41 100644 --- a/state/factory/workingset.go +++ b/state/factory/workingset.go @@ -572,7 +572,7 @@ func (ws *workingSet) pickAndRunActions( if !ok { break } - if nextAction.GasLimit() > blkCtx.GasLimit { + if nextAction.Gas() > blkCtx.GasLimit { actionIterator.PopAccount() continue } diff --git a/test/mock/mock_envelope/mock_envelope.go b/test/mock/mock_envelope/mock_envelope.go index a2aeb9b39e..56fb1666c4 100644 --- a/test/mock/mock_envelope/mock_envelope.go +++ b/test/mock/mock_envelope/mock_envelope.go @@ -208,20 +208,6 @@ func (mr *MockEnvelopeMockRecorder) GasFeeCap() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GasFeeCap", reflect.TypeOf((*MockEnvelope)(nil).GasFeeCap)) } -// GasLimit mocks base method. -func (m *MockEnvelope) GasLimit() uint64 { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GasLimit") - ret0, _ := ret[0].(uint64) - return ret0 -} - -// GasLimit indicates an expected call of GasLimit. -func (mr *MockEnvelopeMockRecorder) GasLimit() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GasLimit", reflect.TypeOf((*MockEnvelope)(nil).GasLimit)) -} - // GasPrice mocks base method. func (m *MockEnvelope) GasPrice() *big.Int { m.ctrl.T.Helper()