diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2018-02-08 21:11:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-08 21:11:05 +0800 |
| commit | 03daf601c15f0cdd1091798fa5a56f7b822244ac (patch) | |
| tree | c2bc0c1849b7e800628a9ae48a5dc19a79188139 | |
| parent | 1a4e68721a901e86322631fed1191025a6d14c52 (diff) | |
| parent | eb07dbb0790fc0f5fe5b3192da6b4d04d844239f (diff) | |
| download | dexon-03daf601c15f0cdd1091798fa5a56f7b822244ac.tar.gz dexon-03daf601c15f0cdd1091798fa5a56f7b822244ac.tar.zst dexon-03daf601c15f0cdd1091798fa5a56f7b822244ac.zip | |
Merge pull request #16037 from karalabe/light-startup-polishes
eth, light: minor light client startup cleanups
| -rw-r--r-- | eth/downloader/downloader.go | 1 | ||||
| -rw-r--r-- | light/lightchain.go | 3 | ||||
| -rw-r--r-- | light/odr_util.go | 5 | ||||
| -rw-r--r-- | light/postprocess.go | 4 |
4 files changed, 4 insertions, 9 deletions
diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index 7f490d9e9..3870f10b9 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -266,7 +266,6 @@ func (d *Downloader) Synchronising() bool { // RegisterPeer injects a new download peer into the set of block source to be // used for fetching hashes and blocks from. func (d *Downloader) RegisterPeer(id string, version int, peer Peer) error { - logger := log.New("peer", id) logger.Trace("Registering sync peer") if err := d.peers.Register(newPeerConnection(id, version, peer, logger)); err != nil { diff --git a/light/lightchain.go b/light/lightchain.go index 24529ef82..bc88aeb48 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -100,7 +100,6 @@ func NewLightChain(odr OdrBackend, config *params.ChainConfig, engine consensus. if cp, ok := trustedCheckpoints[bc.genesisBlock.Hash()]; ok { bc.addTrustedCheckpoint(cp) } - if err := bc.loadLastState(); err != nil { return nil, err } @@ -128,7 +127,7 @@ func (self *LightChain) addTrustedCheckpoint(cp trustedCheckpoint) { if self.odr.BloomIndexer() != nil { self.odr.BloomIndexer().AddKnownSectionHead(cp.sectionIdx, cp.sectionHead) } - log.Info("Added trusted checkpoint", "chain name", cp.name) + log.Info("Added trusted checkpoint", "chain", cp.name, "block", (cp.sectionIdx+1)*ChtFrequency-1, "hash", cp.sectionHead) } func (self *LightChain) getProcInterrupt() bool { diff --git a/light/odr_util.go b/light/odr_util.go index a0eb6303d..33a8e80ce 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -58,17 +58,14 @@ func GetHeaderByNumber(ctx context.Context, odr OdrBackend, number uint64) (*typ } } } - if number >= chtCount*ChtFrequency { return nil, ErrNoTrustedCht } - r := &ChtRequest{ChtRoot: GetChtRoot(db, chtCount-1, sectionHead), ChtNum: chtCount - 1, BlockNum: number} if err := odr.Retrieve(ctx, r); err != nil { return nil, err - } else { - return r.Header, nil } + return r.Header, nil } func GetCanonicalHash(ctx context.Context, odr OdrBackend, number uint64) (common.Hash, error) { diff --git a/light/postprocess.go b/light/postprocess.go index bbac58d12..160d07b17 100644 --- a/light/postprocess.go +++ b/light/postprocess.go @@ -52,7 +52,7 @@ type trustedCheckpoint struct { var ( mainnetCheckpoint = trustedCheckpoint{ - name: "ETH mainnet", + name: "mainnet", sectionIdx: 150, sectionHead: common.HexToHash("1e2e67f289565cbe7bd4367f7960dbd73a3f7c53439e1047cd7ba331c8109e39"), chtRoot: common.HexToHash("f2a6c9ca143d647b44523cc249f1072c8912358ab873a77a5fdc792b8df99e80"), @@ -60,7 +60,7 @@ var ( } ropstenCheckpoint = trustedCheckpoint{ - name: "Ropsten testnet", + name: "ropsten", sectionIdx: 75, sectionHead: common.HexToHash("12e68324f4578ea3e8e7fb3968167686729396c9279287fa1f1a8b51bb2d05b4"), chtRoot: common.HexToHash("3e51dc095c69fa654a4cac766e0afff7357515b4b3c3a379c675f810363e54be"), |