forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 07:06:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge continued

Browse source
This commit is contained in:
Christopher Franko 2017-03-29 19:48:35 -04:00
parent efc04c3cbd
commit f536890746
17 changed files with 3 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rpc/json.go
View file

@ -26,12 +26,7 @@ import (
"strings" "strings"
"sync" "sync"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/log"
>>>>>>> rebase-1.5.9
) )
const ( const (

6
rpc/server.go
View file

@ -24,13 +24,7 @@ import (
"sync" "sync"
"sync/atomic" "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" "github.com/expanse-org/go-expanse/log"
>>>>>>> rebase-1.5.9
"gopkg.in/fatih/set.v0" "gopkg.in/fatih/set.v0"
) )

5
rpc/websocket.go
View file

@ -27,12 +27,7 @@ import (
"strings" "strings"
"time" "time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/log"
>>>>>>> rebase-1.5.9
"golang.org/x/net/websocket" "golang.org/x/net/websocket"
"gopkg.in/fatih/set.v0" "gopkg.in/fatih/set.v0"
) )

5
tests/block_test.go
View file

@ -20,11 +20,6 @@ import (
"math/big" "math/big"
"path/filepath" "path/filepath"
"testing" "testing"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/params"
=======
>>>>>>> rebase-1.5.9
) )
func TestBcValidBlockTests(t *testing.T) { func TestBcValidBlockTests(t *testing.T) {

15
tests/block_test_util.go
View file

@ -26,27 +26,16 @@ import (
"strconv" "strconv"
"strings" "strings"
<<<<<<< HEAD
"github.com/expanse-org/ethash"
=======
>>>>>>> rebase-1.5.9
"github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/state" "github.com/expanse-org/go-expanse/core/state"
"github.com/expanse-org/go-expanse/core/types" "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/core/vm"
"github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event" "github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow" "github.com/expanse-org/go-expanse/pow"
>>>>>>> rebase-1.5.9
"github.com/expanse-org/go-expanse/rlp" "github.com/expanse-org/go-expanse/rlp"
) )
@ -253,11 +242,7 @@ func (t *BlockTest) InsertPreState(db ethdb.Database) (*state.StateDB, error) {
return statedb, nil 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 /* 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 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 blockHeader, transactions and uncleHeaders fields. If they are missing, the block is

5
tests/files/ansible/test-files/docker-cpp/Dockerfile
View file

@ -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 automake unzip libgmp-dev libtool libleveldb-dev yasm libminiupnpc-dev libreadline-dev scons
RUN apt-get install -qy libjsoncpp-dev libargtable2-dev 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 ) # 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 RUN apt-get install -qy libncurses5-dev
# Qt-based GUI # Qt-based GUI
@ -33,4 +29,3 @@ RUN cd cpp-expanse/build && cmake .. -DCMAKE_BUILD_TYPE=Release -DHEADLESS=1 &&
RUN ldconfig RUN ldconfig
ENTRYPOINT ["/cpp-expanse/build/test/createRandomTest"] ENTRYPOINT ["/cpp-expanse/build/test/createRandomTest"]

4
tests/files/ansible/test-files/docker-cppjit/Dockerfile
View file

@ -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 automake unzip libgmp-dev libtool libleveldb-dev yasm libminiupnpc-dev libreadline-dev scons
RUN apt-get install -qy libjsoncpp-dev libargtable2-dev 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 ) # 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 RUN apt-get install -qy libncurses5-dev
# Qt-based GUI # Qt-based GUI

4
tests/files/ansible/test-files/docker-go/Dockerfile
View file

@ -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 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 RUN go install -v ./cmd/ethtest
>>>>>>> rebase-1.5.9
ENTRYPOINT ["ethtest"] ENTRYPOINT ["ethtest"]

9
tests/state_test_util.go
View file

@ -26,14 +26,6 @@ import (
"testing" "testing"
"github.com/expanse-org/go-expanse/common" "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/common/math"
"github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/state" "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/ethdb"
"github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/params"
>>>>>>> rebase-1.5.9
) )
func RunStateTestWithReader(chainConfig *params.ChainConfig, r io.Reader, skipTests []string) error { func RunStateTestWithReader(chainConfig *params.ChainConfig, r io.Reader, skipTests []string) error {

8
tests/transaction_test_util.go
View file

@ -24,16 +24,10 @@ import (
"runtime" "runtime"
"github.com/expanse-org/go-expanse/common" "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/common/math"
"github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/log" "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" "github.com/expanse-org/go-expanse/rlp"
) )

7
tests/util.go
View file

@ -24,22 +24,15 @@ import (
"os" "os"
"github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common"
<<<<<<< HEAD
=======
"github.com/expanse-org/go-expanse/common/math" "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"
"github.com/expanse-org/go-expanse/core/state" "github.com/expanse-org/go-expanse/core/state"
"github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/core/vm" "github.com/expanse-org/go-expanse/core/vm"
"github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/ethdb" "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/log"
"github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/params"
>>>>>>> rebase-1.5.9
) )
var ( var (

7
tests/vm_test_util.go
View file

@ -25,19 +25,12 @@ import (
"testing" "testing"
"github.com/expanse-org/go-expanse/common" "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/common/math"
"github.com/expanse-org/go-expanse/core/state" "github.com/expanse-org/go-expanse/core/state"
"github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/core/vm" "github.com/expanse-org/go-expanse/core/vm"
"github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/log" "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"
) )

4
trie/iterator.go
View file

@ -16,14 +16,10 @@
package trie package trie
<<<<<<< HEAD
import "github.com/expanse-org/go-expanse/common"
=======
import ( import (
"bytes" "bytes"
"github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common"
) )
>>>>>>> rebase-1.5.9
// Iterator is a key-value trie iterator that traverses a Trie. // Iterator is a key-value trie iterator that traverses a Trie.
type Iterator struct { type Iterator struct {

5
trie/proof.go
View file

@ -23,12 +23,7 @@ import (
"github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/crypto/sha3" "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" "github.com/expanse-org/go-expanse/log"
>>>>>>> rebase-1.5.9
"github.com/expanse-org/go-expanse/rlp" "github.com/expanse-org/go-expanse/rlp"
) )

6
trie/secure_trie.go
View file

@ -17,16 +17,10 @@
package trie package trie
import ( 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" "fmt"
"github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/log"
>>>>>>> rebase-1.5.9
) )
var secureKeyPrefix = []byte("secure-key-") var secureKeyPrefix = []byte("secure-key-")

5
trie/sync.go
View file

@ -21,10 +21,7 @@ import (
"fmt" "fmt"
"github.com/expanse-org/go-expanse/common" "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" "gopkg.in/karalabe/cookiejar.v2/collections/prque"
) )

6
trie/trie.go
View file

@ -22,15 +22,9 @@ import (
"fmt" "fmt"
"github.com/expanse-org/go-expanse/common" "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/crypto/sha3"
"github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/log"
"github.com/rcrowley/go-metrics" "github.com/rcrowley/go-metrics"
>>>>>>> rebase-1.5.9
) )
var ( var (