diff options
| author | obscuren <geffobscura@gmail.com> | 2014-10-31 21:20:11 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-10-31 21:20:11 +0800 |
| commit | 8826e9694c3a8d4f480f0a021d8c02f7f61612c6 (patch) | |
| tree | 0c628ab800a0f701d0ae9adf5026c3d8a503232e | |
| parent | b1c247231b11f313ca0eedff75ea563926d23f68 (diff) | |
| download | go-tangerine-8826e9694c3a8d4f480f0a021d8c02f7f61612c6.tar go-tangerine-8826e9694c3a8d4f480f0a021d8c02f7f61612c6.tar.gz go-tangerine-8826e9694c3a8d4f480f0a021d8c02f7f61612c6.tar.bz2 go-tangerine-8826e9694c3a8d4f480f0a021d8c02f7f61612c6.tar.lz go-tangerine-8826e9694c3a8d4f480f0a021d8c02f7f61612c6.tar.xz go-tangerine-8826e9694c3a8d4f480f0a021d8c02f7f61612c6.tar.zst go-tangerine-8826e9694c3a8d4f480f0a021d8c02f7f61612c6.zip | |
Moved utils to cmd
| -rw-r--r-- | cmd/ethereum/cmd.go | 2 | ||||
| -rw-r--r-- | cmd/ethereum/main.go | 2 | ||||
| -rw-r--r-- | cmd/mist/bindings.go | 2 | ||||
| -rw-r--r-- | cmd/mist/debugger.go | 2 | ||||
| -rw-r--r-- | cmd/mist/flags.go | 3 | ||||
| -rw-r--r-- | cmd/mist/main.go | 2 | ||||
| -rw-r--r-- | cmd/utils/cmd.go (renamed from utils/cmd.go) | 0 | ||||
| -rw-r--r-- | cmd/utils/vm_env.go (renamed from utils/vm_env.go) | 0 | ||||
| -rw-r--r-- | cmd/utils/websockets.go (renamed from utils/websockets.go) | 0 | ||||
| -rw-r--r-- | javascript/javascript_runtime.go | 2 |
10 files changed, 8 insertions, 7 deletions
diff --git a/cmd/ethereum/cmd.go b/cmd/ethereum/cmd.go index d8cb19eaf..8710d6136 100644 --- a/cmd/ethereum/cmd.go +++ b/cmd/ethereum/cmd.go @@ -23,8 +23,8 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/cmd/ethereum/repl" + "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/javascript" - "github.com/ethereum/go-ethereum/utils" ) func InitJsConsole(ethereum *eth.Ethereum) { diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index fa85865fc..d7bc74c27 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -23,9 +23,9 @@ import ( "runtime" "github.com/ethereum/go-ethereum/chain" + "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/utils" "github.com/ethgo.old/ethlog" ) diff --git a/cmd/mist/bindings.go b/cmd/mist/bindings.go index 8b038587b..f5a0dfcff 100644 --- a/cmd/mist/bindings.go +++ b/cmd/mist/bindings.go @@ -23,10 +23,10 @@ import ( "strconv" "github.com/ethereum/go-ethereum/chain" + "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/ethpipe" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/utils" ) type plugin struct { diff --git a/cmd/mist/debugger.go b/cmd/mist/debugger.go index d786a0395..fadc241ff 100644 --- a/cmd/mist/debugger.go +++ b/cmd/mist/debugger.go @@ -25,9 +25,9 @@ import ( "unicode" "github.com/ethereum/go-ethereum/chain" + "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/ethstate" "github.com/ethereum/go-ethereum/ethutil" - "github.com/ethereum/go-ethereum/utils" "github.com/ethereum/go-ethereum/vm" "gopkg.in/qml.v1" ) diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go index 7de2a881d..2ae0a0487 100644 --- a/cmd/mist/flags.go +++ b/cmd/mist/flags.go @@ -28,6 +28,7 @@ import ( "runtime" "bitbucket.org/kardianos/osext" + "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/vm" ) @@ -116,7 +117,7 @@ func Init() { flag.StringVar(&Datadir, "datadir", defaultDataDir(), "specifies the datadir to use") flag.StringVar(&ConfigFile, "conf", defaultConfigFile, "config file") flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)") - flag.IntVar(&LogLevel, "loglevel", int(repllogger.InfoLevel), "loglevel: 0-5: silent,error,warn,info,debug,debug detail)") + flag.IntVar(&LogLevel, "loglevel", int(logger.InfoLevel), "loglevel: 0-5: silent,error,warn,info,debug,debug detail)") flag.StringVar(&AssetPath, "asset_path", defaultAssetPath(), "absolute path to GUI assets directory") diff --git a/cmd/mist/main.go b/cmd/mist/main.go index b7282d9b5..bb981b950 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -22,8 +22,8 @@ import ( "runtime" "github.com/ethereum/go-ethereum" + "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/utils" "gopkg.in/qml.v1" ) diff --git a/utils/cmd.go b/cmd/utils/cmd.go index 7ee41d042..7ee41d042 100644 --- a/utils/cmd.go +++ b/cmd/utils/cmd.go diff --git a/utils/vm_env.go b/cmd/utils/vm_env.go index 0a7b589ee..0a7b589ee 100644 --- a/utils/vm_env.go +++ b/cmd/utils/vm_env.go diff --git a/utils/websockets.go b/cmd/utils/websockets.go index 7bda805ac..7bda805ac 100644 --- a/utils/websockets.go +++ b/cmd/utils/websockets.go diff --git a/javascript/javascript_runtime.go b/javascript/javascript_runtime.go index c539c4348..deb6fe305 100644 --- a/javascript/javascript_runtime.go +++ b/javascript/javascript_runtime.go @@ -9,12 +9,12 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/chain" + "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/ethpipe" "github.com/ethereum/go-ethereum/ethstate" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/utils" "github.com/obscuren/otto" ) |