Skip to content

Commit

Permalink
Merge pull request ethereum#34 from OffchainLabs/lint-fixes
Browse files Browse the repository at this point in the history
lint fixes
  • Loading branch information
PlasmaPower authored Feb 14, 2022
2 parents bf2301d + ed98a00 commit 8eac46e
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
1 change: 1 addition & 0 deletions accounts/abi/bind/backends/simulated.go
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,7 @@ type callMsg struct {
}

func (m callMsg) UnderlyingTransaction() *types.Transaction { return nil }

func (m callMsg) From() common.Address { return m.CallMsg.From }
func (m callMsg) Nonce() uint64 { return 0 }
func (m callMsg) IsFake() bool { return true }
Expand Down
1 change: 1 addition & 0 deletions core/evm.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ func NewEVMTxContext(msg Message) vm.TxContext {
return vm.TxContext{
Origin: msg.From(),
GasPrice: new(big.Int).Set(msg.GasPrice()),

OriginWasRemapped: originWasRemapped,
}
}
Expand Down
3 changes: 0 additions & 3 deletions core/vm/evm_arbitrum.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,9 @@ func (p DefaultTxProcessor) GasChargingHook(gasRemaining *uint64) error {
}

func (p DefaultTxProcessor) PushCaller(addr common.Address) {
return
}

func (p DefaultTxProcessor) PopCaller() {
return
}

func (p DefaultTxProcessor) ForceRefundGas() uint64 {
Expand All @@ -66,7 +64,6 @@ func (p DefaultTxProcessor) NonrefundableGas() uint64 {
}

func (p DefaultTxProcessor) EndTxHook(totalGasUsed uint64, evmSuccess bool) {
return
}

func (p DefaultTxProcessor) ScheduledTxes() types.Transactions {
Expand Down
2 changes: 1 addition & 1 deletion params/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ type ChainConfig struct {
Ethash *EthashConfig `json:"ethash,omitempty"`
Clique *CliqueConfig `json:"clique,omitempty"`

ArbitrumChainParams ArbitrumChainParams `json:"abitrum,omitempty`
ArbitrumChainParams ArbitrumChainParams `json:"arbitrum,omitempty"`
}

// EthashConfig is the consensus engine configs for proof-of-work based sealing.
Expand Down

0 comments on commit 8eac46e

Please sign in to comment.