From f6cb8343624879b3345553f259efcb132519e73d Mon Sep 17 00:00:00 2001
From: Gustav Simonsson <gustav.simonsson@gmail.com>
Date: Thu, 10 Sep 2015 16:12:07 +0200
Subject: [PATCH] Dev commit. Squash in rebase.

---
 core/state/state_object.go | 27 ---------------------------
 core/state/statedb.go      |  9 ---------
 core/vm/errors.go          | 17 -----------------
 3 files changed, 53 deletions(-)

diff --git a/core/state/state_object.go b/core/state/state_object.go
index 0a894facae..69c64ae404 100644
--- a/core/state/state_object.go
+++ b/core/state/state_object.go
@@ -264,20 +264,11 @@ func (self *StateObject) Balance() *big.Int {
 	return self.balance
 }
 
-func (c *StateObject) N() *big.Int {
-	return big.NewInt(int64(c.nonce))
-}
-
 // Returns the address of the contract/account
 func (c *StateObject) Address() common.Address {
 	return c.address
 }
 
-// Returns the initialization Code
-func (c *StateObject) Init() Code {
-	return c.initCode
-}
-
 func (self *StateObject) Trie() *trie.SecureTrie {
 	return self.trie
 }
@@ -295,11 +286,6 @@ func (self *StateObject) SetCode(code []byte) {
 	self.dirty = true
 }
 
-func (self *StateObject) SetInitCode(code []byte) {
-	self.initCode = code
-	self.dirty = true
-}
-
 func (self *StateObject) SetNonce(nonce uint64) {
 	self.nonce = nonce
 	self.dirty = true
@@ -338,19 +324,6 @@ func (c *StateObject) CodeHash() common.Bytes {
 	return crypto.Sha3(c.code)
 }
 
-func (c *StateObject) RlpDecode(data []byte) {
-	decoder := common.NewValueFromBytes(data)
-	c.nonce = decoder.Get(0).Uint()
-	c.balance = decoder.Get(1).BigInt()
-	c.trie = trie.NewSecure(decoder.Get(2).Bytes(), c.db)
-	c.storage = make(map[string]common.Hash)
-	c.gasPool = new(big.Int)
-
-	c.codeHash = decoder.Get(3).Bytes()
-
-	c.code, _ = c.db.Get(c.codeHash)
-}
-
 // Storage change object. Used by the manifest for notifying changes to
 // the sub channels.
 type StorageState struct {
diff --git a/core/state/statedb.go b/core/state/statedb.go
index 468b2dfe48..b754f08877 100644
--- a/core/state/statedb.go
+++ b/core/state/statedb.go
@@ -18,7 +18,6 @@
 package state
 
 import (
-	"bytes"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -276,10 +275,6 @@ func (self *StateDB) CreateAccount(addr common.Address) *StateObject {
 // Setting, copying of the state methods
 //
 
-func (s *StateDB) Cmp(other *StateDB) bool {
-	return bytes.Equal(s.trie.Root(), other.trie.Root())
-}
-
 func (self *StateDB) Copy() *StateDB {
 	state := New(common.Hash{}, self.db)
 	state.trie = self.trie
@@ -311,10 +306,6 @@ func (s *StateDB) Root() common.Hash {
 	return common.BytesToHash(s.trie.Root())
 }
 
-func (s *StateDB) Trie() *trie.SecureTrie {
-	return s.trie
-}
-
 // Syncs the trie and all siblings
 func (s *StateDB) Sync() {
 	// Sync all nested states
diff --git a/core/vm/errors.go b/core/vm/errors.go
index 24567e9a1e..e2fc84065e 100644
--- a/core/vm/errors.go
+++ b/core/vm/errors.go
@@ -25,20 +25,3 @@ import (
 
 var OutOfGasError = errors.New("Out of gas")
 var DepthError = fmt.Errorf("Max call depth exceeded (%d)", params.CallCreateDepth)
-
-type StackError struct {
-	req, has int
-}
-
-func StackErr(req, has int) StackError {
-	return StackError{req, has}
-}
-
-func (self StackError) Error() string {
-	return fmt.Sprintf("stack error! require %v, have %v", self.req, self.has)
-}
-
-func IsStackErr(err error) bool {
-	_, ok := err.(StackError)
-	return ok
-}