From 3b7f338887b2e5171eda9b2b2d36c9d7c16c49d6 Mon Sep 17 00:00:00 2001
From: rjl493456442 <garyrong0905@gmail.com>
Date: Mon, 6 Jan 2020 21:02:31 +0800
Subject: [PATCH] les: address comments

---
 les/checkpointoracle/oracle.go | 4 ++--
 les/client.go                  | 2 +-
 les/server.go                  | 2 +-
 les/test_helper.go             | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/les/checkpointoracle/oracle.go b/les/checkpointoracle/oracle.go
index 9ff816cdf6..c3983e1a95 100644
--- a/les/checkpointoracle/oracle.go
+++ b/les/checkpointoracle/oracle.go
@@ -42,8 +42,8 @@ type CheckpointOracle struct {
 	getLocal func(uint64) params.TrustedCheckpoint // Function used to retrieve local checkpoint
 }
 
-// NewCheckpointOracle returns a checkpoint oracle handler.
-func NewCheckpointOracle(config *params.CheckpointOracleConfig, getLocal func(uint64) params.TrustedCheckpoint) *CheckpointOracle {
+// New creates a checkpoint oracle handler with given configs and callback.
+func New(config *params.CheckpointOracleConfig, getLocal func(uint64) params.TrustedCheckpoint) *CheckpointOracle {
 	if config == nil {
 		log.Info("Checkpoint registrar is not enabled")
 		return nil
diff --git a/les/client.go b/les/client.go
index 579062e7fd..36d5a8d2fe 100644
--- a/les/client.go
+++ b/les/client.go
@@ -124,7 +124,7 @@ func New(ctx *node.ServiceContext, config *eth.Config) (*LightEthereum, error) {
 	if oracle == nil {
 		oracle = params.CheckpointOracles[genesisHash]
 	}
-	leth.oracle = checkpointoracle.NewCheckpointOracle(oracle, leth.localCheckpoint)
+	leth.oracle = checkpointoracle.New(oracle, leth.localCheckpoint)
 
 	// Note: AddChildIndexer starts the update process for the child
 	leth.bloomIndexer.AddChildIndexer(leth.bloomTrieIndexer)
diff --git a/les/server.go b/les/server.go
index a130cee2bb..664eba9717 100644
--- a/les/server.go
+++ b/les/server.go
@@ -97,7 +97,7 @@ func NewLesServer(e *eth.Ethereum, config *eth.Config) (*LesServer, error) {
 	if oracle == nil {
 		oracle = params.CheckpointOracles[e.BlockChain().Genesis().Hash()]
 	}
-	srv.oracle = checkpointoracle.NewCheckpointOracle(oracle, srv.localCheckpoint)
+	srv.oracle = checkpointoracle.New(oracle, srv.localCheckpoint)
 
 	// Initialize server capacity management fields.
 	srv.defParams = flowcontrol.ServerParams{
diff --git a/les/test_helper.go b/les/test_helper.go
index 5c69050e22..fb1965eebe 100644
--- a/les/test_helper.go
+++ b/les/test_helper.go
@@ -195,7 +195,7 @@ func newTestClientHandler(backend *backends.SimulatedBackend, odr *LesOdr, index
 				BloomRoot:    light.GetBloomTrieRoot(db, index, sectionHead),
 			}
 		}
-		oracle = checkpointoracle.NewCheckpointOracle(checkpointConfig, getLocal)
+		oracle = checkpointoracle.New(checkpointConfig, getLocal)
 	}
 	client := &LightEthereum{
 		lesCommons: lesCommons{
@@ -258,7 +258,7 @@ func newTestServerHandler(blocks int, indexers []*core.ChainIndexer, db ethdb.Da
 				BloomRoot:    light.GetBloomTrieRoot(db, index, sectionHead),
 			}
 		}
-		oracle = checkpointoracle.NewCheckpointOracle(checkpointConfig, getLocal)
+		oracle = checkpointoracle.New(checkpointConfig, getLocal)
 	}
 	server := &LesServer{
 		lesCommons: lesCommons{