find replace 3

This commit is contained in:
Christopher Franko 2015-11-03 18:52:31 -05:00
parent 15d15d5d81
commit 625543fcd8
11 changed files with 11 additions and 11 deletions

View file

@ -49,7 +49,7 @@ var (
Name: "file", Name: "file",
Usage: "Test file or directory. Directories are searched for .json files 1 level deep", Usage: "Test file or directory. Directories are searched for .json files 1 level deep",
Value: defaultDir, Value: defaultDir,
EnvVar: "ETHEREUM_TEST_PATH", EnvVar: "EXPANSE_TEST_PATH",
} }
ContinueOnErrorFlag = cli.BoolFlag{ ContinueOnErrorFlag = cli.BoolFlag{
Name: "continue", Name: "continue",

View file

@ -59,7 +59,7 @@ type flagGroup struct {
// AppHelpFlagGroups is the application flags, grouped by functionality. // AppHelpFlagGroups is the application flags, grouped by functionality.
var AppHelpFlagGroups = []flagGroup{ var AppHelpFlagGroups = []flagGroup{
{ {
Name: "ETHEREUM", Name: "EXPANSE",
Flags: []cli.Flag{ Flags: []cli.Flag{
utils.DataDirFlag, utils.DataDirFlag,
utils.NetworkIdFlag, utils.NetworkIdFlag,

View file

@ -497,7 +497,7 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *exp.Config {
cfg.Shh = true cfg.Shh = true
} }
if !ctx.GlobalIsSet(DataDirFlag.Name) { if !ctx.GlobalIsSet(DataDirFlag.Name) {
cfg.DataDir = os.TempDir() + "/ethereum_dev_mode" cfg.DataDir = os.TempDir() + "/expanse_dev_mode"
} }
cfg.PowTest = true cfg.PowTest = true
cfg.DevMode = true cfg.DevMode = true

View file

@ -7,7 +7,7 @@ The common package contains the expanse utility library.
# Installation # 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`. `go get github.com/expanse-project/go-expanse`.
# Usage # Usage

View file

@ -132,7 +132,7 @@ func NewBlockChain(chainDb ethdb.Database, pow pow.PoW, mux *event.TypeMux) (*Bl
if err != nil { if err != nil {
return nil, err 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 { if err := bc.loadLastState(); err != nil {
return nil, err return nil, err

View file

@ -26,7 +26,7 @@ import (
"strconv" "strconv"
"testing" "testing"
"github.com/ethereum/ethash" "github.com/expanse-project/ethash"
"github.com/expanse-project/go-expanse/common" "github.com/expanse-project/go-expanse/common"
"github.com/expanse-project/go-expanse/core/types" "github.com/expanse-project/go-expanse/core/types"
"github.com/expanse-project/go-expanse/core/vm" "github.com/expanse-project/go-expanse/core/vm"

View file

@ -27,7 +27,7 @@ import (
"testing" "testing"
"github.com/ethereum/ethash" "github.com/expanse-project/ethash"
"github.com/expanse-project/go-expanse/common" "github.com/expanse-project/go-expanse/common"
"github.com/expanse-project/go-expanse/core/state" "github.com/expanse-project/go-expanse/core/state"
"github.com/expanse-project/go-expanse/core/types" "github.com/expanse-project/go-expanse/core/types"

View file

@ -35,7 +35,7 @@ func BenchmarkMipmaps(b *testing.B) {
key1, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") key1, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
addr1 = crypto.PubkeyToAddress(key1.PublicKey) addr1 = crypto.PubkeyToAddress(key1.PublicKey)
addr2 = common.BytesToAddress([]byte("jeff")) addr2 = common.BytesToAddress([]byte("jeff"))
addr3 = common.BytesToAddress([]byte("ethereum")) addr3 = common.BytesToAddress([]byte("expanse"))
addr4 = common.BytesToAddress([]byte("random addresses please")) addr4 = common.BytesToAddress([]byte("random addresses please"))
) )
defer db.Close() defer db.Close()

View file

@ -25,7 +25,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/ethereum/ethash" "github.com/expanse-project/ethash"
"github.com/expanse-project/go-expanse/common" "github.com/expanse-project/go-expanse/common"
"github.com/expanse-project/go-expanse/core/types" "github.com/expanse-project/go-expanse/core/types"
"github.com/expanse-project/go-expanse/logger" "github.com/expanse-project/go-expanse/logger"

View file

@ -33,7 +33,7 @@ type Stopper interface {
Stop() Stop()
} }
type InitFunc func(conn net.Conn) (Stopper, shared.EthereumApi, error) type InitFunc func(conn net.Conn) (Stopper, shared.ExpanseApi, error)
type IpcConfig struct { type IpcConfig struct {
Endpoint string Endpoint string

View file

@ -104,7 +104,7 @@ func New(expanse *exp.Expanse, frontend Frontend) *XEth {
transactionQueue: make(map[int]*hashQueue), transactionQueue: make(map[int]*hashQueue),
messages: make(map[int]*whisperFilter), messages: make(map[int]*whisperFilter),
agent: miner.NewRemoteAgent(), agent: miner.NewRemoteAgent(),
gpo: exp.NewGasPriceOracle(ethereum), gpo: exp.NewGasPriceOracle(expanse),
} }
if expanse.Whisper() != nil { if expanse.Whisper() != nil {
xeth.whisper = NewWhisper(expanse.Whisper()) xeth.whisper = NewWhisper(expanse.Whisper())