mirror
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum
2
0
Fork 1
Code Issues Releases Wiki Activity

moved state and vm to core

Browse Source
pull/552/head
obscuren 10 years ago
parent d7eaa97a29
commit 0330077d76
58 changed files with 40 additions and 40 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      cmd/disasm/main.go
  2. 2
      cmd/ethereum/admin.go
  3. 2
      cmd/ethereum/main.go
  4. 4
      cmd/ethtest/main.go
  5. 4
      cmd/evm/main.go
  6. 2
      cmd/mist/bindings.go
  7. 2
      core/asm.go
  8. 2
      core/block_processor.go
  9. 2
      core/chain_makers.go
  10. 2
      core/chain_manager.go
  11. 2
      core/events.go
  12. 4
      core/execution.go
  13. 2
      core/filter.go
  14. 2
      core/genesis.go
  15. 0
      core/state/dump.go
  16. 0
      core/state/errors.go
  17. 0
      core/state/log.go
  18. 0
      core/state/main_test.go
  19. 0
      core/state/managed_state.go
  20. 0
      core/state/managed_state_test.go
  21. 0
      core/state/state_object.go
  22. 0
      core/state/state_test.go
  23. 0
      core/state/statedb.go
  24. 4
      core/state_transition.go
  25. 2
      core/transaction_pool_test.go
  26. 2
      core/types/bloom9.go
  27. 2
      core/types/bloom9_test.go
  28. 2
      core/types/common.go
  29. 2
      core/types/receipt.go
  30. 0
      core/vm/address.go
  31. 0
      core/vm/analysis.go
  32. 0
      core/vm/asm.go
  33. 0
      core/vm/common.go
  34. 0
      core/vm/context.go
  35. 2
      core/vm/environment.go
  36. 0
      core/vm/errors.go
  37. 0
      core/vm/gas.go
  38. 0
      core/vm/main_test.go
  39. 0
      core/vm/memory.go
  40. 0
      core/vm/stack.go
  41. 0
      core/vm/types.go
  42. 0
      core/vm/virtual_machine.go
  43. 2
      core/vm/vm.go
  44. 2
      core/vm/vm_jit.go
  45. 0
      core/vm/vm_jit_fake.go
  46. 0
      core/vm/vm_test.go
  47. 4
      core/vm_env.go
  48. 2
      eth/backend.go
  49. 2
      event/filter/eth_filter.go
  50. 2
      miner/worker.go
  51. 2
      rpc/responses.go
  52. 2
      tests/blocktest.go
  53. 4
      tests/helper/vm.go
  54. 2
      tests/vm/gh_test.go
  55. 0
      vm/.ethtest
  56. 2
      xeth/state.go
  57. 2
      xeth/types.go
  58. 2
      xeth/xeth.go

2
cmd/disasm/main.go
Unescape View File

@ -6,7 +6,7 @@ import (
"os" "os"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/core/vm"
) )
func main() { func main() {

2
cmd/ethereum/admin.go
Unescape View File

@ -12,7 +12,7 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/rpc" "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/ethereum/go-ethereum/xeth"
"github.com/robertkrimen/otto" "github.com/robertkrimen/otto"
) )

2
cmd/ethereum/main.go
Unescape View File

@ -36,7 +36,7 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/peterh/liner" "github.com/peterh/liner"
) )

4
cmd/ethtest/main.go
Unescape View File

