From 24c590cbec990915af060d6b4e97c9da6433cc0f Mon Sep 17 00:00:00 2001 From: s7v7nislands Date: Wed, 11 May 2022 13:03:35 +0800 Subject: [PATCH] core/vm: clean up some dead functions (#24851) --- core/vm/contracts.go | 2 +- core/vm/instructions.go | 2 +- core/vm/memory.go | 19 +------------------ core/vm/stack.go | 14 -------------- 4 files changed, 3 insertions(+), 34 deletions(-) diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 9210f5486c..79f1a36116 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -591,7 +591,7 @@ func (c *blake2F) Run(input []byte) ([]byte, error) { // Parse the input into the Blake2b call parameters var ( rounds = binary.BigEndian.Uint32(input[0:4]) - final = (input[212] == blake2FFinalBlockBytes) + final = input[212] == blake2FFinalBlockBytes h [8]uint64 m [16]uint64 diff --git a/core/vm/instructions.go b/core/vm/instructions.go index db507c4811..92be3bf259 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -478,7 +478,7 @@ func opDifficulty(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) } func opRandom(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) { - v := new(uint256.Int).SetBytes((interpreter.evm.Context.Random.Bytes())) + v := new(uint256.Int).SetBytes(interpreter.evm.Context.Random.Bytes()) scope.Stack.push(v) return nil, nil } diff --git a/core/vm/memory.go b/core/vm/memory.go index ba5f8485dc..7db2308187 100644 --- a/core/vm/memory.go +++ b/core/vm/memory.go @@ -17,8 +17,6 @@ package vm import ( - "fmt" - "github.com/holiman/uint256" ) @@ -68,7 +66,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 @@ -106,18 +104,3 @@ func (m *Memory) Len() int { func (m *Memory) Data() []byte { return m.store } - -// Print dumps the content of the memory. -func (m *Memory) Print() { - fmt.Printf("### mem %d bytes ###\n", len(m.store)) - if len(m.store) > 0 { - addr := 0 - for i := 0; i+32 <= len(m.store); i += 32 { - fmt.Printf("%03d: % x\n", addr, m.store[i:i+32]) - addr++ - } - } else { - fmt.Println("-- empty --") - } - fmt.Println("####################") -} diff --git a/core/vm/stack.go b/core/vm/stack.go index 9e7e887ccd..e1a957e244 100644 --- a/core/vm/stack.go +++ b/core/vm/stack.go @@ -17,7 +17,6 @@ package vm import ( - "fmt" "sync" "github.com/holiman/uint256" @@ -81,16 +80,3 @@ func (st *Stack) peek() *uint256.Int { func (st *Stack) Back(n int) *uint256.Int { return &st.data[st.len()-n-1] } - -// Print dumps the content of the stack -func (st *Stack) Print() { - fmt.Println("### stack ###") - if len(st.data) > 0 { - for i, val := range st.data { - fmt.Printf("%-3d %s\n", i, val.String()) - } - } else { - fmt.Println("-- empty --") - } - fmt.Println("#############") -}