diff options
| author | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-10-23 22:46:18 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-10-23 22:46:18 +0800 |
| commit | 119c5b40a7ed1aea1c871c0cb56956b8ef9303d9 (patch) | |
| tree | b021423da04c9ff319a77549b473b6bad4930dd4 /javascript | |
| parent | 50fd46924900869e7210217c6a07979b544991c8 (diff) | |
| parent | 184055b3e2995894ccaba364484223e488730627 (diff) | |
| download | dexon-119c5b40a7ed1aea1c871c0cb56956b8ef9303d9.tar.gz dexon-119c5b40a7ed1aea1c871c0cb56956b8ef9303d9.tar.zst dexon-119c5b40a7ed1aea1c871c0cb56956b8ef9303d9.zip | |
Merge pull request #150 from fjl/develop
Merge eth-go repo into go-ethereum
Diffstat (limited to 'javascript')
| -rw-r--r-- | javascript/javascript_runtime.go | 14 | ||||
| -rw-r--r-- | javascript/types.go | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/javascript/javascript_runtime.go b/javascript/javascript_runtime.go index 189106ae9..b0d7c81b5 100644 --- a/javascript/javascript_runtime.go +++ b/javascript/javascript_runtime.go @@ -7,13 +7,13 @@ import ( "path" "path/filepath" - "github.com/ethereum/eth-go" - "github.com/ethereum/eth-go/ethchain" - "github.com/ethereum/eth-go/ethlog" - "github.com/ethereum/eth-go/ethpipe" - "github.com/ethereum/eth-go/ethstate" - "github.com/ethereum/eth-go/ethutil" - "github.com/ethereum/eth-go/event" + "github.com/ethereum/go-ethereum" + "github.com/ethereum/go-ethereum/ethchain" + "github.com/ethereum/go-ethereum/ethlog" + "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/utils" "github.com/obscuren/otto" ) diff --git a/javascript/types.go b/javascript/types.go index 560960f54..b02ee9dc2 100644 --- a/javascript/types.go +++ b/javascript/types.go @@ -3,11 +3,11 @@ package javascript import ( "fmt" - "github.com/ethereum/eth-go" - "github.com/ethereum/eth-go/ethpipe" - "github.com/ethereum/eth-go/ethstate" - "github.com/ethereum/eth-go/ethutil" - "github.com/ethereum/eth-go/ui" + "github.com/ethereum/go-ethereum" + "github.com/ethereum/go-ethereum/ethpipe" + "github.com/ethereum/go-ethereum/ethstate" + "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/ui" "github.com/obscuren/otto" ) |