From 33f3f8254a83ccbaba1e61ca1c7b3b6390794cd9 Mon Sep 17 00:00:00 2001 From: Wei-Ning Huang Date: Thu, 17 Jan 2019 09:44:08 +0800 Subject: Revert "core: vm: refactor file structure (#151)" This reverts commit 020c8a477578cef3764b54f33d9ca0cf6caf7631. --- dex/api_backend.go | 2 +- dex/api_tracer.go | 2 +- dex/app_test.go | 2 +- dex/backend.go | 2 +- dex/downloader/downloader.go | 2 +- dex/downloader/downloader_test.go | 2 +- dex/downloader/testchain_test.go | 2 +- dex/governance.go | 2 +- dex/helper_test.go | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'dex') diff --git a/dex/api_backend.go b/dex/api_backend.go index 42f3c2dce..719625946 100644 --- a/dex/api_backend.go +++ b/dex/api_backend.go @@ -28,7 +28,7 @@ import ( "github.com/dexon-foundation/dexon/core/rawdb" "github.com/dexon-foundation/dexon/core/state" "github.com/dexon-foundation/dexon/core/types" - vm "github.com/dexon-foundation/dexon/core/vm/evm" + "github.com/dexon-foundation/dexon/core/vm" "github.com/dexon-foundation/dexon/eth/gasprice" "github.com/dexon-foundation/dexon/internal/ethapi" diff --git a/dex/api_tracer.go b/dex/api_tracer.go index 450f0bfab..bb6acd764 100644 --- a/dex/api_tracer.go +++ b/dex/api_tracer.go @@ -32,7 +32,7 @@ import ( "github.com/dexon-foundation/dexon/core/rawdb" "github.com/dexon-foundation/dexon/core/state" "github.com/dexon-foundation/dexon/core/types" - vm "github.com/dexon-foundation/dexon/core/vm/evm" + "github.com/dexon-foundation/dexon/core/vm" "github.com/dexon-foundation/dexon/eth/tracers" "github.com/dexon-foundation/dexon/internal/ethapi" "github.com/dexon-foundation/dexon/log" diff --git a/dex/app_test.go b/dex/app_test.go index 7c867959a..7d665a0af 100644 --- a/dex/app_test.go +++ b/dex/app_test.go @@ -16,7 +16,7 @@ import ( "github.com/dexon-foundation/dexon/consensus/dexcon" "github.com/dexon-foundation/dexon/core" "github.com/dexon-foundation/dexon/core/types" - vm "github.com/dexon-foundation/dexon/core/vm/evm" + "github.com/dexon-foundation/dexon/core/vm" "github.com/dexon-foundation/dexon/crypto" "github.com/dexon-foundation/dexon/ethdb" "github.com/dexon-foundation/dexon/params" diff --git a/dex/backend.go b/dex/backend.go index f0f75cbe7..825f7824a 100644 --- a/dex/backend.go +++ b/dex/backend.go @@ -27,7 +27,7 @@ import ( "github.com/dexon-foundation/dexon/core" "github.com/dexon-foundation/dexon/core/bloombits" "github.com/dexon-foundation/dexon/core/rawdb" - vm "github.com/dexon-foundation/dexon/core/vm/evm" + "github.com/dexon-foundation/dexon/core/vm" "github.com/dexon-foundation/dexon/dex/downloader" "github.com/dexon-foundation/dexon/eth/filters" "github.com/dexon-foundation/dexon/eth/gasprice" diff --git a/dex/downloader/downloader.go b/dex/downloader/downloader.go index dc73cd448..6ff8c122e 100644 --- a/dex/downloader/downloader.go +++ b/dex/downloader/downloader.go @@ -30,7 +30,7 @@ import ( "github.com/dexon-foundation/dexon/core/rawdb" "github.com/dexon-foundation/dexon/core/state" "github.com/dexon-foundation/dexon/core/types" - vm "github.com/dexon-foundation/dexon/core/vm/evm" + "github.com/dexon-foundation/dexon/core/vm" "github.com/dexon-foundation/dexon/crypto" "github.com/dexon-foundation/dexon/ethdb" "github.com/dexon-foundation/dexon/event" diff --git a/dex/downloader/downloader_test.go b/dex/downloader/downloader_test.go index 4347ad8a5..0d92ad97f 100644 --- a/dex/downloader/downloader_test.go +++ b/dex/downloader/downloader_test.go @@ -29,7 +29,7 @@ import ( "github.com/dexon-foundation/dexon/common" "github.com/dexon-foundation/dexon/core/state" "github.com/dexon-foundation/dexon/core/types" - vm "github.com/dexon-foundation/dexon/core/vm/evm" + "github.com/dexon-foundation/dexon/core/vm" "github.com/dexon-foundation/dexon/ethdb" "github.com/dexon-foundation/dexon/event" "github.com/dexon-foundation/dexon/trie" diff --git a/dex/downloader/testchain_test.go b/dex/downloader/testchain_test.go index ff94fa6cb..810fb41b3 100644 --- a/dex/downloader/testchain_test.go +++ b/dex/downloader/testchain_test.go @@ -25,7 +25,7 @@ import ( "github.com/dexon-foundation/dexon/core" "github.com/dexon-foundation/dexon/core/state" "github.com/dexon-foundation/dexon/core/types" - vm "github.com/dexon-foundation/dexon/core/vm/evm" + "github.com/dexon-foundation/dexon/core/vm" "github.com/dexon-foundation/dexon/crypto" "github.com/dexon-foundation/dexon/ethdb" "github.com/dexon-foundation/dexon/params" diff --git a/dex/governance.go b/dex/governance.go index 26a174b55..0d5a7c926 100644 --- a/dex/governance.go +++ b/dex/governance.go @@ -33,7 +33,7 @@ import ( "github.com/dexon-foundation/dexon/common" "github.com/dexon-foundation/dexon/core" "github.com/dexon-foundation/dexon/core/types" - vm "github.com/dexon-foundation/dexon/core/vm/evm" + "github.com/dexon-foundation/dexon/core/vm" "github.com/dexon-foundation/dexon/crypto" "github.com/dexon-foundation/dexon/log" "github.com/dexon-foundation/dexon/params" diff --git a/dex/helper_test.go b/dex/helper_test.go index db7a4ef8e..e3d6aa3b7 100644 --- a/dex/helper_test.go +++ b/dex/helper_test.go @@ -31,7 +31,7 @@ import ( "github.com/dexon-foundation/dexon/consensus/ethash" "github.com/dexon-foundation/dexon/core" "github.com/dexon-foundation/dexon/core/types" - vm "github.com/dexon-foundation/dexon/core/vm/evm" + "github.com/dexon-foundation/dexon/core/vm" "github.com/dexon-foundation/dexon/crypto" "github.com/dexon-foundation/dexon/dex/downloader" "github.com/dexon-foundation/dexon/ethdb" -- cgit v1.2.3