From 9d8b455d62d851d265a8383a5d34e9c594ff89c9 Mon Sep 17 00:00:00 2001 From: Sonic Date: Wed, 21 Nov 2018 13:37:16 +0800 Subject: core, dex, dex/downloader: restore insertChain to upstream version Also rename InsertChain2, insertChain2, InsertHeaderChain2, ValidateHeaderChain2 --- dex/downloader/downloader.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'dex/downloader/downloader.go') diff --git a/dex/downloader/downloader.go b/dex/downloader/downloader.go index 69d95d801..828c7c6bc 100644 --- a/dex/downloader/downloader.go +++ b/dex/downloader/downloader.go @@ -180,8 +180,8 @@ type LightChain interface { // GetTd returns the total difficulty of a local block. GetTd(common.Hash, uint64) *big.Int - // InsertHeaderChain2 inserts a batch of headers into the local chain. - InsertHeaderChain2([]*types.HeaderWithGovState, *dexCore.TSigVerifierCache) (int, error) + // InsertDexonHeaderChain inserts a batch of headers into the local chain. + InsertDexonHeaderChain([]*types.HeaderWithGovState, *dexCore.TSigVerifierCache) (int, error) // Rollback removes a few recently added elements from the local chain. Rollback([]common.Hash) @@ -206,8 +206,8 @@ type BlockChain interface { // FastSyncCommitHead directly commits the head block to a certain entity. FastSyncCommitHead(common.Hash) error - // InsertChain2 inserts a batch of blocks into the local chain. - InsertChain2(types.Blocks) (int, error) + // InsertDexonChain inserts a batch of blocks into the local chain. + InsertDexonChain(types.Blocks) (int, error) // InsertReceiptChain inserts a batch of receipts into the local chain. InsertReceiptChain(types.Blocks, []types.Receipts) (int, error) @@ -1421,7 +1421,7 @@ func (d *Downloader) processHeaders(origin uint64, pivot uint64, td *big.Int) er } } - if n, err := d.lightchain.InsertHeaderChain2(chunk, d.verifierCache); err != nil { + if n, err := d.lightchain.InsertDexonHeaderChain(chunk, d.verifierCache); err != nil { // If some headers were inserted, add them too to the rollback list if n > 0 { for _, h := range chunk[:n] { @@ -1513,7 +1513,7 @@ func (d *Downloader) importBlockResults(results []*fetchResult) error { for i, result := range results { blocks[i] = types.NewBlockWithHeader(result.Header).WithBody(result.Transactions, result.Uncles) } - if index, err := d.blockchain.InsertChain2(blocks); err != nil { + if index, err := d.blockchain.InsertDexonChain(blocks); err != nil { log.Debug("Downloaded item processing failed", "number", results[index].Header.Number, "hash", results[index].Header.Hash(), "err", err) return errInvalidChain } -- cgit v1.2.3