From 0330077d76b48934ab024a309000f83c78047d8a Mon Sep 17 00:00:00 2001 From: obscuren Date: Mon, 23 Mar 2015 16:59:09 +0100 Subject: [PATCH] moved state and vm to core --- cmd/disasm/main.go | 2 +- cmd/ethereum/admin.go | 2 +- cmd/ethereum/main.go | 2 +- cmd/ethtest/main.go | 4 ++-- cmd/evm/main.go | 4 ++-- cmd/mist/bindings.go | 2 +- core/asm.go | 2 +- core/block_processor.go | 2 +- core/chain_makers.go | 2 +- core/chain_manager.go | 2 +- core/events.go | 2 +- core/execution.go | 4 ++-- core/filter.go | 2 +- core/genesis.go | 2 +- {state => core/state}/dump.go | 0 {state => core/state}/errors.go | 0 {state => core/state}/log.go | 0 {state => core/state}/main_test.go | 0 {state => core/state}/managed_state.go | 0 {state => core/state}/managed_state_test.go | 0 {state => core/state}/state_object.go | 0 {state => core/state}/state_test.go | 0 {state => core/state}/statedb.go | 0 core/state_transition.go | 4 ++-- core/transaction_pool_test.go | 2 +- core/types/bloom9.go | 2 +- core/types/bloom9_test.go | 2 +- core/types/common.go | 2 +- core/types/receipt.go | 2 +- {vm => core/vm}/address.go | 0 {vm => core/vm}/analysis.go | 0 {vm => core/vm}/asm.go | 0 {vm => core/vm}/common.go | 0 {vm => core/vm}/context.go | 0 {vm => core/vm}/environment.go | 2 +- {vm => core/vm}/errors.go | 0 {vm => core/vm}/gas.go | 0 {vm => core/vm}/main_test.go | 0 {vm => core/vm}/memory.go | 0 {vm => core/vm}/stack.go | 0 {vm => core/vm}/types.go | 0 {vm => core/vm}/virtual_machine.go | 0 {vm => core/vm}/vm.go | 2 +- {vm => core/vm}/vm_jit.go | 2 +- {vm => core/vm}/vm_jit_fake.go | 0 {vm => core/vm}/vm_test.go | 0 core/vm_env.go | 4 ++-- eth/backend.go | 2 +- event/filter/eth_filter.go | 2 +- miner/worker.go | 2 +- rpc/responses.go | 2 +- tests/blocktest.go | 2 +- tests/helper/vm.go | 4 ++-- tests/vm/gh_test.go | 2 +- vm/.ethtest | 0 xeth/state.go | 2 +- xeth/types.go | 2 +- xeth/xeth.go | 2 +- 58 files changed, 40 insertions(+), 40 deletions(-) rename {state => core/state}/dump.go (100%) rename {state => core/state}/errors.go (100%) rename {state => core/state}/log.go (100%) rename {state => core/state}/main_test.go (100%) rename {state => core/state}/managed_state.go (100%) rename {state => core/state}/managed_state_test.go (100%) rename {state => core/state}/state_object.go (100%) rename {state => core/state}/state_test.go (100%) rename {state => core/state}/statedb.go (100%) rename {vm => core/vm}/address.go (100%) rename {vm => core/vm}/analysis.go (100%) rename {vm => core/vm}/asm.go (100%) rename {vm => core/vm}/common.go (100%) rename {vm => core/vm}/context.go (100%) rename {vm => core/vm}/environment.go (97%) rename {vm => core/vm}/errors.go (100%) rename {vm => core/vm}/gas.go (100%) rename {vm => core/vm}/main_test.go (100%) rename {vm => core/vm}/memory.go (100%) rename {vm => core/vm}/stack.go (100%) rename {vm => core/vm}/types.go (100%) rename {vm => core/vm}/virtual_machine.go (100%) rename {vm => core/vm}/vm.go (99%) rename {vm => core/vm}/vm_jit.go (99%) rename {vm => core/vm}/vm_jit_fake.go (100%) rename {vm => core/vm}/vm_test.go (100%) delete mode 100644 vm/.ethtest diff --git a/cmd/disasm/main.go b/cmd/disasm/main.go index 5d42121b6..5b658046f 100644 --- a/cmd/disasm/main.go +++ b/cmd/disasm/main.go @@ -6,7 +6,7 @@ import ( "os" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/vm" + "github.com/ethereum/go-ethereum/core/vm" ) func main() { diff --git a/cmd/ethereum/admin.go b/cmd/ethereum/admin.go index 65adb4086..139395dad 100644 --- a/cmd/ethereum/admin.go +++ b/cmd/ethereum/admin.go @@ -12,7 +12,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/xeth" "github.com/robertkrimen/otto" ) diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index e351453b1..5ad4c0a4e 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -36,7 +36,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" "github.com/peterh/liner" ) diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go index fdf573fd8..f5b423e8d 100644 --- a/cmd/ethtest/main.go +++ b/cmd/ethtest/main.go @@ -36,9 +36,9 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/tests/helper" - "github.com/ethereum/go-ethereum/vm" + "github.com/ethereum/go-ethereum/core/vm" ) type Log struct { diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 17137e4bb..76e34e21d 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -35,8 +35,8 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/state" - "github.com/ethereum/go-ethereum/vm" + "github.com/ethereum/go-ethereum/core/state" + "github.com/ethereum/go-ethereum/core/vm" ) var ( diff --git a/cmd/mist/bindings.go b/cmd/mist/bindings.go index 5d45d927e..8a9ec7cb1 100644 --- a/cmd/mist/bindings.go +++ b/cmd/mist/bindings.go @@ -28,7 +28,7 @@ import ( "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) type plugin struct { diff --git a/core/asm.go b/core/asm.go index fc3493fe1..f40c07904 100644 --- a/core/asm.go +++ b/core/asm.go @@ -5,7 +5,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/vm" + "github.com/ethereum/go-ethereum/core/vm" ) func Disassemble(script []byte) (asm []string) { diff --git a/core/block_processor.go b/core/block_processor.go index ae8d5fe7b..4bcede85e 100644 --- a/core/block_processor.go +++ b/core/block_processor.go @@ -12,7 +12,7 @@ import ( "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/pow" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" "gopkg.in/fatih/set.v0" ) diff --git a/core/chain_makers.go b/core/chain_makers.go index e3001331c..d559b2a3a 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -8,7 +8,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/pow" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) // So we can generate blocks easily diff --git a/core/chain_manager.go b/core/chain_manager.go index a3be3878f..3e030838a 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -12,7 +12,7 @@ import ( "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) var ( diff --git a/core/events.go b/core/events.go index b93f27c51..3da668af5 100644 --- a/core/events.go +++ b/core/events.go @@ -2,7 +2,7 @@ package core import ( "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) // TxPreEvent is posted when a transaction enters the transaction pool. diff --git a/core/execution.go b/core/execution.go index 4f15fb42a..92d932a9f 100644 --- a/core/execution.go +++ b/core/execution.go @@ -6,8 +6,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/state" - "github.com/ethereum/go-ethereum/vm" + "github.com/ethereum/go-ethereum/core/state" + "github.com/ethereum/go-ethereum/core/vm" ) type Execution struct { diff --git a/core/filter.go b/core/filter.go index b5d9deb7a..901931d99 100644 --- a/core/filter.go +++ b/core/filter.go @@ -5,7 +5,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) type AccountChange struct { diff --git a/core/genesis.go b/core/genesis.go index 3e00533ae..e0d3e51b8 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -8,7 +8,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) /* diff --git a/state/dump.go b/core/state/dump.go similarity index 100% rename from state/dump.go rename to core/state/dump.go diff --git a/state/errors.go b/core/state/errors.go similarity index 100% rename from state/errors.go rename to core/state/errors.go diff --git a/state/log.go b/core/state/log.go similarity index 100% rename from state/log.go rename to core/state/log.go diff --git a/state/main_test.go b/core/state/main_test.go similarity index 100% rename from state/main_test.go rename to core/state/main_test.go diff --git a/state/managed_state.go b/core/state/managed_state.go similarity index 100% rename from state/managed_state.go rename to core/state/managed_state.go diff --git a/state/managed_state_test.go b/core/state/managed_state_test.go similarity index 100% rename from state/managed_state_test.go rename to core/state/managed_state_test.go diff --git a/state/state_object.go b/core/state/state_object.go similarity index 100% rename from state/state_object.go rename to core/state/state_object.go diff --git a/state/state_test.go b/core/state/state_test.go similarity index 100% rename from state/state_test.go rename to core/state/state_test.go diff --git a/state/statedb.go b/core/state/statedb.go similarity index 100% rename from state/statedb.go rename to core/state/statedb.go diff --git a/core/state_transition.go b/core/state_transition.go index d0b2c5d7c..e530567d0 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -6,8 +6,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/state" - "github.com/ethereum/go-ethereum/vm" + "github.com/ethereum/go-ethereum/core/state" + "github.com/ethereum/go-ethereum/core/vm" ) const tryJit = false diff --git a/core/transaction_pool_test.go b/core/transaction_pool_test.go index bf9012573..a009a4c9d 100644 --- a/core/transaction_pool_test.go +++ b/core/transaction_pool_test.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) // State query interface diff --git a/core/types/bloom9.go b/core/types/bloom9.go index 64a8ff49a..af90679ce 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -5,7 +5,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) func CreateBloom(receipts Receipts) Bloom { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index 0841bb859..3c95772ec 100644 --- a/core/types/bloom9_test.go +++ b/core/types/bloom9_test.go @@ -4,7 +4,7 @@ package types import ( "testing" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) func TestBloom9(t *testing.T) { diff --git a/core/types/common.go b/core/types/common.go index ce1090919..4397d4938 100644 --- a/core/types/common.go +++ b/core/types/common.go @@ -4,7 +4,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" "fmt" ) diff --git a/core/types/receipt.go b/core/types/receipt.go index f88d42b29..83c981f93 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -8,7 +8,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) type Receipt struct { diff --git a/vm/address.go b/core/vm/address.go similarity index 100% rename from vm/address.go rename to core/vm/address.go diff --git a/vm/analysis.go b/core/vm/analysis.go similarity index 100% rename from vm/analysis.go rename to core/vm/analysis.go diff --git a/vm/asm.go b/core/vm/asm.go similarity index 100% rename from vm/asm.go rename to core/vm/asm.go diff --git a/vm/common.go b/core/vm/common.go similarity index 100% rename from vm/common.go rename to core/vm/common.go diff --git a/vm/context.go b/core/vm/context.go similarity index 100% rename from vm/context.go rename to core/vm/context.go diff --git a/vm/environment.go b/core/vm/environment.go similarity index 97% rename from vm/environment.go rename to core/vm/environment.go index 5d493166c..a0a18a99b 100644 --- a/vm/environment.go +++ b/core/vm/environment.go @@ -8,7 +8,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) type Environment interface { diff --git a/vm/errors.go b/core/vm/errors.go similarity index 100% rename from vm/errors.go rename to core/vm/errors.go diff --git a/vm/gas.go b/core/vm/gas.go similarity index 100% rename from vm/gas.go rename to core/vm/gas.go diff --git a/vm/main_test.go b/core/vm/main_test.go similarity index 100% rename from vm/main_test.go rename to core/vm/main_test.go diff --git a/vm/memory.go b/core/vm/memory.go similarity index 100% rename from vm/memory.go rename to core/vm/memory.go diff --git a/vm/stack.go b/core/vm/stack.go similarity index 100% rename from vm/stack.go rename to core/vm/stack.go diff --git a/vm/types.go b/core/vm/types.go similarity index 100% rename from vm/types.go rename to core/vm/types.go diff --git a/vm/virtual_machine.go b/core/vm/virtual_machine.go similarity index 100% rename from vm/virtual_machine.go rename to core/vm/virtual_machine.go diff --git a/vm/vm.go b/core/vm/vm.go similarity index 99% rename from vm/vm.go rename to core/vm/vm.go index 7400a48c4..f4bf1ca72 100644 --- a/vm/vm.go +++ b/core/vm/vm.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) type Vm struct { diff --git a/vm/vm_jit.go b/core/vm/vm_jit.go similarity index 99% rename from vm/vm_jit.go rename to core/vm/vm_jit.go index 9d26957f0..2b88d8620 100644 --- a/vm/vm_jit.go +++ b/core/vm/vm_jit.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" "math/big" "unsafe" ) diff --git a/vm/vm_jit_fake.go b/core/vm/vm_jit_fake.go similarity index 100% rename from vm/vm_jit_fake.go rename to core/vm/vm_jit_fake.go diff --git a/vm/vm_test.go b/core/vm/vm_test.go similarity index 100% rename from vm/vm_test.go rename to core/vm/vm_test.go diff --git a/core/vm_env.go b/core/vm_env.go index 7845d1cd9..d786844dc 100644 --- a/core/vm_env.go +++ b/core/vm_env.go @@ -5,8 +5,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/state" - "github.com/ethereum/go-ethereum/vm" + "github.com/ethereum/go-ethereum/core/state" + "github.com/ethereum/go-ethereum/core/vm" ) type VMEnv struct { diff --git a/eth/backend.go b/eth/backend.go index 06c3cbd17..11ef9660f 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -21,7 +21,7 @@ import ( "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/discover" "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/vm" + "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/whisper" ) diff --git a/event/filter/eth_filter.go b/event/filter/eth_filter.go index 1abd48389..dc032b5c2 100644 --- a/event/filter/eth_filter.go +++ b/event/filter/eth_filter.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) type FilterManager struct { diff --git a/miner/worker.go b/miner/worker.go index 587036f22..e21765f9d 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -13,7 +13,7 @@ import ( "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/pow" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/responses.go b/rpc/responses.go index 1ec5f08eb..993f467ea 100644 --- a/rpc/responses.go +++ b/rpc/responses.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) type BlockRes struct { diff --git a/tests/blocktest.go b/tests/blocktest.go index 5719a835b..34bd69ac8 100644 --- a/tests/blocktest.go +++ b/tests/blocktest.go @@ -15,7 +15,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) // Block Test JSON Format diff --git a/tests/helper/vm.go b/tests/helper/vm.go index 44c108870..68ae8e97b 100644 --- a/tests/helper/vm.go +++ b/tests/helper/vm.go @@ -7,8 +7,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/state" - "github.com/ethereum/go-ethereum/vm" + "github.com/ethereum/go-ethereum/core/state" + "github.com/ethereum/go-ethereum/core/vm" ) type Env struct { diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go index 68600d304..123e8ccb5 100644 --- a/tests/vm/gh_test.go +++ b/tests/vm/gh_test.go @@ -10,7 +10,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/tests/helper" ) diff --git a/vm/.ethtest b/vm/.ethtest deleted file mode 100644 index e69de29bb..000000000 diff --git a/xeth/state.go b/xeth/state.go index f645a9cac..b0f2ce019 100644 --- a/xeth/state.go +++ b/xeth/state.go @@ -2,7 +2,7 @@ package xeth import ( "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) type State struct { diff --git a/xeth/types.go b/xeth/types.go index b4ba7bab0..09d0dc714 100644 --- a/xeth/types.go +++ b/xeth/types.go @@ -11,7 +11,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" ) type Object struct { diff --git a/xeth/xeth.go b/xeth/xeth.go index f7f4ce0cf..02a691ffb 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -19,7 +19,7 @@ import ( "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/state" + "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/whisper" )