diff options
author | obscuren <geffobscura@gmail.com> | 2015-01-10 04:18:34 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-01-10 04:18:34 +0800 |
commit | 8c7b764d47ce55ba6abe437ae8232cc537c4e0d9 (patch) | |
tree | 457d45ca33e58388b431500d1e2208bd5be47c73 /vm | |
parent | 905b8cc82f3dc29131f45ccf29bd1d6c967fe132 (diff) | |
download | dexon-8c7b764d47ce55ba6abe437ae8232cc537c4e0d9.tar.gz dexon-8c7b764d47ce55ba6abe437ae8232cc537c4e0d9.tar.zst dexon-8c7b764d47ce55ba6abe437ae8232cc537c4e0d9.zip |
updated tests
Diffstat (limited to 'vm')
-rw-r--r-- | vm/stack.go | 17 | ||||
-rw-r--r-- | vm/vm_debug.go | 2 |
2 files changed, 2 insertions, 17 deletions
diff --git a/vm/stack.go b/vm/stack.go index e31f3eb57..a9aafdb9d 100644 --- a/vm/stack.go +++ b/vm/stack.go @@ -2,7 +2,6 @@ package vm import ( "fmt" - "math" "math/big" ) @@ -141,21 +140,7 @@ func (m *Memory) Resize(size uint64) { } } -func (m *Memory) Get(offset, size int64) []byte { - if size == 0 { - return nil - } - - if len(m.store) > int(offset) { - end := int(math.Min(float64(len(m.store)), float64(offset+size))) - - return m.store[offset:end] - } - - return nil -} - -func (self *Memory) Geti(offset, size int64) (cpy []byte) { +func (self *Memory) Get(offset, size int64) (cpy []byte) { if size == 0 { return nil } diff --git a/vm/vm_debug.go b/vm/vm_debug.go index 92e4154e4..04ba8190d 100644 --- a/vm/vm_debug.go +++ b/vm/vm_debug.go @@ -583,7 +583,7 @@ func (self *DebugVm) Run(me, caller ContextRef, code []byte, value, gas, price * topics[i] = ethutil.LeftPadBytes(stack.Pop().Bytes(), 32) } - data := mem.Geti(mStart.Int64(), mSize.Int64()) + data := mem.Get(mStart.Int64(), mSize.Int64()) log := &Log{context.Address(), topics, data} self.env.AddLog(log) |