moved state and vm to core

0330077d · obscuren · d7eaa97a · 0330077d · 0330077d · 0330077d
Commit 0330077d authored Mar 23, 2015 by obscuren
58 changed files
--- 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() {

--- 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"
 )

--- 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"
 )


--- 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 {

--- 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 (

--- 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 {

--- 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) {

--- 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"
 )


--- 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

--- 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 (

--- 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.

--- 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 {

--- 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 {

--- 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"
 )

 /*

--- a/state/dump.go
+++ b/state/dump.go
--- a/state/errors.go
+++ b/state/errors.go
--- a/state/log.go
+++ b/state/log.go
--- a/state/main_test.go
+++ b/state/main_test.go
--- a/state/managed_state.go
+++ b/state/managed_state.go
--- a/state/managed_state_test.go
+++ b/state/managed_state_test.go
--- a/state/state_object.go
+++ b/state/state_object.go
--- a/state/state_test.go
+++ b/state/state_test.go
--- a/state/statedb.go
+++ b/state/statedb.go
--- 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

--- 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

--- 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 {

--- 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) {

--- 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"
 )

--- 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 {

--- a/vm/address.go
+++ b/vm/address.go
--- a/vm/analysis.go
+++ b/vm/analysis.go
--- a/vm/asm.go
+++ b/vm/asm.go
--- a/vm/common.go
+++ b/vm/common.go
--- a/vm/context.go
+++ b/vm/context.go
--- a/vm/environment.go
+++ b/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 {

--- a/vm/errors.go
+++ b/vm/errors.go
--- a/vm/gas.go
+++ b/vm/gas.go
--- a/vm/main_test.go
+++ b/vm/main_test.go
--- a/vm/memory.go
+++ b/vm/memory.go
--- a/vm/stack.go
+++ b/vm/stack.go
--- a/vm/types.go
+++ b/vm/types.go
--- a/vm/virtual_machine.go
+++ b/vm/virtual_machine.go
--- a/vm/vm.go
+++ b/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 {

--- a/vm/vm_jit.go
+++ b/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"
 )

--- a/vm/vm_jit_fake.go
+++ b/vm/vm_jit_fake.go
--- a/vm/vm_test.go
+++ b/vm/vm_test.go
--- 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 {

--- 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"
 )


--- 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 {

--- 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"
 )


--- 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 {

--- 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

--- 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 {

--- 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"
 )


--- a/vm/.ethtest
+++ b/vm/.ethtest
--- 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 {

--- 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 {

--- 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"
 )