From 56c58342f55497adec17d85fd7b5d4453b2e78dc Mon Sep 17 00:00:00 2001 From: phearzero Date: Mon, 2 Oct 2017 13:38:35 -0500 Subject: [PATCH] :octocat: :construction: Found missed EthStats refs --- brndb/database_test.go | 4 ++-- brnstats/ethstats.go | 2 +- cmd/faucet/faucet.go | 2 +- cmd/geth/config.go | 12 ++++++------ cmd/geth/main.go | 2 +- cmd/geth/usage.go | 2 +- cmd/puppeth/module_dashboard.go | 26 +++++++++++++------------- cmd/puppeth/module_ethstats.go | 32 ++++++++++++++++---------------- cmd/puppeth/module_faucet.go | 4 ++-- cmd/puppeth/module_node.go | 8 ++++---- cmd/puppeth/wizard.go | 2 +- cmd/puppeth/wizard_dashboard.go | 2 +- cmd/puppeth/wizard_ethstats.go | 10 +++++----- cmd/puppeth/wizard_netstats.go | 2 +- cmd/puppeth/wizard_network.go | 4 ++-- cmd/utils/flags.go | 6 +++--- 16 files changed, 60 insertions(+), 60 deletions(-) diff --git a/brndb/database_test.go b/brndb/database_test.go index b09e330b96..c2a7d2890b 100644 --- a/brndb/database_test.go +++ b/brndb/database_test.go @@ -14,7 +14,7 @@ // You should have received a copy of the GNU Lesser General Public License // along with the go-burnout library. If not, see . -package ethdb_test +package brndb_test import ( "bytes" @@ -29,7 +29,7 @@ import ( ) func newTestLDB() (*brndb.LDBDatabase, func()) { - dirname, err := ioutil.TempDir(os.TempDir(), "ethdb_test_") + dirname, err := ioutil.TempDir(os.TempDir(), "brndb_test_") if err != nil { panic("failed to create test file: " + err.Error()) } diff --git a/brnstats/ethstats.go b/brnstats/ethstats.go index d1edeea552..f35246421b 100644 --- a/brnstats/ethstats.go +++ b/brnstats/ethstats.go @@ -318,7 +318,7 @@ func (s *Service) readLoop(conn *websocket.Conn) { if !ok { log.Warn("Invalid stats history request", "msg", msg["emit"][1]) s.histCh <- nil - continue // Ethstats sometime sends invalid history requests, ignore those + continue // Brnstats sometime sends invalid history requests, ignore those } list, ok := request["list"].([]interface{}) if !ok { diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index 5afcb6aa02..b7ad5a0939 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -64,7 +64,7 @@ var ( ethPortFlag = flag.Int("ethport", 30303, "Listener port for the devp2p connection") bootFlag = flag.String("bootnodes", "", "Comma separated bootnode enode URLs to seed with") netFlag = flag.Uint64("network", 0, "Network ID to use for the Burnout protocol") - statsFlag = flag.String("brnstats", "", "Ethstats network monitoring auth string") + statsFlag = flag.String("brnstats", "", "Brnstats network monitoring auth string") netnameFlag = flag.String("faucet.name", "", "Network name to assign to the faucet") payoutFlag = flag.Int("faucet.amount", 1, "Number of Ethers to pay out per user request") diff --git a/cmd/geth/config.go b/cmd/geth/config.go index 43e2af97ee..83d92cac7d 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -71,7 +71,7 @@ var tomlSettings = toml.Config{ }, } -type ethstatsConfig struct { +type brnstatsConfig struct { URL string `toml:",omitempty"` } @@ -79,7 +79,7 @@ type gethConfig struct { Eth brn.Config Shh whisper.Config Node node.Config - Ethstats ethstatsConfig + Brnstats brnstatsConfig } func loadConfig(file string, cfg *gethConfig) error { @@ -129,8 +129,8 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) { utils.Fatalf("Failed to create the protocol stack: %v", err) } utils.SetEthConfig(ctx, stack, &cfg.Eth) - if ctx.GlobalIsSet(utils.EthStatsURLFlag.Name) { - cfg.Ethstats.URL = ctx.GlobalString(utils.EthStatsURLFlag.Name) + if ctx.GlobalIsSet(utils.BrnStatsURLFlag.Name) { + cfg.Brnstats.URL = ctx.GlobalString(utils.BrnStatsURLFlag.Name) } utils.SetShhConfig(ctx, stack, &cfg.Shh) @@ -167,8 +167,8 @@ func makeFullNode(ctx *cli.Context) *node.Node { } // Add the Burnout Stats daemon if requested. - if cfg.Ethstats.URL != "" { - utils.RegisterEthStatsService(stack, cfg.Ethstats.URL) + if cfg.Brnstats.URL != "" { + utils.RegisterBrnStatsService(stack, cfg.Brnstats.URL) } // Add the release oracle service so it boots along with node. diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 846729ce4c..482f31a786 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -105,7 +105,7 @@ var ( utils.VMEnableDebugFlag, utils.NetworkIdFlag, utils.RPCCORSDomainFlag, - utils.EthStatsURLFlag, + utils.BrnStatsURLFlag, utils.MetricsEnabledFlag, utils.FakePoWFlag, utils.NoCompactionFlag, diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index 04b4e641ce..abbba09a41 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -74,7 +74,7 @@ var AppHelpFlagGroups = []flagGroup{ utils.RinkebyFlag, utils.DevModeFlag, utils.SyncModeFlag, - utils.EthStatsURLFlag, + utils.BrnStatsURLFlag, utils.IdentityFlag, utils.LightServFlag, utils.LightPeersFlag, diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index dbbe046faf..9687ec20ea 100644 --- a/cmd/puppeth/module_dashboard.go +++ b/cmd/puppeth/module_dashboard.go @@ -76,7 +76,7 @@ var dashboardContent = `