Skip to content

Commit

Permalink
Merge continued
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrisfranko
chrisfranko committed Mar 29, 2017
1 parent efc04c3 commit f536890
Show file tree
Hide file tree
Showing 17 changed files with 3 additions and 105 deletions.
5 changes: 0 additions & 5 deletions rpc/json.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 0 additions & 6 deletions rpc/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
5 changes: 0 additions & 5 deletions rpc/websocket.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
5 changes: 0 additions & 5 deletions tests/block_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
15 changes: 0 additions & 15 deletions tests/block_test_util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions tests/files/ansible/test-files/docker-cpp/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -33,4 +29,3 @@ RUN cd cpp-expanse/build && cmake .. -DCMAKE_BUILD_TYPE=Release -DHEADLESS=1 &&
RUN ldconfig

ENTRYPOINT ["/cpp-expanse/build/test/createRandomTest"]

4 changes: 0 additions & 4 deletions tests/files/ansible/test-files/docker-cppjit/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions tests/files/ansible/test-files/docker-go/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]
9 changes: 0 additions & 9 deletions tests/state_test_util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,13 @@ 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"
"github.com/expanse-org/go-expanse/core/types"
"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 {
Expand Down
8 changes: 1 addition & 7 deletions tests/transaction_test_util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
7 changes: 0 additions & 7 deletions tests/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
7 changes: 0 additions & 7 deletions tests/vm_test_util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 0 additions & 4 deletions trie/iterator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 0 additions & 5 deletions trie/proof.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 0 additions & 6 deletions trie/secure_trie.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-")
Expand Down
5 changes: 1 addition & 4 deletions trie/sync.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 0 additions & 6 deletions trie/trie.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down

0 comments on commit f536890

Please sign in to comment.