@ -36,9 +36,9 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/logger" "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/tests/helper"
"github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/core/vm"
) )
type Log struct { type Log struct {

4
cmd/evm/main.go
Unescape View File

@ -35,8 +35,8 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/core/vm"
) )
var ( var (

2
cmd/mist/bindings.go
Unescape View File

@ -28,7 +28,7 @@ import (
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type plugin struct { type plugin struct {

2
core/asm.go
Unescape View File

@ -5,7 +5,7 @@ import (
"math/big" "math/big"
"github.com/ethereum/go-ethereum/common" "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) { func Disassemble(script []byte) (asm []string) {

2
core/block_processor.go
Unescape View File

@ -12,7 +12,7 @@ import (
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/pow" "github.com/ethereum/go-ethereum/pow"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"gopkg.in/fatih/set.v0" "gopkg.in/fatih/set.v0"
) )

2
core/chain_makers.go
Unescape View File

@ -8,7 +8,7 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/pow" "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 // So we can generate blocks easily

2
core/chain_manager.go
Unescape View File

@ -12,7 +12,7 @@ import (
"github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
var ( var (

2
core/events.go
Unescape View File

@ -2,7 +2,7 @@ package core
import ( import (
"github.com/ethereum/go-ethereum/core/types" "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. // TxPreEvent is posted when a transaction enters the transaction pool.

4
core/execution.go
Unescape View File

@ -6,8 +6,8 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/core/vm"
) )
type Execution struct { type Execution struct {

2
core/filter.go
Unescape View File

@ -5,7 +5,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type AccountChange struct { type AccountChange struct {

2
core/genesis.go
Unescape View File

@ -8,7 +8,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
/* /*

0
state/dump.go → core/state/dump.go
Unescape View File

0
state/errors.go → core/state/errors.go
Unescape View File

0
state/log.go → core/state/log.go
Unescape View File

0
state/main_test.go → core/state/main_test.go
Unescape View File

0
state/managed_state.go → core/state/managed_state.go
Unescape View File

0
state/managed_state_test.go → core/state/managed_state_test.go
Unescape View File

0
state/state_object.go → core/state/state_object.go
Unescape View File

0
state/state_test.go → core/state/state_test.go
Unescape View File

0
state/statedb.go → core/state/statedb.go
Unescape View File

4
core/state_transition.go
Unescape View File

@ -6,8 +6,8 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/core/vm"
) )
const tryJit = false const tryJit = false

2
core/transaction_pool_test.go
Unescape View File

@ -9,7 +9,7 @@ import (
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
// State query interface // State query interface

2
core/types/bloom9.go
Unescape View File

@ -5,7 +5,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
func CreateBloom(receipts Receipts) Bloom { func CreateBloom(receipts Receipts) Bloom {

2
core/types/bloom9_test.go
Unescape View File

@ -4,7 +4,7 @@ package types
import ( import (
"testing" "testing"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
func TestBloom9(t *testing.T) { func TestBloom9(t *testing.T) {

2
core/types/common.go
Unescape View File

@ -4,7 +4,7 @@ import (
"math/big" "math/big"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"fmt" "fmt"
) )

2
core/types/receipt.go
Unescape View File

@ -8,7 +8,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type Receipt struct { type Receipt struct {

0
vm/address.go → core/vm/address.go
Unescape View File

0
vm/analysis.go → core/vm/analysis.go
Unescape View File

0
vm/asm.go → core/vm/asm.go
Unescape View File

0
vm/common.go → core/vm/common.go
Unescape View File

0
vm/context.go → core/vm/context.go
Unescape View File

2
vm/environment.go → core/vm/environment.go
Unescape View File

@ -8,7 +8,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type Environment interface { type Environment interface {

0
vm/errors.go → core/vm/errors.go
Unescape View File

0
vm/gas.go → core/vm/gas.go
Unescape View File

0
vm/main_test.go → core/vm/main_test.go
Unescape View File

0
vm/memory.go → core/vm/memory.go
Unescape View File

0
vm/stack.go → core/vm/stack.go
Unescape View File

0
vm/types.go → core/vm/types.go
Unescape View File

0
vm/virtual_machine.go → core/vm/virtual_machine.go
Unescape View File

2
vm/vm.go → core/vm/vm.go
Unescape View File

@ -6,7 +6,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type Vm struct { type Vm struct {

2
vm/vm_jit.go → core/vm/vm_jit.go
Unescape View File

@ -19,7 +19,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"math/big" "math/big"
"unsafe" "unsafe"
) )

0
vm/vm_jit_fake.go → core/vm/vm_jit_fake.go
Unescape View File

0
vm/vm_test.go → core/vm/vm_test.go
Unescape View File

4
core/vm_env.go
Unescape View File

@ -5,8 +5,8 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/core/vm"
) )
type VMEnv struct { type VMEnv struct {

2
eth/backend.go
Unescape View File

@ -21,7 +21,7 @@ import (
"github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/discover" "github.com/ethereum/go-ethereum/p2p/discover"
"github.com/ethereum/go-ethereum/p2p/nat" "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" "github.com/ethereum/go-ethereum/whisper"
) )

2
event/filter/eth_filter.go
Unescape View File

@ -7,7 +7,7 @@ import (
"github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type FilterManager struct { type FilterManager struct {

2
miner/worker.go
Unescape View File

@ -13,7 +13,7 @@ import (
"github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/pow" "github.com/ethereum/go-ethereum/pow"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"gopkg.in/fatih/set.v0" "gopkg.in/fatih/set.v0"
) )

2
rpc/responses.go
Unescape View File

@ -7,7 +7,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type BlockRes struct { type BlockRes struct {

2
tests/blocktest.go
Unescape View File

@ -15,7 +15,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
// Block Test JSON Format // Block Test JSON Format

4
tests/helper/vm.go
Unescape View File

@ -7,8 +7,8 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/core/vm"
) )
type Env struct { type Env struct {

2
tests/vm/gh_test.go
Unescape View File

@ -10,7 +10,7 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/logger" "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/tests/helper"
) )

0
vm/.ethtest
Unescape View File

2
xeth/state.go
Unescape View File

@ -2,7 +2,7 @@ package xeth
import ( import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type State struct { type State struct {

2
xeth/types.go
Unescape View File

@ -11,7 +11,7 @@ import (
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type Object struct { type Object struct {

2
xeth/xeth.go
Unescape View File

@ -19,7 +19,7 @@ import (
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/miner"
"github.com/ethereum/go-ethereum/p2p" "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" "github.com/ethereum/go-ethereum/whisper"
) )

Write Preview
Loading…
Cancel
Save