aboutsummaryrefslogtreecommitdiffstats
path: root/internal
diff options
context:
space:
mode:
authorEgon Elbre <egonelbre@gmail.com>2017-08-07 23:14:40 +0800
committerFelix Lange <fjl@users.noreply.github.com>2017-08-07 23:14:40 +0800
commitf42bd73ce5e9c4d87b0bbcfbd900641305ebe894 (patch)
tree05ecc8d89fc79af9e7193d3754dee1e3c8166fcf /internal
parentf5925b045945824c4a128b01551ecece37bc1a95 (diff)
downloaddexon-f42bd73ce5e9c4d87b0bbcfbd900641305ebe894.tar
dexon-f42bd73ce5e9c4d87b0bbcfbd900641305ebe894.tar.gz
dexon-f42bd73ce5e9c4d87b0bbcfbd900641305ebe894.tar.bz2
dexon-f42bd73ce5e9c4d87b0bbcfbd900641305ebe894.tar.lz
dexon-f42bd73ce5e9c4d87b0bbcfbd900641305ebe894.tar.xz
dexon-f42bd73ce5e9c4d87b0bbcfbd900641305ebe894.tar.zst
dexon-f42bd73ce5e9c4d87b0bbcfbd900641305ebe894.zip
internal: fix megacheck warnings (#14919)
Diffstat (limited to 'internal')
-rw-r--r--internal/ethapi/api.go29
-rw-r--r--internal/jsre/pretty.go8
2 files changed, 3 insertions, 34 deletions
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index 1b23ac559..7874b7101 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -46,7 +46,6 @@ import (
const (
defaultGas = 90000
defaultGasPrice = 50 * params.Shannon
- emptyHex = "0x"
)
// PublicEthereumAPI provides an API to access Ethereum related information.
@@ -548,26 +547,6 @@ func (s *PublicBlockChainAPI) GetStorageAt(ctx context.Context, address common.A
return res[:], state.Error()
}
-// callmsg is the message type used for call transitions.
-type callmsg struct {
- addr common.Address
- to *common.Address
- gas, gasPrice *big.Int
- value *big.Int
- data []byte
-}
-
-// accessor boilerplate to implement core.Message
-func (m callmsg) From() (common.Address, error) { return m.addr, nil }
-func (m callmsg) FromFrontier() (common.Address, error) { return m.addr, nil }
-func (m callmsg) Nonce() uint64 { return 0 }
-func (m callmsg) CheckNonce() bool { return false }
-func (m callmsg) To() *common.Address { return m.to }
-func (m callmsg) GasPrice() *big.Int { return m.gasPrice }
-func (m callmsg) Gas() *big.Int { return m.gas }
-func (m callmsg) Value() *big.Int { return m.value }
-func (m callmsg) Data() []byte { return m.data }
-
// CallArgs represents the arguments for a call.
type CallArgs struct {
From common.Address `json:"from"`
@@ -626,10 +605,8 @@ func (s *PublicBlockChainAPI) doCall(ctx context.Context, args CallArgs, blockNr
// Wait for the context to be done and cancel the evm. Even if the
// EVM has finished, cancelling may be done (repeatedly)
go func() {
- select {
- case <-ctx.Done():
- evm.Cancel()
- }
+ <-ctx.Done()
+ evm.Cancel()
}()
// Setup the gas pool (also for unmetered requests)
@@ -1306,7 +1283,7 @@ func (api *PublicDebugAPI) PrintBlock(ctx context.Context, number uint64) (strin
if block == nil {
return "", fmt.Errorf("block #%d not found", number)
}
- return fmt.Sprintf("%s", block), nil
+ return block.String(), nil
}
// SeedHash retrieves the seed hash of a block.
diff --git a/internal/jsre/pretty.go b/internal/jsre/pretty.go
index e096eec23..16fa91b67 100644
--- a/internal/jsre/pretty.go
+++ b/internal/jsre/pretty.go
@@ -65,14 +65,6 @@ func prettyError(vm *otto.Otto, err error, w io.Writer) {
fmt.Fprint(w, ErrorColor("%s", failure))
}
-// jsErrorString adds a backtrace to errors generated by otto.
-func jsErrorString(err error) string {
- if ottoErr, ok := err.(*otto.Error); ok {
- return ottoErr.String()
- }
- return err.Error()
-}
-
func (re *JSRE) prettyPrintJS(call otto.FunctionCall) otto.Value {
for _, v := range call.ArgumentList {
prettyPrint(call.Otto, v, re.output)