From f53689074672b3a32b81d2bd8ec144f7b8110624 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Wed, 29 Mar 2017 19:48:35 -0400 Subject: [PATCH] Merge continued --- rpc/json.go | 5 ----- rpc/server.go | 6 ------ rpc/websocket.go | 5 ----- tests/block_test.go | 5 ----- tests/block_test_util.go | 15 --------------- .../ansible/test-files/docker-cpp/Dockerfile | 5 ----- .../ansible/test-files/docker-cppjit/Dockerfile | 4 ---- .../files/ansible/test-files/docker-go/Dockerfile | 6 +----- tests/state_test_util.go | 9 --------- tests/transaction_test_util.go | 8 +------- tests/util.go | 7 ------- tests/vm_test_util.go | 7 ------- trie/iterator.go | 4 ---- trie/proof.go | 5 ----- trie/secure_trie.go | 6 ------ trie/sync.go | 5 +---- trie/trie.go | 6 ------ 17 files changed, 3 insertions(+), 105 deletions(-) diff --git a/rpc/json.go b/rpc/json.go index 5a0abe82ad..6d9ccc7f1b 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -26,12 +26,7 @@ import ( "strings" "sync" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/log" ->>>>>>> rebase-1.5.9 ) const ( diff --git a/rpc/server.go b/rpc/server.go index 955e959651..5b9a63c7cf 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -24,13 +24,7 @@ import ( "sync" "sync/atomic" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "golang.org/x/net/context" -======= "github.com/expanse-org/go-expanse/log" ->>>>>>> rebase-1.5.9 "gopkg.in/fatih/set.v0" ) diff --git a/rpc/websocket.go b/rpc/websocket.go index 85fca2a40c..3995bb8060 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -27,12 +27,7 @@ import ( "strings" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/log" ->>>>>>> rebase-1.5.9 "golang.org/x/net/websocket" "gopkg.in/fatih/set.v0" ) diff --git a/tests/block_test.go b/tests/block_test.go index b902b97f69..d341610175 100644 --- a/tests/block_test.go +++ b/tests/block_test.go @@ -20,11 +20,6 @@ import ( "math/big" "path/filepath" "testing" -<<<<<<< HEAD - - "github.com/expanse-org/go-expanse/params" -======= ->>>>>>> rebase-1.5.9 ) func TestBcValidBlockTests(t *testing.T) { diff --git a/tests/block_test_util.go b/tests/block_test_util.go index d6b187cef7..013767fd14 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -26,27 +26,16 @@ import ( "strconv" "strings" -<<<<<<< HEAD - "github.com/expanse-org/ethash" -======= ->>>>>>> rebase-1.5.9 "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/state" "github.com/expanse-org/go-expanse/core/types" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/crypto" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/core/vm" "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/event" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/pow" ->>>>>>> rebase-1.5.9 "github.com/expanse-org/go-expanse/rlp" ) @@ -253,11 +242,7 @@ func (t *BlockTest) InsertPreState(db ethdb.Database) (*state.StateDB, error) { return statedb, nil } -<<<<<<< HEAD -/* See https://github.com/expanse-org/tests/wiki/Blockchain-Tests-II -======= /* See https://github.com/ethereum/tests/wiki/Blockchain-Tests-II ->>>>>>> rebase-1.5.9 Whether a block is valid or not is a bit subtle, it's defined by presence of blockHeader, transactions and uncleHeaders fields. If they are missing, the block is diff --git a/tests/files/ansible/test-files/docker-cpp/Dockerfile b/tests/files/ansible/test-files/docker-cpp/Dockerfile index a433a076eb..e761866dc9 100755 --- a/tests/files/ansible/test-files/docker-cpp/Dockerfile +++ b/tests/files/ansible/test-files/docker-cpp/Dockerfile @@ -10,11 +10,7 @@ RUN apt-get install -qy build-essential g++-4.8 git cmake libboost-all-dev libcu RUN apt-get install -qy automake unzip libgmp-dev libtool libleveldb-dev yasm libminiupnpc-dev libreadline-dev scons RUN apt-get install -qy libjsoncpp-dev libargtable2-dev -<<<<<<< HEAD -# NCurses based GUI (not optional though for a succesful compilation, see https://github.com/expanse-org/cpp-expanse/issues/452 ) -======= # NCurses based GUI (not optional though for a successful compilation, see https://github.com/expanse-org/cpp-expanse/issues/452 ) ->>>>>>> rebase-1.5.9 RUN apt-get install -qy libncurses5-dev # Qt-based GUI @@ -33,4 +29,3 @@ RUN cd cpp-expanse/build && cmake .. -DCMAKE_BUILD_TYPE=Release -DHEADLESS=1 && RUN ldconfig ENTRYPOINT ["/cpp-expanse/build/test/createRandomTest"] - diff --git a/tests/files/ansible/test-files/docker-cppjit/Dockerfile b/tests/files/ansible/test-files/docker-cppjit/Dockerfile index 74b1bfebb2..d9cbbd51a5 100755 --- a/tests/files/ansible/test-files/docker-cppjit/Dockerfile +++ b/tests/files/ansible/test-files/docker-cppjit/Dockerfile @@ -10,11 +10,7 @@ RUN apt-get install -qy build-essential g++-4.8 git cmake libboost-all-dev libcu RUN apt-get install -qy automake unzip libgmp-dev libtool libleveldb-dev yasm libminiupnpc-dev libreadline-dev scons RUN apt-get install -qy libjsoncpp-dev libargtable2-dev -<<<<<<< HEAD -# NCurses based GUI (not optional though for a succesful compilation, see https://github.com/expanse-org/cpp-expanse/issues/452 ) -======= # NCurses based GUI (not optional though for a successful compilation, see https://github.com/expanse-org/cpp-expanse/issues/452 ) ->>>>>>> rebase-1.5.9 RUN apt-get install -qy libncurses5-dev # Qt-based GUI diff --git a/tests/files/ansible/test-files/docker-go/Dockerfile b/tests/files/ansible/test-files/docker-go/Dockerfile index 29bd0aa26b..c1db5e2134 100755 --- a/tests/files/ansible/test-files/docker-go/Dockerfile +++ b/tests/files/ansible/test-files/docker-go/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get install -y git mercurial build-essential software-properties-common ## Install Qt5.4 dependencies from PPA RUN add-apt-repository ppa:beineri/opt-qt54-trusty -y RUN apt-get update -y -RUN apt-get install -y qt54quickcontrols qt54webengine +RUN apt-get install -y qt54quickcontrols qt54webengine ## Build and install latest Go RUN git clone https://go.googlesource.com/go golang @@ -42,10 +42,6 @@ RUN git pull RUN ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/expanse-org/go-expanse/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get $ETH_DEPS; fi -<<<<<<< HEAD -RUN go install -v ./cmd/exptest -======= RUN go install -v ./cmd/ethtest ->>>>>>> rebase-1.5.9 ENTRYPOINT ["ethtest"] diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 4575bd13a8..bfcadea773 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -26,14 +26,6 @@ import ( "testing" "github.com/expanse-org/go-expanse/common" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/state" - "github.com/expanse-org/go-expanse/core/vm" - "github.com/expanse-org/go-expanse/crypto" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/common/math" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/state" @@ -41,7 +33,6 @@ import ( "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/params" ->>>>>>> rebase-1.5.9 ) func RunStateTestWithReader(chainConfig *params.ChainConfig, r io.Reader, skipTests []string) error { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 3e2d296073..3628ee45de 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -24,16 +24,10 @@ import ( "runtime" "github.com/expanse-org/go-expanse/common" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/common/math" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/log" ->>>>>>> rebase-1.5.9 - "github.com/expanse-org/go-expanse/params" +\ "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/rlp" ) diff --git a/tests/util.go b/tests/util.go index 85d0c75270..c9dc84c800 100644 --- a/tests/util.go +++ b/tests/util.go @@ -24,22 +24,15 @@ import ( "os" "github.com/expanse-org/go-expanse/common" -<<<<<<< HEAD -======= "github.com/expanse-org/go-expanse/common/math" ->>>>>>> rebase-1.5.9 "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/state" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/core/vm" "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/ethdb" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/params" ->>>>>>> rebase-1.5.9 ) var ( diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index 2cd2b9c08c..147a750746 100644 --- a/tests/vm_test_util.go +++ b/tests/vm_test_util.go @@ -25,19 +25,12 @@ import ( "testing" "github.com/expanse-org/go-expanse/common" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/core/state" - "github.com/expanse-org/go-expanse/core/vm" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/common/math" "github.com/expanse-org/go-expanse/core/state" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/core/vm" "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/log" ->>>>>>> rebase-1.5.9 "github.com/expanse-org/go-expanse/params" ) diff --git a/trie/iterator.go b/trie/iterator.go index 632170565e..8cb6af2d62 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -16,14 +16,10 @@ package trie -<<<<<<< HEAD -import "github.com/expanse-org/go-expanse/common" -======= import ( "bytes" "github.com/expanse-org/go-expanse/common" ) ->>>>>>> rebase-1.5.9 // Iterator is a key-value trie iterator that traverses a Trie. type Iterator struct { diff --git a/trie/proof.go b/trie/proof.go index 3344b03896..dfbd23db67 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -23,12 +23,7 @@ import ( "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/crypto/sha3" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/log" ->>>>>>> rebase-1.5.9 "github.com/expanse-org/go-expanse/rlp" ) diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 648040f0f5..c2742a1188 100644 --- a/trie/secure_trie.go +++ b/trie/secure_trie.go @@ -17,16 +17,10 @@ package trie import ( -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "fmt" "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/log" ->>>>>>> rebase-1.5.9 ) var secureKeyPrefix = []byte("secure-key-") diff --git a/trie/sync.go b/trie/sync.go index bb8380c194..a9fe460591 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -21,10 +21,7 @@ import ( "fmt" "github.com/expanse-org/go-expanse/common" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/ethdb" -======= ->>>>>>> rebase-1.5.9 + "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/trie/trie.go b/trie/trie.go index 361efc2cfd..26f98b615e 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -22,15 +22,9 @@ import ( "fmt" "github.com/expanse-org/go-expanse/common" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/crypto" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/crypto/sha3" "github.com/expanse-org/go-expanse/log" "github.com/rcrowley/go-metrics" ->>>>>>> rebase-1.5.9 ) var (