diff options
| author | Felix Lange <fjl@twurst.com> | 2016-09-19 15:58:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-19 15:58:14 +0800 |
| commit | c8d6efd602042687236669b5c7624c93640ccfbc (patch) | |
| tree | 606a2e6198b71ff9aa7f940847bac8f0cc07b57b | |
| parent | 88b012ad3b470391ba5bfb99da3775bde775e915 (diff) | |
| parent | b6b17e5648ba2d8298d41c384d89caf82a27b271 (diff) | |
| download | dexon-c8d6efd602042687236669b5c7624c93640ccfbc.tar dexon-c8d6efd602042687236669b5c7624c93640ccfbc.tar.gz dexon-c8d6efd602042687236669b5c7624c93640ccfbc.tar.bz2 dexon-c8d6efd602042687236669b5c7624c93640ccfbc.tar.lz dexon-c8d6efd602042687236669b5c7624c93640ccfbc.tar.xz dexon-c8d6efd602042687236669b5c7624c93640ccfbc.tar.zst dexon-c8d6efd602042687236669b5c7624c93640ccfbc.zip | |
Merge pull request #3010 from Gustav-Simonsson/remove_unused_initcode_field
core/state, light: remove unused StateObject.initCode
| -rw-r--r-- | core/state/state_object.go | 3 | ||||
| -rw-r--r-- | core/state/state_test.go | 3 | ||||
| -rw-r--r-- | light/state_object.go | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/core/state/state_object.go b/core/state/state_object.go index 20da1006f..c5462316d 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -71,8 +71,6 @@ type StateObject struct { codeHash []byte // The code for this account code Code - // Temporarily initialisation code - initCode Code // Cached storage (flushed when updated) storage Storage @@ -188,7 +186,6 @@ func (self *StateObject) Copy() *StateObject { stateObject.nonce = self.nonce stateObject.trie = self.trie stateObject.code = self.code - stateObject.initCode = common.CopyBytes(self.initCode) stateObject.storage = self.storage.Copy() stateObject.remove = self.remove stateObject.dirty = self.dirty diff --git a/core/state/state_test.go b/core/state/state_test.go index 5a6cb0b50..69cf083cf 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -200,9 +200,6 @@ func compareStateObjects(so0, so1 *StateObject, t *testing.T) { if !bytes.Equal(so0.code, so1.code) { t.Fatalf("Code mismatch: have %v, want %v", so0.code, so1.code) } - if !bytes.Equal(so0.initCode, so1.initCode) { - t.Fatalf("InitCode mismatch: have %v, want %v", so0.initCode, so1.initCode) - } for k, v := range so1.storage { if so0.storage[k] != v { diff --git a/light/state_object.go b/light/state_object.go index 030653c77..08c209d7d 100644 --- a/light/state_object.go +++ b/light/state_object.go @@ -79,8 +79,6 @@ type StateObject struct { codeHash []byte // The code for this account code Code - // Temporarily initialisation code - initCode Code // Cached storage (flushed when updated) storage Storage @@ -189,7 +187,6 @@ func (self *StateObject) Copy() *StateObject { stateObject.nonce = self.nonce stateObject.trie = self.trie stateObject.code = common.CopyBytes(self.code) - stateObject.initCode = common.CopyBytes(self.initCode) stateObject.storage = self.storage.Copy() stateObject.remove = self.remove stateObject.dirty = self.dirty |