From 625543fcd8ad3e05009eb4fbd05a6e2fb2b0e851 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Tue, 3 Nov 2015 18:52:31 -0500 Subject: [PATCH] find replace 3 --- cmd/ethtest/main.go | 2 +- cmd/gexp/usage.go | 2 +- cmd/utils/flags.go | 2 +- common/README.md | 2 +- core/blockchain.go | 2 +- core/blockchain_test.go | 2 +- core/chain_manager_test.go | 2 +- exp/filters/filter_test.go | 2 +- exp/gpu_mining.go | 2 +- rpc/comms/ipc.go | 2 +- xeth/xeth.go | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go index 6ccb56f8dd..59bd0f16e2 100644 --- a/cmd/ethtest/main.go +++ b/cmd/ethtest/main.go @@ -49,7 +49,7 @@ var ( Name: "file", Usage: "Test file or directory. Directories are searched for .json files 1 level deep", Value: defaultDir, - EnvVar: "ETHEREUM_TEST_PATH", + EnvVar: "EXPANSE_TEST_PATH", } ContinueOnErrorFlag = cli.BoolFlag{ Name: "continue", diff --git a/cmd/gexp/usage.go b/cmd/gexp/usage.go index f285e9eafe..6365e181a8 100644 --- a/cmd/gexp/usage.go +++ b/cmd/gexp/usage.go @@ -59,7 +59,7 @@ type flagGroup struct { // AppHelpFlagGroups is the application flags, grouped by functionality. var AppHelpFlagGroups = []flagGroup{ { - Name: "ETHEREUM", + Name: "EXPANSE", Flags: []cli.Flag{ utils.DataDirFlag, utils.NetworkIdFlag, diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index c5e1e76b18..3133a11e2c 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -497,7 +497,7 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *exp.Config { cfg.Shh = true } if !ctx.GlobalIsSet(DataDirFlag.Name) { - cfg.DataDir = os.TempDir() + "/ethereum_dev_mode" + cfg.DataDir = os.TempDir() + "/expanse_dev_mode" } cfg.PowTest = true cfg.DevMode = true diff --git a/common/README.md b/common/README.md index 0c2c715569..ab8fb36115 100644 --- a/common/README.md +++ b/common/README.md @@ -7,7 +7,7 @@ The common package contains the expanse utility library. # Installation -As a subdirectory the main go-ethereum repository, you get it with +As a subdirectory the main go-expanse repository, you get it with `go get github.com/expanse-project/go-expanse`. # Usage diff --git a/core/blockchain.go b/core/blockchain.go index ba6e19b82e..92ff1c2e1b 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -132,7 +132,7 @@ func NewBlockChain(chainDb ethdb.Database, pow pow.PoW, mux *event.TypeMux) (*Bl if err != nil { return nil, err } - glog.V(logger.Info).Infoln("WARNING: Wrote default ethereum genesis block") + glog.V(logger.Info).Infoln("WARNING: Wrote default expanse genesis block") } if err := bc.loadLastState(); err != nil { return nil, err diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 86e54ef9ec..27c4f689c1 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -26,7 +26,7 @@ import ( "strconv" "testing" - "github.com/ethereum/ethash" + "github.com/expanse-project/ethash" "github.com/expanse-project/go-expanse/common" "github.com/expanse-project/go-expanse/core/types" "github.com/expanse-project/go-expanse/core/vm" diff --git a/core/chain_manager_test.go b/core/chain_manager_test.go index d3e82bdb3b..269c798aef 100644 --- a/core/chain_manager_test.go +++ b/core/chain_manager_test.go @@ -27,7 +27,7 @@ import ( "testing" - "github.com/ethereum/ethash" + "github.com/expanse-project/ethash" "github.com/expanse-project/go-expanse/common" "github.com/expanse-project/go-expanse/core/state" "github.com/expanse-project/go-expanse/core/types" diff --git a/exp/filters/filter_test.go b/exp/filters/filter_test.go index a4ee6fdaac..e8e5b3b6b2 100644 --- a/exp/filters/filter_test.go +++ b/exp/filters/filter_test.go @@ -35,7 +35,7 @@ func BenchmarkMipmaps(b *testing.B) { key1, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") addr1 = crypto.PubkeyToAddress(key1.PublicKey) addr2 = common.BytesToAddress([]byte("jeff")) - addr3 = common.BytesToAddress([]byte("ethereum")) + addr3 = common.BytesToAddress([]byte("expanse")) addr4 = common.BytesToAddress([]byte("random addresses please")) ) defer db.Close() diff --git a/exp/gpu_mining.go b/exp/gpu_mining.go index 728a218e5d..f1073ead1d 100644 --- a/exp/gpu_mining.go +++ b/exp/gpu_mining.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/ethereum/ethash" + "github.com/expanse-project/ethash" "github.com/expanse-project/go-expanse/common" "github.com/expanse-project/go-expanse/core/types" "github.com/expanse-project/go-expanse/logger" diff --git a/rpc/comms/ipc.go b/rpc/comms/ipc.go index 958270680c..87a1533596 100644 --- a/rpc/comms/ipc.go +++ b/rpc/comms/ipc.go @@ -33,7 +33,7 @@ type Stopper interface { Stop() } -type InitFunc func(conn net.Conn) (Stopper, shared.EthereumApi, error) +type InitFunc func(conn net.Conn) (Stopper, shared.ExpanseApi, error) type IpcConfig struct { Endpoint string diff --git a/xeth/xeth.go b/xeth/xeth.go index a085e27d1a..a36f59f9d6 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -104,7 +104,7 @@ func New(expanse *exp.Expanse, frontend Frontend) *XEth { transactionQueue: make(map[int]*hashQueue), messages: make(map[int]*whisperFilter), agent: miner.NewRemoteAgent(), - gpo: exp.NewGasPriceOracle(ethereum), + gpo: exp.NewGasPriceOracle(expanse), } if expanse.Whisper() != nil { xeth.whisper = NewWhisper(expanse.Whisper())