From 40c57960844bd05f62a5bea059decef179feaa42 Mon Sep 17 00:00:00 2001
From: Mike Kinney <mike.kinney@gmail.com>
Date: Mon, 9 Dec 2019 21:06:42 -0800
Subject: [PATCH] core/vm: golint fixes

---
 core/vm/eips.go         | 4 ++--
 core/vm/instructions.go | 2 +-
 core/vm/logger_json.go  | 2 ++
 core/vm/memory.go       | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/vm/eips.go b/core/vm/eips.go
index 075f5b7606..6478ccbc6d 100644
--- a/core/vm/eips.go
+++ b/core/vm/eips.go
@@ -81,8 +81,8 @@ func enable1344(jt *JumpTable) {
 
 // opChainID implements CHAINID opcode
 func opChainID(pc *uint64, interpreter *EVMInterpreter, contract *Contract, memory *Memory, stack *Stack) ([]byte, error) {
-	chainId := interpreter.intPool.get().Set(interpreter.evm.chainConfig.ChainID)
-	stack.push(chainId)
+	chainID := interpreter.intPool.get().Set(interpreter.evm.chainConfig.ChainID)
+	stack.push(chainID)
 	return nil, nil
 }
 
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
index d65664b67d..5e5364b057 100644
--- a/core/vm/instructions.go
+++ b/core/vm/instructions.go
@@ -914,7 +914,7 @@ func opPush1(pc *uint64, interpreter *EVMInterpreter, contract *Contract, memory
 		codeLen = uint64(len(contract.Code))
 		integer = interpreter.intPool.get()
 	)
-	*pc += 1
+	*pc++
 	if *pc < codeLen {
 		stack.push(integer.SetUint64(uint64(contract.Code[*pc])))
 	} else {
diff --git a/core/vm/logger_json.go b/core/vm/logger_json.go
index 04a83d0660..c0afab2d1b 100644
--- a/core/vm/logger_json.go
+++ b/core/vm/logger_json.go
@@ -26,6 +26,7 @@ import (
 	"github.com/ethereum/go-ethereum/common/math"
 )
 
+// JSONLogger is a struct with a json encoder and logging configuration
 type JSONLogger struct {
 	encoder *json.Encoder
 	cfg     *LogConfig
@@ -41,6 +42,7 @@ func NewJSONLogger(cfg *LogConfig, writer io.Writer) *JSONLogger {
 	return l
 }
 
+// CaptureStart is triggered at start of execution.
 func (l *JSONLogger) CaptureStart(from common.Address, to common.Address, create bool, input []byte, gas uint64, value *big.Int) error {
 	return nil
 }
diff --git a/core/vm/memory.go b/core/vm/memory.go
index 496a4024ba..c06b0054b8 100644
--- a/core/vm/memory.go
+++ b/core/vm/memory.go
@@ -69,7 +69,7 @@ func (m *Memory) Resize(size uint64) {
 	}
 }
 
-// Get returns offset + size as a new slice
+// GetCopy returns offset + size as a new slice
 func (m *Memory) GetCopy(offset, size int64) (cpy []byte) {
 	if size == 0 {
 		return nil