diff --git a/crypto/secp256k1/secp256_test.go b/crypto/secp256k1/secp256_test.go index 957ec43be1..02394c5fce 100644 --- a/crypto/secp256k1/secp256_test.go +++ b/crypto/secp256k1/secp256_test.go @@ -24,12 +24,8 @@ import ( "encoding/hex" "testing" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/crypto/randentropy" -======= "github.com/expanse-org/go-expanse/common/math" "github.com/expanse-org/go-expanse/crypto/randentropy" ->>>>>>> refs/remotes/ethereum/master ) const TestCount = 1000 diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index 7b3e59ed34..7086048992 100644 --- a/crypto/signature_cgo.go +++ b/crypto/signature_cgo.go @@ -23,13 +23,8 @@ import ( "crypto/elliptic" "fmt" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/crypto/secp256k1" -======= "github.com/expanse-org/go-expanse/common/math" "github.com/expanse-org/go-expanse/crypto/secp256k1" ->>>>>>> refs/remotes/ethereum/master ) func Ecrecover(hash, sig []byte) ([]byte, error) { diff --git a/eth/api.go b/eth/api.go index 34141963c9..53b4a7cd28 100644 --- a/eth/api.go +++ b/eth/api.go @@ -30,23 +30,6 @@ import ( "strings" "time" -<<<<<<< HEAD - "github.com/ethereum/ethash" - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/common/hexutil" - "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/internal/ethapi" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/miner" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/rlp" - "github.com/expanse-org/go-expanse/rpc" - "golang.org/x/net/context" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/hexutil" "github.com/expanse-org/go-expanse/core" @@ -57,7 +40,6 @@ import ( "github.com/expanse-org/go-expanse/miner" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) const defaultTraceTimeout = 5 * time.Second diff --git a/eth/api_backend.go b/eth/api_backend.go index 3652c144bc..b61dea2910 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -20,22 +20,6 @@ import ( "context" "math/big" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/accounts" - "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" - "github.com/expanse-org/go-expanse/core/vm" - "github.com/expanse-org/go-expanse/eth/downloader" - "github.com/expanse-org/go-expanse/eth/gasprice" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/internal/ethapi" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/rpc" - "golang.org/x/net/context" -======= "github.com/expanse-org/go-expanse/accounts" "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/math" @@ -50,7 +34,6 @@ import ( "github.com/expanse-org/go-expanse/internal/ethapi" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master ) // EthApiBackend implements ethapi.Backend for full nodes diff --git a/eth/backend.go b/eth/backend.go index 0aa560a099..28f8f29f4a 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -24,28 +24,7 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/ethereum/ethash" - "github.com/expanse-org/go-expanse/accounts" - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/core/vm" - "github.com/expanse-org/go-expanse/eth/downloader" - "github.com/expanse-org/go-expanse/eth/filters" - "github.com/expanse-org/go-expanse/eth/gasprice" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/internal/ethapi" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/miner" - "github.com/expanse-org/go-expanse/node" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/pow" - "github.com/expanse-org/go-expanse/rpc" -======= + "github.com/expanse-org/go-expanse/accounts" "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" @@ -64,7 +43,6 @@ import ( "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/pow" "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master ) const ( @@ -208,32 +186,8 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { core.WriteBlockChainVersion(chainDb, core.BlockChainVersion) } -<<<<<<< HEAD - // load the genesis block or write a new one if no genesis - // block is prenent in the database. - genesis := core.GetBlock(chainDb, core.GetCanonicalHash(chainDb, 0), 0) - if genesis == nil { - genesis, err = core.WriteDefaultGenesisBlock(chainDb) - if err != nil { - return nil, err - } - glog.V(logger.Info).Infoln("WARNING: Wrote default expanse genesis block") - } - - if config.ChainConfig == nil { - return nil, errors.New("missing chain config") - } - core.WriteChainConfig(chainDb, genesis.Hash(), config.ChainConfig) - - eth.chainConfig = config.ChainConfig - - glog.V(logger.Info).Infoln("Chain config:", eth.chainConfig) - - eth.blockchain, err = core.NewBlockChain(chainDb, eth.chainConfig, eth.pow, eth.EventMux(), vm.Config{EnablePreimageRecording: config.EnablePreimageRecording}) -======= vmConfig := vm.Config{EnablePreimageRecording: config.EnablePreimageRecording} eth.blockchain, err = core.NewBlockChain(chainDb, eth.chainConfig, eth.pow, eth.eventMux, vmConfig) ->>>>>>> refs/remotes/ethereum/master if err != nil { return nil, err } diff --git a/eth/bad_block.go b/eth/bad_block.go index 7b3e91c2c5..d39f9b84ed 100644 --- a/eth/bad_block.go +++ b/eth/bad_block.go @@ -23,18 +23,10 @@ import ( "net/http" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/eth/bind.go b/eth/bind.go index 6d60cbff54..5b11413e37 100644 --- a/eth/bind.go +++ b/eth/bind.go @@ -20,7 +20,6 @@ import ( "context" "math/big" -<<<<<<< HEAD "github.com/expanse-org/go-expanse" "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/hexutil" @@ -28,16 +27,6 @@ import ( "github.com/expanse-org/go-expanse/internal/ethapi" "github.com/expanse-org/go-expanse/rlp" "github.com/expanse-org/go-expanse/rpc" - "golang.org/x/net/context" -======= - "github.com/expanse-org/go-expanse" - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/common/hexutil" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/internal/ethapi" - "github.com/expanse-org/go-expanse/rlp" - "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master ) // ContractBackend implements bind.ContractBackend with direct calls to Ethereum diff --git a/eth/db_upgrade.go b/eth/db_upgrade.go index 472a830be6..4d3192f282 100644 --- a/eth/db_upgrade.go +++ b/eth/db_upgrade.go @@ -24,22 +24,12 @@ import ( "math/big" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "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/rlp" ->>>>>>> refs/remotes/ethereum/master ) var useSequentialKeys = []byte("dbUpgrade_20160530sequentialKeys") diff --git a/eth/downloader/api.go b/eth/downloader/api.go index a156a388fb..05c6d88985 100644 --- a/eth/downloader/api.go +++ b/eth/downloader/api.go @@ -20,16 +20,9 @@ import ( "context" "sync" -<<<<<<< HEAD ethereum "github.com/expanse-org/go-expanse" "github.com/expanse-org/go-expanse/event" "github.com/expanse-org/go-expanse/rpc" - "golang.org/x/net/context" -======= - ethereum "github.com/expanse-org/go-expanse" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master ) // PublicDownloaderAPI provides an API which gives information about the current synchronisation status. diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index f336c9176c..580ccab63a 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -27,17 +27,6 @@ import ( "sync/atomic" "time" -<<<<<<< HEAD - ethereum "github.com/expanse-org/go-expanse" - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/trie" -======= ethereum "github.com/expanse-org/go-expanse" "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core/types" @@ -46,7 +35,6 @@ import ( "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/trie" ->>>>>>> refs/remotes/ethereum/master "github.com/rcrowley/go-metrics" ) diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index ec0aeebcee..8ddcd9509b 100644 --- a/eth/downloader/peer.go +++ b/eth/downloader/peer.go @@ -29,12 +29,8 @@ import ( "sync/atomic" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index 0cfbf4d5d2..7d99702e45 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -25,16 +25,6 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core/state" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/crypto" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/trie" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core/state" "github.com/expanse-org/go-expanse/core/types" @@ -42,7 +32,6 @@ import ( "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/trie" ->>>>>>> refs/remotes/ethereum/master "github.com/rcrowley/go-metrics" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/fetcher/fetcher.go b/eth/fetcher/fetcher.go index a5eee7d92b..a2764c5c50 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -22,18 +22,10 @@ import ( "math/rand" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/filters/api.go b/eth/filters/api.go index 8dae9e8b4b..f2b79c970c 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -25,23 +25,12 @@ import ( "sync" "time" -<<<<<<< HEAD - "golang.org/x/net/context" - "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/hexutil" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/event" "github.com/expanse-org/go-expanse/rpc" -======= - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/common/hexutil" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master ) var ( diff --git a/eth/filters/filter.go b/eth/filters/filter.go index e6336d7772..8de114d90a 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -22,22 +22,12 @@ import ( "math/big" "time" -<<<<<<< HEAD "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/event" "github.com/expanse-org/go-expanse/rpc" - "golang.org/x/net/context" -======= - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master ) type Backend interface { diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index 396caab2f6..add0d2a364 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -25,20 +25,11 @@ import ( "sync" "time" -<<<<<<< HEAD "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/event" "github.com/expanse-org/go-expanse/rpc" - "golang.org/x/net/context" -======= - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master ) // Type determines the kind of filter and is used to put the filter in to diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index 74bb988706..c475d60c40 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -23,9 +23,6 @@ import ( "testing" "time" -<<<<<<< HEAD - "golang.org/x/net/context" - "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" @@ -33,15 +30,6 @@ import ( "github.com/expanse-org/go-expanse/event" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/rpc" -======= - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master ) type testBackend struct { diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 18ce0fd80f..e5d93d365b 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -23,9 +23,6 @@ import ( "os" "testing" -<<<<<<< HEAD - "golang.org/x/net/context" - "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" @@ -33,15 +30,6 @@ import ( "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/event" "github.com/expanse-org/go-expanse/params" -======= - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "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/params" ->>>>>>> refs/remotes/ethereum/master ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index e0615146d8..2731ef642e 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -21,20 +21,11 @@ import ( "math/rand" "sync" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/event" "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/eth/gasprice/lightprice.go b/eth/gasprice/lightprice.go index f6150a7300..578fe4c2be 100644 --- a/eth/gasprice/lightprice.go +++ b/eth/gasprice/lightprice.go @@ -22,16 +22,9 @@ import ( "sort" "sync" -<<<<<<< HEAD "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/internal/ethapi" "github.com/expanse-org/go-expanse/rpc" - "golang.org/x/net/context" -======= - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/internal/ethapi" - "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/eth/handler.go b/eth/handler.go index 757fd8e5f4..af7f94aa1f 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -26,22 +26,6 @@ import ( "sync/atomic" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/eth/downloader" - "github.com/expanse-org/go-expanse/eth/fetcher" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/p2p/discover" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/pow" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" @@ -55,7 +39,6 @@ import ( "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/pow" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) const ( @@ -243,11 +226,7 @@ func (pm *ProtocolManager) Start() { } func (pm *ProtocolManager) Stop() { -<<<<<<< HEAD - glog.V(logger.Info).Infoln("Stopping expanse protocol handler...") -======= - log.Info("Stopping Ethereum protocol") ->>>>>>> refs/remotes/ethereum/master + log.Info("Stopping Expanse protocol") pm.txSub.Unsubscribe() // quits txBroadcastLoop pm.minedBlockSub.Unsubscribe() // quits blockBroadcastLoop @@ -268,11 +247,7 @@ func (pm *ProtocolManager) Stop() { // Wait for all peer handler goroutines and the loops to come down. pm.wg.Wait() -<<<<<<< HEAD - glog.V(logger.Info).Infoln("Expanse protocol handler stopped") -======= - log.Info("Ethereum protocol stopped") ->>>>>>> refs/remotes/ethereum/master + log.Info("Expanse protocol stopped") } func (pm *ProtocolManager) newPeer(pv int, p *p2p.Peer, rw p2p.MsgReadWriter) *peer { diff --git a/eth/handler_test.go b/eth/handler_test.go index 17c41509b3..d5878f2e90 100644 --- a/eth/handler_test.go +++ b/eth/handler_test.go @@ -23,19 +23,6 @@ import ( "testing" "time" -<<<<<<< HEAD - "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" - "github.com/expanse-org/go-expanse/core/vm" - "github.com/expanse-org/go-expanse/crypto" - "github.com/expanse-org/go-expanse/eth/downloader" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/params" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/state" @@ -48,7 +35,6 @@ import ( "github.com/expanse-org/go-expanse/p2p" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/pow" ->>>>>>> refs/remotes/ethereum/master ) var bigTxGas = new(big.Int).SetUint64(params.TxGas) diff --git a/eth/helper_test.go b/eth/helper_test.go index c9a772fd91..8bbe818e02 100644 --- a/eth/helper_test.go +++ b/eth/helper_test.go @@ -27,18 +27,6 @@ import ( "sync" "testing" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "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" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/p2p/discover" - "github.com/expanse-org/go-expanse/params" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" @@ -50,7 +38,6 @@ import ( "github.com/expanse-org/go-expanse/p2p/discover" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/pow" ->>>>>>> refs/remotes/ethereum/master ) var ( diff --git a/eth/peer.go b/eth/peer.go index 92110883d8..6ab6e33ce0 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -23,19 +23,10 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/p2p" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master "gopkg.in/fatih/set.v0" ) diff --git a/eth/sync.go b/eth/sync.go index 8bd37f1ca0..89b0397e4f 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -21,20 +21,11 @@ import ( "sync/atomic" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/eth/downloader" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p/discover" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/eth/downloader" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/p2p/discover" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index 93648ce85f..afa52243d4 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -23,22 +23,12 @@ import ( "fmt" "math/big" -<<<<<<< HEAD "github.com/expanse-org/go-expanse" "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/hexutil" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/rlp" "github.com/expanse-org/go-expanse/rpc" - "golang.org/x/net/context" -======= - "github.com/expanse-org/go-expanse" - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/common/hexutil" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/rlp" - "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethdb/database.go b/ethdb/database.go index 55cb6ffbbe..9de940c652 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -22,14 +22,8 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/metrics" -======= "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/metrics" ->>>>>>> refs/remotes/ethereum/master "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/filter" diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index 82e0fe84aa..49c9c22757 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -29,19 +29,6 @@ import ( "strconv" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/eth" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/les" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/node" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/rpc" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" @@ -52,7 +39,6 @@ import ( "github.com/expanse-org/go-expanse/node" "github.com/expanse-org/go-expanse/p2p" "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master "golang.org/x/net/websocket" ) diff --git a/event/subscription.go b/event/subscription.go index 578e2dd4c8..5074e2fad1 100644 --- a/event/subscription.go +++ b/event/subscription.go @@ -21,12 +21,7 @@ import ( "sync" "time" -<<<<<<< HEAD "github.com/expanse-org/go-expanse/common/mclock" - "golang.org/x/net/context" -======= - "github.com/expanse-org/go-expanse/common/mclock" ->>>>>>> refs/remotes/ethereum/master ) // Subscription represents a stream of events. The carrier of the events is typically a diff --git a/internal/debug/api.go b/internal/debug/api.go index fc79ae969c..046bdc8058 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -33,12 +33,7 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) // Handler is the global debugging handler. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 6d1f470132..0690ada39e 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -24,14 +24,9 @@ import ( "os" "runtime" -<<<<<<< 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/term" colorable "github.com/mattn/go-colorable" ->>>>>>> refs/remotes/ethereum/master "gopkg.in/urfave/cli.v1" ) diff --git a/internal/debug/trace.go b/internal/debug/trace.go index 7d3f47453c..d1a64570b0 100644 --- a/internal/debug/trace.go +++ b/internal/debug/trace.go @@ -23,12 +23,7 @@ import ( "os" "runtime/trace" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index d38ba56588..cbad871c3a 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -26,23 +26,6 @@ import ( "strings" "time" -<<<<<<< HEAD - "github.com/ethereum/ethash" - "github.com/expanse-org/go-expanse/accounts" - "github.com/expanse-org/go-expanse/accounts/keystore" - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/common/hexutil" - "github.com/expanse-org/go-expanse/core" - "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" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/rlp" - "github.com/expanse-org/go-expanse/rpc" -======= "github.com/expanse-org/go-expanse/accounts" "github.com/expanse-org/go-expanse/accounts/keystore" "github.com/expanse-org/go-expanse/common" @@ -59,7 +42,6 @@ import ( "github.com/expanse-org/go-expanse/pow" "github.com/expanse-org/go-expanse/rlp" "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index e1100d8d2b..76fcb9dbdf 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -21,7 +21,6 @@ import ( "context" "math/big" -<<<<<<< HEAD "github.com/expanse-org/go-expanse/accounts" "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" @@ -32,19 +31,6 @@ import ( "github.com/expanse-org/go-expanse/event" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/rpc" - "golang.org/x/net/context" -======= - "github.com/expanse-org/go-expanse/accounts" - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/core/vm" - "github.com/expanse-org/go-expanse/eth/downloader" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master ) // Backend interface provides the common API services (that are provided by diff --git a/les/api_backend.go b/les/api_backend.go index cf2614a831..1e11d5b403 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -20,22 +20,6 @@ import ( "context" "math/big" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/accounts" - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/core/vm" - "github.com/expanse-org/go-expanse/eth/downloader" - "github.com/expanse-org/go-expanse/eth/gasprice" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/internal/ethapi" - "github.com/expanse-org/go-expanse/light" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/rpc" - "golang.org/x/net/context" -======= "github.com/expanse-org/go-expanse/accounts" "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/math" @@ -50,7 +34,6 @@ import ( "github.com/expanse-org/go-expanse/light" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master ) type LesApiBackend struct { diff --git a/les/backend.go b/les/backend.go index 6040eeae21..2c9f07648a 100644 --- a/les/backend.go +++ b/les/backend.go @@ -21,29 +21,6 @@ import ( "fmt" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/accounts" - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/common/compiler" - "github.com/expanse-org/go-expanse/common/hexutil" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/eth" - "github.com/expanse-org/go-expanse/eth/downloader" - "github.com/expanse-org/go-expanse/eth/filters" - "github.com/expanse-org/go-expanse/eth/gasprice" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/internal/ethapi" - "github.com/expanse-org/go-expanse/light" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/node" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/pow" - rpc "github.com/expanse-org/go-expanse/rpc" -======= "github.com/expanse-org/go-expanse/accounts" "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/compiler" @@ -64,7 +41,6 @@ import ( "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/pow" rpc "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master ) type LightEthereum struct { diff --git a/les/fetcher.go b/les/fetcher.go index c3834ae27a..f53f3b1d0a 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -22,22 +22,12 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/common/mclock" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/light" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/mclock" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/light" "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/les/handler.go b/les/handler.go index 10657b1e7f..65526e77d3 100644 --- a/les/handler.go +++ b/les/handler.go @@ -26,25 +26,6 @@ import ( "sync" "time" -<<<<<<< HEAD - "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" - "github.com/expanse-org/go-expanse/eth" - "github.com/expanse-org/go-expanse/eth/downloader" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/p2p/discover" - "github.com/expanse-org/go-expanse/p2p/discv5" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/pow" - "github.com/expanse-org/go-expanse/rlp" - "github.com/expanse-org/go-expanse/trie" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/state" @@ -61,7 +42,6 @@ import ( "github.com/expanse-org/go-expanse/pow" "github.com/expanse-org/go-expanse/rlp" "github.com/expanse-org/go-expanse/trie" ->>>>>>> refs/remotes/ethereum/master ) const ( @@ -310,11 +290,7 @@ func (pm *ProtocolManager) Start(srvr *p2p.Server) { func (pm *ProtocolManager) Stop() { // Showing a log message. During download / process this could actually // take between 5 to 10 seconds and therefor feedback is required. -<<<<<<< HEAD - glog.V(logger.Info).Infoln("Stopping light expanse protocol handler...") -======= - log.Info("Stopping light Ethereum protocol") ->>>>>>> refs/remotes/ethereum/master + log.Info("Stopping light Expanse protocol") // Quit the sync loop. // After this send has completed, no new peers will be accepted. @@ -331,11 +307,7 @@ func (pm *ProtocolManager) Stop() { // Wait for any process action pm.wg.Wait() -<<<<<<< HEAD - glog.V(logger.Info).Infoln("Light expanse protocol handler stopped") -======= - log.Info("Light Ethereum protocol stopped") ->>>>>>> refs/remotes/ethereum/master + log.Info("Light Expanse protocol stopped") } func (pm *ProtocolManager) newPeer(pv, nv int, p *p2p.Peer, rw p2p.MsgReadWriter) *peer { diff --git a/les/helper_test.go b/les/helper_test.go index 795f5625aa..561d85d831 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -27,19 +27,6 @@ import ( "testing" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "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" - "github.com/expanse-org/go-expanse/les/flowcontrol" - "github.com/expanse-org/go-expanse/light" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/p2p/discover" - "github.com/expanse-org/go-expanse/params" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" @@ -53,7 +40,6 @@ import ( "github.com/expanse-org/go-expanse/p2p/discover" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/pow" ->>>>>>> refs/remotes/ethereum/master ) var ( diff --git a/les/odr.go b/les/odr.go index ab505046b4..bd2eb04e79 100644 --- a/les/odr.go +++ b/les/odr.go @@ -23,19 +23,10 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common/mclock" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/light" - "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/common/mclock" "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/light" "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) var ( diff --git a/les/odr_requests.go b/les/odr_requests.go index 8d6857ab13..a818a3ff55 100644 --- a/les/odr_requests.go +++ b/les/odr_requests.go @@ -23,18 +23,6 @@ import ( "errors" "fmt" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/crypto" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/light" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/rlp" - "github.com/expanse-org/go-expanse/trie" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" @@ -44,7 +32,6 @@ import ( "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/rlp" "github.com/expanse-org/go-expanse/trie" ->>>>>>> refs/remotes/ethereum/master ) var ( diff --git a/les/odr_test.go b/les/odr_test.go index 6ad3057465..18731830de 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -23,18 +23,6 @@ import ( "testing" "time" -<<<<<<< HEAD - "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" - "github.com/expanse-org/go-expanse/core/vm" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/light" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/rlp" - "golang.org/x/net/context" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/math" "github.com/expanse-org/go-expanse/core" @@ -45,7 +33,6 @@ import ( "github.com/expanse-org/go-expanse/light" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) type odrTestFn func(ctx context.Context, db ethdb.Database, config *params.ChainConfig, bc *core.BlockChain, lc *light.LightChain, bhash common.Hash) []byte diff --git a/les/peer.go b/les/peer.go index bfb394cdda..aaab1b0438 100644 --- a/les/peer.go +++ b/les/peer.go @@ -24,23 +24,12 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/eth" - "github.com/expanse-org/go-expanse/les/flowcontrol" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/eth" "github.com/expanse-org/go-expanse/les/flowcontrol" "github.com/expanse-org/go-expanse/p2p" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) var ( diff --git a/les/request_test.go b/les/request_test.go index 4a0406604d..72a00b5acd 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -21,20 +21,11 @@ import ( "testing" "time" -<<<<<<< HEAD "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/light" - "golang.org/x/net/context" -======= - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/crypto" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/light" ->>>>>>> refs/remotes/ethereum/master ) var testBankSecureTrieKey = secAddr(testBankAddress) diff --git a/les/server.go b/les/server.go index 0765aeeb4c..00b9b683d7 100644 --- a/les/server.go +++ b/les/server.go @@ -23,20 +23,6 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/eth" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/les/flowcontrol" - "github.com/expanse-org/go-expanse/light" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/rlp" - "github.com/expanse-org/go-expanse/trie" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" @@ -48,7 +34,6 @@ import ( "github.com/expanse-org/go-expanse/p2p" "github.com/expanse-org/go-expanse/rlp" "github.com/expanse-org/go-expanse/trie" ->>>>>>> refs/remotes/ethereum/master ) type LesServer struct { diff --git a/les/serverpool.go b/les/serverpool.go index dbd671f4ac..7af9fb9d21 100644 --- a/les/serverpool.go +++ b/les/serverpool.go @@ -27,16 +27,6 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common/mclock" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/p2p/discover" - "github.com/expanse-org/go-expanse/p2p/discv5" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common/mclock" "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/log" @@ -44,7 +34,6 @@ import ( "github.com/expanse-org/go-expanse/p2p/discover" "github.com/expanse-org/go-expanse/p2p/discv5" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/les/sync.go b/les/sync.go index b1de392b74..8790f44de1 100644 --- a/les/sync.go +++ b/les/sync.go @@ -20,16 +20,9 @@ import ( "context" "time" -<<<<<<< HEAD "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/eth/downloader" "github.com/expanse-org/go-expanse/light" - "golang.org/x/net/context" -======= - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/eth/downloader" - "github.com/expanse-org/go-expanse/light" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/light/lightchain.go b/light/lightchain.go index 1032192aad..cb21054548 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -23,18 +23,6 @@ import ( "sync/atomic" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/pow" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" @@ -44,7 +32,6 @@ import ( "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/pow" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master "github.com/hashicorp/golang-lru" ) @@ -109,15 +96,7 @@ func NewLightChain(odr OdrBackend, config *params.ChainConfig, pow pow.PoW, mux bc.genesisBlock, _ = bc.GetBlockByNumber(NoOdr, 0) if bc.genesisBlock == nil { -<<<<<<< HEAD - bc.genesisBlock, err = core.WriteDefaultGenesisBlock(odr.Database()) - if err != nil { - return nil, err - } - glog.V(logger.Info).Infoln("WARNING: Wrote default expanse genesis block") -======= return nil, core.ErrNoGenesis ->>>>>>> refs/remotes/ethereum/master } if bc.genesisBlock.Hash() == params.MainNetGenesisHash { diff --git a/light/lightchain_test.go b/light/lightchain_test.go index af2b688339..2513033828 100644 --- a/light/lightchain_test.go +++ b/light/lightchain_test.go @@ -22,8 +22,6 @@ import ( "math/big" "testing" -<<<<<<< HEAD - "github.com/ethereum/ethash" "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" @@ -31,17 +29,6 @@ import ( "github.com/expanse-org/go-expanse/event" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/pow" - "github.com/hashicorp/golang-lru" - "golang.org/x/net/context" -======= - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/pow" ->>>>>>> refs/remotes/ethereum/master ) // So we can deterministically seed different blockchains diff --git a/light/odr.go b/light/odr.go index dcbd8508c6..bc72d60b42 100644 --- a/light/odr.go +++ b/light/odr.go @@ -22,22 +22,12 @@ import ( "context" "math/big" -<<<<<<< HEAD "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/rlp" - "golang.org/x/net/context" -======= - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/crypto" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) // NoOdr is the default context passed to an ODR capable function when the ODR diff --git a/light/odr_test.go b/light/odr_test.go index 7ac7f76a90..23f7065d27 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -24,20 +24,6 @@ import ( "testing" "time" -<<<<<<< HEAD - "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" - "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/event" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/rlp" - "github.com/expanse-org/go-expanse/trie" - "golang.org/x/net/context" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/math" "github.com/expanse-org/go-expanse/core" @@ -51,7 +37,6 @@ import ( "github.com/expanse-org/go-expanse/pow" "github.com/expanse-org/go-expanse/rlp" "github.com/expanse-org/go-expanse/trie" ->>>>>>> refs/remotes/ethereum/master ) var ( diff --git a/light/odr_util.go b/light/odr_util.go index 6f2b6c9d16..5544c14712 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -22,24 +22,12 @@ import ( "errors" "math/big" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/crypto" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/rlp" - "golang.org/x/net/context" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) var sha3_nil = crypto.Keccak256Hash(nil) diff --git a/light/state.go b/light/state.go index 56aa1577e4..ba155b86a2 100644 --- a/light/state.go +++ b/light/state.go @@ -20,16 +20,8 @@ import ( "context" "math/big" -<<<<<<< HEAD "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/crypto" - "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/common" - "github.com/expanse-org/go-expanse/crypto" ->>>>>>> refs/remotes/ethereum/master ) // LightState is a memory representation of a state. diff --git a/light/state_object.go b/light/state_object.go index 6761807888..b1ddd6f8db 100644 --- a/light/state_object.go +++ b/light/state_object.go @@ -22,18 +22,9 @@ import ( "fmt" "math/big" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "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/rlp" - "golang.org/x/net/context" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/light/state_test.go b/light/state_test.go index dbacb69c80..fdf301d3f1 100644 --- a/light/state_test.go +++ b/light/state_test.go @@ -22,20 +22,11 @@ import ( "math/big" "testing" -<<<<<<< HEAD "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" "github.com/expanse-org/go-expanse/ethdb" - "golang.org/x/net/context" -======= - "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" - "github.com/expanse-org/go-expanse/ethdb" ->>>>>>> refs/remotes/ethereum/master ) func makeTestState() (common.Hash, ethdb.Database) { diff --git a/light/trie.go b/light/trie.go index 6ea975bba4..4d37560434 100644 --- a/light/trie.go +++ b/light/trie.go @@ -17,16 +17,10 @@ package light import ( -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/trie" - "golang.org/x/net/context" -======= "context" "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/trie" ->>>>>>> refs/remotes/ethereum/master ) // LightTrie is an ODR-capable wrapper around trie.SecureTrie diff --git a/light/txpool.go b/light/txpool.go index 1ef26f1757..9f0206b261 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -22,18 +22,6 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/rlp" - "golang.org/x/net/context" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" @@ -42,7 +30,6 @@ import ( "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) // txPermanent is the number of mined blocks after a mined transaction is diff --git a/light/txpool_test.go b/light/txpool_test.go index 0931fb2ff1..cfd29bc01a 100644 --- a/light/txpool_test.go +++ b/light/txpool_test.go @@ -23,16 +23,6 @@ import ( "testing" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core" - "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/event" - "github.com/expanse-org/go-expanse/params" - "golang.org/x/net/context" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/types" @@ -41,7 +31,6 @@ import ( "github.com/expanse-org/go-expanse/event" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/pow" ->>>>>>> refs/remotes/ethereum/master ) type testTxRelay struct { diff --git a/light/vm_env.go b/light/vm_env.go index 3030cb1341..d75a910dda 100644 --- a/light/vm_env.go +++ b/light/vm_env.go @@ -20,17 +20,9 @@ import ( "context" "math/big" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/core/vm" - "github.com/expanse-org/go-expanse/crypto" - "golang.org/x/net/context" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/crypto" ->>>>>>> refs/remotes/ethereum/master ) // VMState is a wrapper for the light state that holds the actual context and diff --git a/metrics/metrics.go b/metrics/metrics.go index 781e1231ba..daa555a9b7 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -23,12 +23,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" ->>>>>>> refs/remotes/ethereum/master "github.com/rcrowley/go-metrics" "github.com/rcrowley/go-metrics/exp" ) diff --git a/miner/agent.go b/miner/agent.go index 1679a97901..6a3e11dea5 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -22,18 +22,10 @@ import ( "sync/atomic" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/pow" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/pow" ->>>>>>> refs/remotes/ethereum/master ) type CpuAgent struct { diff --git a/miner/miner.go b/miner/miner.go index 411aa5a028..e816f6a668 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -22,20 +22,6 @@ import ( "math/big" "sync/atomic" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/accounts" - "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" - "github.com/expanse-org/go-expanse/eth/downloader" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/pow" -======= "github.com/expanse-org/go-expanse/accounts" "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" @@ -47,7 +33,6 @@ import ( "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/pow" ->>>>>>> refs/remotes/ethereum/master ) // Backend wraps all methods required for mining. diff --git a/miner/remote_agent.go b/miner/remote_agent.go index 0ac6edf8af..4266912882 100644 --- a/miner/remote_agent.go +++ b/miner/remote_agent.go @@ -24,19 +24,10 @@ import ( "sync/atomic" "time" -<<<<<<< HEAD - "github.com/ethereum/ethash" - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/pow" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/pow" ->>>>>>> refs/remotes/ethereum/master ) type hashrate struct { diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index 3ec9d986be..0214f7bb91 100644 --- a/miner/unconfirmed.go +++ b/miner/unconfirmed.go @@ -21,16 +21,9 @@ import ( "fmt" "sync" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) // headerRetriever is used by the unconfirmed block set to verify whether a previously diff --git a/miner/worker.go b/miner/worker.go index 18a5bcacd3..860d5022a1 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -24,20 +24,6 @@ import ( "sync/atomic" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/accounts" - "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" - "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/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/pow" -======= "github.com/expanse-org/go-expanse/accounts" "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" @@ -49,7 +35,6 @@ import ( "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/pow" ->>>>>>> refs/remotes/ethereum/master "gopkg.in/fatih/set.v0" ) diff --git a/mobile/geth.go b/mobile/geth.go index 17d9a99bce..69b82347c0 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -25,17 +25,6 @@ import ( "math/big" "path/filepath" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/eth" - "github.com/expanse-org/go-expanse/ethclient" - "github.com/expanse-org/go-expanse/ethstats" - "github.com/expanse-org/go-expanse/les" - "github.com/expanse-org/go-expanse/node" - "github.com/expanse-org/go-expanse/p2p/nat" - "github.com/expanse-org/go-expanse/params" - whisper "github.com/expanse-org/go-expanse/whisper/whisperv2" -======= "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/eth" "github.com/expanse-org/go-expanse/ethclient" @@ -45,7 +34,6 @@ import ( "github.com/expanse-org/go-expanse/p2p/nat" "github.com/expanse-org/go-expanse/params" whisper "github.com/expanse-org/go-expanse/whisper/whisperv2" ->>>>>>> refs/remotes/ethereum/master ) // NodeConfig represents the collection of configuration values to fine tune the Gexp @@ -106,9 +94,6 @@ func NewNodeConfig() *NodeConfig { return &config } -<<<<<<< HEAD -// Node represents a Gexp Ethereum node instance. -======= // SetMainnet sets up the node for use on the Ethereum mainnet. func (cfg *NodeConfig) SetMainnet() { cfg.EthereumGenesis = "" @@ -122,7 +107,6 @@ func (cfg *NodeConfig) SetTestnet() { } // Node represents a Geth Ethereum node instance. ->>>>>>> refs/remotes/ethereum/master type Node struct { node *node.Node } diff --git a/mobile/init.go b/mobile/init.go index f4a899bfad..f00eec7335 100644 --- a/mobile/init.go +++ b/mobile/init.go @@ -22,12 +22,7 @@ import ( "os" "runtime" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) func init() { diff --git a/mobile/logger.go b/mobile/logger.go index 487f790aba..c3d74ffd26 100644 --- a/mobile/logger.go +++ b/mobile/logger.go @@ -17,13 +17,9 @@ package gexp import ( -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger/glog" -======= "os" "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) // SetVerbosity sets the global verbosity level (between 0 and 6 - see logger/verbosity.go). diff --git a/mobile/params.go b/mobile/params.go index 78d8e2f546..aa12e3ebc7 100644 --- a/mobile/params.go +++ b/mobile/params.go @@ -19,17 +19,11 @@ package gexp import ( -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/core" - "github.com/expanse-org/go-expanse/p2p/discv5" - "github.com/expanse-org/go-expanse/params" -======= "encoding/json" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/p2p/discv5" "github.com/expanse-org/go-expanse/params" ->>>>>>> refs/remotes/ethereum/master ) // MainnetChainConfig returns the chain configurations for the main Ethereum network. diff --git a/node/config.go b/node/config.go index af68f38e4b..1f74c75bc9 100644 --- a/node/config.go +++ b/node/config.go @@ -26,19 +26,6 @@ import ( "runtime" "strings" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/accounts" - "github.com/expanse-org/go-expanse/accounts/keystore" - "github.com/expanse-org/go-expanse/accounts/usbwallet" - "github.com/expanse-org/go-expanse/common" - "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/p2p/discover" - "github.com/expanse-org/go-expanse/p2p/discv5" - "github.com/expanse-org/go-expanse/p2p/nat" - "github.com/expanse-org/go-expanse/p2p/netutil" -======= "github.com/expanse-org/go-expanse/accounts" "github.com/expanse-org/go-expanse/accounts/keystore" "github.com/expanse-org/go-expanse/accounts/usbwallet" @@ -49,7 +36,6 @@ import ( "github.com/expanse-org/go-expanse/p2p/discv5" "github.com/expanse-org/go-expanse/p2p/nat" "github.com/expanse-org/go-expanse/p2p/netutil" ->>>>>>> refs/remotes/ethereum/master ) var ( diff --git a/node/node.go b/node/node.go index 11f07fe9fe..52ecd26c70 100644 --- a/node/node.go +++ b/node/node.go @@ -27,16 +27,6 @@ import ( "sync" "syscall" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/accounts" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/event" - "github.com/expanse-org/go-expanse/internal/debug" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/rpc" -======= "github.com/expanse-org/go-expanse/accounts" "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/event" @@ -44,7 +34,6 @@ import ( "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/p2p" "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master "github.com/syndtr/goleveldb/leveldb/storage" ) diff --git a/p2p/dial.go b/p2p/dial.go index 7a5a9f3e5b..5cb88c15f2 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -24,16 +24,9 @@ import ( "net" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p/discover" - "github.com/expanse-org/go-expanse/p2p/netutil" -======= "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/p2p/discover" "github.com/expanse-org/go-expanse/p2p/netutil" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/p2p/discover/database.go b/p2p/discover/database.go index aae6b4aba3..0a703e05ec 100644 --- a/p2p/discover/database.go +++ b/p2p/discover/database.go @@ -27,16 +27,9 @@ import ( "sync" "time" -<<<<<<< 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/rlp" -======= "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index de1407f8fe..88422bd664 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -25,12 +25,7 @@ import ( "sort" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index cada603d92..54bb79b4b7 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -32,16 +32,9 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "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/common" "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index e0fa404475..ac06eb845e 100644 --- a/p2p/discover/udp.go +++ b/p2p/discover/udp.go @@ -25,20 +25,11 @@ import ( "net" "time" -<<<<<<< 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/p2p/nat" - "github.com/expanse-org/go-expanse/p2p/netutil" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/p2p/nat" "github.com/expanse-org/go-expanse/p2p/netutil" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) const Version = 4 diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go index 94b15a8385..cffd69a2f5 100644 --- a/p2p/discv5/database.go +++ b/p2p/discv5/database.go @@ -28,16 +28,9 @@ import ( "sync" "time" -<<<<<<< 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/rlp" -======= "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go index db9339514c..a53cf0e7b1 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -24,17 +24,6 @@ import ( "net" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/common/mclock" - "github.com/expanse-org/go-expanse/crypto" - "github.com/expanse-org/go-expanse/crypto/sha3" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p/nat" - "github.com/expanse-org/go-expanse/p2p/netutil" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/mclock" "github.com/expanse-org/go-expanse/crypto" @@ -43,7 +32,6 @@ import ( "github.com/expanse-org/go-expanse/p2p/nat" "github.com/expanse-org/go-expanse/p2p/netutil" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) var ( diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index 7af9bbc085..3ac2b8b459 100644 --- a/p2p/discv5/ntp.go +++ b/p2p/discv5/ntp.go @@ -26,12 +26,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" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index 4e90892c2a..fb39196e92 100644 --- a/p2p/discv5/udp.go +++ b/p2p/discv5/udp.go @@ -24,22 +24,12 @@ import ( "net" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "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/p2p/nat" - "github.com/expanse-org/go-expanse/p2p/netutil" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/p2p/nat" "github.com/expanse-org/go-expanse/p2p/netutil" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) const Version = 4 diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index 8f7a5da80e..23275d24be 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -25,12 +25,8 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= + "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master "github.com/jackpal/go-nat-pmp" ) diff --git a/p2p/peer.go b/p2p/peer.go index 91b78e27e0..d5e6146d89 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -24,17 +24,10 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p/discover" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common/mclock" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/p2p/discover" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/p2p/server.go b/p2p/server.go index e4411e3f76..cb4693f2b4 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -25,14 +25,6 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p/discover" - "github.com/expanse-org/go-expanse/p2p/discv5" - "github.com/expanse-org/go-expanse/p2p/nat" - "github.com/expanse-org/go-expanse/p2p/netutil" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/mclock" "github.com/expanse-org/go-expanse/log" @@ -40,7 +32,6 @@ import ( "github.com/expanse-org/go-expanse/p2p/discv5" "github.com/expanse-org/go-expanse/p2p/nat" "github.com/expanse-org/go-expanse/p2p/netutil" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/params/bootnodes.go b/params/bootnodes.go index 52b74248fd..902ef9c257 100644 --- a/params/bootnodes.go +++ b/params/bootnodes.go @@ -19,7 +19,6 @@ package params // MainnetBootnodes are the enode URLs of the P2P bootstrap nodes running on // the main Ethereum network. var MainnetBootnodes = []string{ -<<<<<<< HEAD // EXP/DEV Go Bootnodes "enode://7f335a047654f3e70d6f91312a7cf89c39704011f1a584e2698250db3d63817e74b88e26b7854111e16b2c9d0c7173c05419aeee2d0321850227b126d8b1be3f@46.101.156.249:42786", "enode://df872f81e25f72356152b44cab662caf1f2e57c3a156ecd20e9ac9246272af68a2031b4239a0bc831f2c6ab34733a041464d46b3ea36dce88d6c11714446e06b@178.62.208.109:42786", @@ -28,19 +27,6 @@ var MainnetBootnodes = []string{ "enode://d33a8d4c2c38a08971ed975b750f21d54c927c0bf7415931e214465a8d01651ecffe4401e1db913f398383381413c78105656d665d83f385244ab302d6138414@128.199.183.48:42786", "enode://df872f81e25f72356152b44cab662caf1f2e57c3a156ecd20e9ac9246272af68a2031b4239a0bc831f2c6ab34733a041464d46b3ea36dce88d6c11714446e06b@178.62.208.109:42786", "enode://f6f0d6b9b7d02ec9e8e4a16e38675f3621ea5e69860c739a65c1597ca28aefb3cec7a6d84e471ac927d42a1b64c1cbdefad75e7ce8872d57548ddcece20afdd1@159.203.64.95:42786", -======= - - // Ethereum Foundation Go Bootnodes - "enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303", // IE - "enode://3f1d12044546b76342d59d4a05532c14b85aa669704bfe1f864fe079415aa2c02d743e03218e57a33fb94523adb54032871a6c51b2cc5514cb7c7e35b3ed0a99@13.93.211.84:30303", // US-WEST - "enode://78de8a0916848093c73790ead81d1928bec737d565119932b98c6b100d944b7a95e94f847f689fc723399d2e31129d182f7ef3863f2b4c820abbf3ab2722344d@191.235.84.50:30303", // BR - "enode://158f8aab45f6d19c6cbf4a089c2670541a8da11978a2f90dbf6a502a4a3bab80d288afdbeb7ec0ef6d92de563767f3b1ea9e8e334ca711e9f8e2df5a0385e8e6@13.75.154.138:30303", // AU - "enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303", // SG - - // Ethereum Foundation Cpp Bootnodes - "enode://979b7fa28feeb35a4741660a16076f1943202cb72b6af70d327f053e248bab9ba81760f39d0701ef1d8f89cc1fbd2cacba0710a12cd5314d5e0c9021aa3637f9@5.1.83.226:30303", // DE - ->>>>>>> refs/remotes/ethereum/master } // TestnetBootnodes are the enode URLs of the P2P bootstrap nodes running on the diff --git a/params/config.go b/params/config.go index 7d5aed1680..250033d2a4 100644 --- a/params/config.go +++ b/params/config.go @@ -23,37 +23,12 @@ import ( "github.com/expanse-org/go-expanse/common" ) -<<<<<<< HEAD -// MainnetChainConfig is the chain parameters to run a node on the main network. -var MainnetChainConfig = &ChainConfig{ - ChainId: MainNetChainID, - HomesteadBlock: MainNetHomesteadBlock, - DAOForkBlock: nil, - DAOForkSupport: false, - EIP150Block: MainNetHomesteadGasRepriceBlock, - EIP150Hash: MainNetHomesteadGasRepriceHash, - EIP155Block: MainNetSpuriousDragon, - EIP158Block: MainNetSpuriousDragon, -} - -// TestnetChainConfig is the chain parameters to run a node on the test network. -var TestnetChainConfig = &ChainConfig{ - ChainId: big.NewInt(3), - HomesteadBlock: big.NewInt(0), - DAOForkBlock: nil, - DAOForkSupport: false, - EIP150Block: big.NewInt(0), - EIP150Hash: common.HexToHash("0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d"), - EIP155Block: big.NewInt(10), - EIP158Block: big.NewInt(10), -} -======= var ( // MainnetChainConfig is the chain parameters to run a node on the main network. MainnetChainConfig = &ChainConfig{ ChainId: MainNetChainID, HomesteadBlock: MainNetHomesteadBlock, - DAOForkBlock: MainNetDAOForkBlock, + DAOForkBlock: nil, DAOForkSupport: true, EIP150Block: MainNetHomesteadGasRepriceBlock, EIP150Hash: MainNetHomesteadGasRepriceHash, @@ -85,7 +60,6 @@ var ( AllProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0)} TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0)} ) ->>>>>>> refs/remotes/ethereum/master // ChainConfig is the core config which determines the blockchain settings. // diff --git a/rpc/client.go b/rpc/client.go index 52c43573ea..9cb45413e7 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -31,13 +31,7 @@ import ( "sync/atomic" "time" -<<<<<<< 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" ->>>>>>> refs/remotes/ethereum/master ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index c8c867efea..3f50e5d871 100644 --- a/rpc/client_example_test.go +++ b/rpc/client_example_test.go @@ -22,12 +22,7 @@ import ( "math/big" "time" -<<<<<<< HEAD "github.com/expanse-org/go-expanse/rpc" - "golang.org/x/net/context" -======= - "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master ) // In this example, our client whishes to track the latest 'block number' diff --git a/rpc/client_test.go b/rpc/client_test.go index c2583bd04b..177d5671ba 100644 --- a/rpc/client_test.go +++ b/rpc/client_test.go @@ -31,13 +31,7 @@ import ( "time" "github.com/davecgh/go-spew/spew" -<<<<<<< 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" ->>>>>>> refs/remotes/ethereum/master ) func TestClientRequest(t *testing.T) { diff --git a/rpc/ipc.go b/rpc/ipc.go index 7e5c86493c..b20550fa24 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -21,13 +21,7 @@ import ( "fmt" "net" -<<<<<<< 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" ->>>>>>> refs/remotes/ethereum/master ) // CreateIPCListener creates an listener, on Unix platforms this is a unix socket, on diff --git a/rpc/json.go b/rpc/json.go index bb3ea433d6..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" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/rpc/server.go b/rpc/server.go index bf30a704dd..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" ->>>>>>> refs/remotes/ethereum/master "gopkg.in/fatih/set.v0" ) diff --git a/rpc/websocket.go b/rpc/websocket.go index 0d4291ab1a..3995bb8060 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -27,13 +27,7 @@ import ( "strings" "time" -<<<<<<< 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" ->>>>>>> refs/remotes/ethereum/master "golang.org/x/net/websocket" "gopkg.in/fatih/set.v0" ) diff --git a/swarm/api/api.go b/swarm/api/api.go index 7a673d1ca5..35dfbdf84c 100644 --- a/swarm/api/api.go +++ b/swarm/api/api.go @@ -24,16 +24,9 @@ import ( "strings" "sync" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/swarm/storage" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/swarm/storage" ->>>>>>> refs/remotes/ethereum/master ) var ( diff --git a/swarm/api/api_test.go b/swarm/api/api_test.go index 17ce09257e..c46e7a597c 100644 --- a/swarm/api/api_test.go +++ b/swarm/api/api_test.go @@ -23,14 +23,8 @@ import ( "os" "testing" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/swarm/storage" -======= "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/swarm/storage" ->>>>>>> refs/remotes/ethereum/master ) func testApi(t *testing.T, f func(*Api)) { diff --git a/swarm/api/filesystem.go b/swarm/api/filesystem.go index 1a3be2691d..f2f4450df5 100644 --- a/swarm/api/filesystem.go +++ b/swarm/api/filesystem.go @@ -25,16 +25,9 @@ import ( "path/filepath" "sync" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/swarm/storage" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/swarm/storage" ->>>>>>> refs/remotes/ethereum/master ) const maxParallelFiles = 5 diff --git a/swarm/api/http/roundtripper.go b/swarm/api/http/roundtripper.go index 2787f9d0c5..a594b14784 100644 --- a/swarm/api/http/roundtripper.go +++ b/swarm/api/http/roundtripper.go @@ -20,12 +20,7 @@ import ( "fmt" "net/http" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) /* diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go index c5cb6f1ae6..470e355aac 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -29,18 +29,10 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/swarm/api" - "github.com/expanse-org/go-expanse/swarm/storage" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/swarm/api" "github.com/expanse-org/go-expanse/swarm/storage" ->>>>>>> refs/remotes/ethereum/master "github.com/rs/cors" ) diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go index edc1da4390..2e86f4e1bf 100644 --- a/swarm/api/manifest.go +++ b/swarm/api/manifest.go @@ -22,16 +22,9 @@ import ( "fmt" "sync" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/swarm/storage" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/swarm/storage" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/swarm/api/swarmfs.go b/swarm/api/swarmfs.go index ea699276cf..8427d3c5b1 100644 --- a/swarm/api/swarmfs.go +++ b/swarm/api/swarmfs.go @@ -21,15 +21,10 @@ import ( "sync" ) -<<<<<<< HEAD:pow/block.go - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core/types" -======= const ( Swarmfs_Version = "0.1" mountTimeout = time.Second * 5 maxFuseMounts = 5 ->>>>>>> refs/remotes/ethereum/master:swarm/api/swarmfs.go ) diff --git a/swarm/network/depo.go b/swarm/network/depo.go index 821880510f..ad70658684 100644 --- a/swarm/network/depo.go +++ b/swarm/network/depo.go @@ -22,14 +22,8 @@ import ( "fmt" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/swarm/storage" -======= "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/swarm/storage" ->>>>>>> refs/remotes/ethereum/master ) // Handler for storage/retrieval related protocol requests diff --git a/swarm/network/forwarding.go b/swarm/network/forwarding.go index 0344e57129..6e1c7d1fbc 100644 --- a/swarm/network/forwarding.go +++ b/swarm/network/forwarding.go @@ -21,14 +21,8 @@ import ( "math/rand" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/swarm/storage" -======= "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/swarm/storage" ->>>>>>> refs/remotes/ethereum/master ) const requesterCount = 3 diff --git a/swarm/network/hive.go b/swarm/network/hive.go index 9f31b17c27..d1112741f5 100644 --- a/swarm/network/hive.go +++ b/swarm/network/hive.go @@ -22,22 +22,12 @@ import ( "path/filepath" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p/discover" - "github.com/expanse-org/go-expanse/p2p/netutil" - "github.com/expanse-org/go-expanse/swarm/network/kademlia" - "github.com/expanse-org/go-expanse/swarm/storage" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/p2p/discover" "github.com/expanse-org/go-expanse/p2p/netutil" "github.com/expanse-org/go-expanse/swarm/network/kademlia" "github.com/expanse-org/go-expanse/swarm/storage" ->>>>>>> refs/remotes/ethereum/master ) // Hive is the logistic manager of the swarm diff --git a/swarm/network/kademlia/kaddb.go b/swarm/network/kademlia/kaddb.go index 902f100d13..9e8d1ce5dc 100644 --- a/swarm/network/kademlia/kaddb.go +++ b/swarm/network/kademlia/kaddb.go @@ -24,12 +24,7 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) type NodeData interface { diff --git a/swarm/network/kademlia/kademlia.go b/swarm/network/kademlia/kademlia.go index 18d9337672..d37640bb92 100644 --- a/swarm/network/kademlia/kademlia.go +++ b/swarm/network/kademlia/kademlia.go @@ -23,12 +23,7 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go index cdc9fe03bc..c6c0ccac40 100644 --- a/swarm/network/protocol.go +++ b/swarm/network/protocol.go @@ -37,17 +37,6 @@ import ( "strconv" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/contracts/chequebook" - "github.com/expanse-org/go-expanse/errs" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/p2p/discover" - bzzswap "github.com/expanse-org/go-expanse/swarm/services/swap" - "github.com/expanse-org/go-expanse/swarm/services/swap/swap" - "github.com/expanse-org/go-expanse/swarm/storage" -======= "github.com/expanse-org/go-expanse/contracts/chequebook" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/p2p" @@ -55,7 +44,6 @@ import ( bzzswap "github.com/expanse-org/go-expanse/swarm/services/swap" "github.com/expanse-org/go-expanse/swarm/services/swap/swap" "github.com/expanse-org/go-expanse/swarm/storage" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/swarm/network/syncdb.go b/swarm/network/syncdb.go index 57c663a58d..d78e1f2cc0 100644 --- a/swarm/network/syncdb.go +++ b/swarm/network/syncdb.go @@ -20,14 +20,8 @@ import ( "encoding/binary" "fmt" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/swarm/storage" -======= "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/swarm/storage" ->>>>>>> refs/remotes/ethereum/master "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" ) diff --git a/swarm/network/syncdb_test.go b/swarm/network/syncdb_test.go index d2bd99326f..071a492a6f 100644 --- a/swarm/network/syncdb_test.go +++ b/swarm/network/syncdb_test.go @@ -25,16 +25,9 @@ import ( "testing" "time" -<<<<<<< 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/swarm/storage" -======= "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/swarm/storage" ->>>>>>> refs/remotes/ethereum/master ) func init() { diff --git a/swarm/network/syncer.go b/swarm/network/syncer.go index d6479602d2..9584608281 100644 --- a/swarm/network/syncer.go +++ b/swarm/network/syncer.go @@ -22,14 +22,8 @@ import ( "fmt" "path/filepath" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/swarm/storage" -======= "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/swarm/storage" ->>>>>>> refs/remotes/ethereum/master ) // syncer parameters (global, not peer specific) default values diff --git a/swarm/services/swap/swap.go b/swarm/services/swap/swap.go index f6ec0ed7ac..0f0f1e9d80 100644 --- a/swarm/services/swap/swap.go +++ b/swarm/services/swap/swap.go @@ -26,18 +26,6 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/accounts/abi/bind" - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/contracts/chequebook" - "github.com/expanse-org/go-expanse/contracts/chequebook/contract" - "github.com/expanse-org/go-expanse/core/types" - "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/swarm/services/swap/swap" - "golang.org/x/net/context" -======= "github.com/expanse-org/go-expanse/accounts/abi/bind" "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/contracts/chequebook" @@ -46,7 +34,6 @@ import ( "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/swarm/services/swap/swap" ->>>>>>> refs/remotes/ethereum/master ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/services/swap/swap/swap.go b/swarm/services/swap/swap/swap.go index 42399af507..1b7d885861 100644 --- a/swarm/services/swap/swap/swap.go +++ b/swarm/services/swap/swap/swap.go @@ -22,13 +22,7 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go index 7848be66d0..fdb1c857ce 100644 --- a/swarm/storage/common_test.go +++ b/swarm/storage/common_test.go @@ -24,12 +24,7 @@ import ( "sync" "testing" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) type brokenLimitedReader struct { diff --git a/swarm/storage/dbstore.go b/swarm/storage/dbstore.go index 473ea2e107..f7f6b0b246 100644 --- a/swarm/storage/dbstore.go +++ b/swarm/storage/dbstore.go @@ -28,14 +28,8 @@ import ( "fmt" "sync" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" ) diff --git a/swarm/storage/dpa.go b/swarm/storage/dpa.go index 5a43070fd6..d3dbc65b7b 100644 --- a/swarm/storage/dpa.go +++ b/swarm/storage/dpa.go @@ -23,12 +23,7 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) /* diff --git a/swarm/storage/memstore.go b/swarm/storage/memstore.go index df82ed2814..5393ffcb68 100644 --- a/swarm/storage/memstore.go +++ b/swarm/storage/memstore.go @@ -22,12 +22,7 @@ import ( "fmt" "sync" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) const ( diff --git a/swarm/storage/netstore.go b/swarm/storage/netstore.go index b88b303350..90252a7785 100644 --- a/swarm/storage/netstore.go +++ b/swarm/storage/netstore.go @@ -22,12 +22,7 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) /* diff --git a/swarm/swarm.go b/swarm/swarm.go index 0d8760b5c9..df4b49c249 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -22,24 +22,6 @@ import ( "crypto/ecdsa" "fmt" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/accounts/abi/bind" - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/contracts/chequebook" - "github.com/expanse-org/go-expanse/contracts/ens" - "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/node" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/p2p/discover" - "github.com/expanse-org/go-expanse/rpc" - "github.com/expanse-org/go-expanse/swarm/api" - httpapi "github.com/expanse-org/go-expanse/swarm/api/http" - "github.com/expanse-org/go-expanse/swarm/network" - "github.com/expanse-org/go-expanse/swarm/storage" - "golang.org/x/net/context" -======= "github.com/expanse-org/go-expanse/accounts/abi/bind" "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/contracts/chequebook" @@ -54,7 +36,6 @@ import ( httpapi "github.com/expanse-org/go-expanse/swarm/api/http" "github.com/expanse-org/go-expanse/swarm/network" "github.com/expanse-org/go-expanse/swarm/storage" ->>>>>>> refs/remotes/ethereum/master ) // the swarm stack diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 15646498f6..013767fd14 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -26,20 +26,6 @@ import ( "strconv" "strings" -<<<<<<< HEAD - "github.com/ethereum/ethash" - "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" - "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/event" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/core" "github.com/expanse-org/go-expanse/core/state" @@ -51,7 +37,6 @@ import ( "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/pow" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) // Block Test JSON Format diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 0d77e46480..bfcadea773 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -25,15 +25,6 @@ import ( "strings" "testing" -<<<<<<< HEAD - "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" - "github.com/expanse-org/go-expanse/ethdb" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/params" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/math" "github.com/expanse-org/go-expanse/core" @@ -42,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" ->>>>>>> refs/remotes/ethereum/master ) 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 837daf4d1e..83a5a542bc 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -23,20 +23,12 @@ import ( "io" "runtime" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/core/types" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/params" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/math" "github.com/expanse-org/go-expanse/core/types" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/params" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) // Transaction Test JSON Format diff --git a/tests/util.go b/tests/util.go index 4987b2b1ff..4f7672e41f 100644 --- a/tests/util.go +++ b/tests/util.go @@ -23,17 +23,6 @@ import ( "math/big" "os" -<<<<<<< HEAD - "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" - "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/params" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/math" "github.com/expanse-org/go-expanse/core" diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index 894917cde1..147a750746 100644 --- a/tests/vm_test_util.go +++ b/tests/vm_test_util.go @@ -24,15 +24,6 @@ import ( "strconv" "testing" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "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/logger/glog" - "github.com/expanse-org/go-expanse/params" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/math" "github.com/expanse-org/go-expanse/core/state" @@ -41,7 +32,6 @@ import ( "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/params" ->>>>>>> refs/remotes/ethereum/master ) func RunVmTestWithReader(r io.Reader, skipTests []string) error { diff --git a/trie/iterator.go b/trie/iterator.go index 0f94099887..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" ) ->>>>>>> refs/remotes/ethereum/master // 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 ac8a28d043..dfbd23db67 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -21,18 +21,10 @@ import ( "errors" "fmt" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/crypto/sha3" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/crypto/sha3" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) // Prove constructs a merkle proof for key. The result contains all diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 6e975bb774..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" ->>>>>>> refs/remotes/ethereum/master ) var secureKeyPrefix = []byte("secure-key-") diff --git a/trie/trie.go b/trie/trie.go index ad6e993e37..26f98b615e 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -21,16 +21,9 @@ import ( "bytes" "fmt" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/crypto/sha3" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/crypto/sha3" "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master "github.com/rcrowley/go-metrics" ) diff --git a/whisper/mailserver/mailserver.go b/whisper/mailserver/mailserver.go index c03da5fffb..9a1233ad51 100644 --- a/whisper/mailserver/mailserver.go +++ b/whisper/mailserver/mailserver.go @@ -21,22 +21,12 @@ import ( "encoding/binary" "fmt" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/cmd/utils" - "github.com/expanse-org/go-expanse/common" - "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/rlp" - whisper "github.com/expanse-org/go-expanse/whisper/whisperv5" -======= "github.com/expanse-org/go-expanse/cmd/utils" "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/rlp" whisper "github.com/expanse-org/go-expanse/whisper/whisperv5" ->>>>>>> refs/remotes/ethereum/master "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/whisper/whisperv2/envelope.go b/whisper/whisperv2/envelope.go index cca27ad397..047d5c9d3f 100644 --- a/whisper/whisperv2/envelope.go +++ b/whisper/whisperv2/envelope.go @@ -26,18 +26,11 @@ import ( "math/big" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/crypto" - "github.com/expanse-org/go-expanse/crypto/ecies" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/math" "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/crypto/ecies" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv2/message.go b/whisper/whisperv2/message.go index cbe8d61bd6..b0a2b3a6fb 100644 --- a/whisper/whisperv2/message.go +++ b/whisper/whisperv2/message.go @@ -26,18 +26,10 @@ import ( "math/rand" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/crypto" - "github.com/expanse-org/go-expanse/crypto/ecies" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/crypto/ecies" "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) // Message represents an end-user data packet to transmit through the Whisper diff --git a/whisper/whisperv2/peer.go b/whisper/whisperv2/peer.go index 1017170032..cfe3970a40 100644 --- a/whisper/whisperv2/peer.go +++ b/whisper/whisperv2/peer.go @@ -20,18 +20,10 @@ import ( "fmt" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/p2p" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv2/whisper.go b/whisper/whisperv2/whisper.go index 278bbad89d..09310ae3f9 100644 --- a/whisper/whisperv2/whisper.go +++ b/whisper/whisperv2/whisper.go @@ -22,16 +22,6 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/crypto" - "github.com/expanse-org/go-expanse/crypto/ecies" - "github.com/expanse-org/go-expanse/event/filter" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/rpc" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/crypto/ecies" @@ -39,7 +29,6 @@ import ( "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/p2p" "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv5/api.go b/whisper/whisperv5/api.go index d1e2f9800b..9f6b29ca91 100644 --- a/whisper/whisperv5/api.go +++ b/whisper/whisperv5/api.go @@ -22,18 +22,10 @@ import ( "fmt" mathrand "math/rand" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/common/hexutil" - "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/common" "github.com/expanse-org/go-expanse/common/hexutil" "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) var whisperOffLineErr = errors.New("whisper is offline") diff --git a/whisper/whisperv5/envelope.go b/whisper/whisperv5/envelope.go index 585eada7fa..1836ea4708 100644 --- a/whisper/whisperv5/envelope.go +++ b/whisper/whisperv5/envelope.go @@ -27,18 +27,11 @@ import ( "math/big" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/crypto" - "github.com/expanse-org/go-expanse/crypto/ecies" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/common/math" "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/crypto/ecies" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv5/filter.go b/whisper/whisperv5/filter.go index 707b06151d..a271cd2648 100644 --- a/whisper/whisperv5/filter.go +++ b/whisper/whisperv5/filter.go @@ -22,14 +22,8 @@ import ( "fmt" "sync" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master ) type Filter struct { diff --git a/whisper/whisperv5/message.go b/whisper/whisperv5/message.go index b3bfaead52..5829b7f1e7 100644 --- a/whisper/whisperv5/message.go +++ b/whisper/whisperv5/message.go @@ -28,18 +28,10 @@ import ( "fmt" mrand "math/rand" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/crypto" - "github.com/expanse-org/go-expanse/crypto/ecies" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/crypto/ecies" "github.com/expanse-org/go-expanse/log" ->>>>>>> refs/remotes/ethereum/master "golang.org/x/crypto/pbkdf2" ) diff --git a/whisper/whisperv5/peer.go b/whisper/whisperv5/peer.go index b09d180402..a8bba94588 100644 --- a/whisper/whisperv5/peer.go +++ b/whisper/whisperv5/peer.go @@ -20,18 +20,10 @@ import ( "fmt" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "github.com/expanse-org/go-expanse/logger" - "github.com/expanse-org/go-expanse/logger/glog" - "github.com/expanse-org/go-expanse/p2p" - "github.com/expanse-org/go-expanse/rlp" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/p2p" "github.com/expanse-org/go-expanse/rlp" ->>>>>>> refs/remotes/ethereum/master set "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv5/whisper.go b/whisper/whisperv5/whisper.go index 03a8150ac8..c3d89e8be2 100644 --- a/whisper/whisperv5/whisper.go +++ b/whisper/whisperv5/whisper.go @@ -26,20 +26,11 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/expanse-org/go-expanse/common" - "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/p2p" - "github.com/expanse-org/go-expanse/rpc" -======= "github.com/expanse-org/go-expanse/common" "github.com/expanse-org/go-expanse/crypto" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/p2p" "github.com/expanse-org/go-expanse/rpc" ->>>>>>> refs/remotes/ethereum/master "golang.org/x/crypto/pbkdf2" set "gopkg.in/fatih/set.v0" )