From 76ff5f814fb9deb04159737a07c9da81eaf3e075 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Wed, 11 Jan 2017 19:43:57 -0800 Subject: [PATCH] chainentry: no network pointer. --- lib/blockchain/chainentry.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/blockchain/chainentry.js b/lib/blockchain/chainentry.js index 6adf9122..a4155244 100644 --- a/lib/blockchain/chainentry.js +++ b/lib/blockchain/chainentry.js @@ -9,7 +9,6 @@ var assert = require('assert'); var BN = require('bn.js'); -var Network = require('../protocol/network'); var consensus = require('../protocol/consensus'); var util = require('../utils/util'); var crypto = require('../crypto/crypto'); @@ -50,8 +49,6 @@ function ChainEntry(chain, options, prev) { return new ChainEntry(chain, options, prev); this.chain = chain; - this.network = chain ? chain.network : Network.primary; - this.hash = encoding.NULL_HASH; this.version = 1; this.prevBlock = encoding.NULL_HASH; @@ -160,7 +157,7 @@ ChainEntry.prototype.getChainwork = function getChainwork(prev) { */ ChainEntry.prototype.isGenesis = function isGenesis() { - return this.hash === this.network.genesis.hash; + return this.hash === this.chain.network.genesis.hash; }; /** @@ -173,8 +170,8 @@ ChainEntry.prototype.isGenesis = function isGenesis() { ChainEntry.prototype.getRetargetAncestors = function getRetargetAncestors() { var timespan = ChainEntry.MEDIAN_TIMESPAN; - var interval = this.network.pow.retargetInterval; - var reset = this.network.pow.difficultyReset; + var interval = this.chain.network.pow.retargetInterval; + var reset = this.chain.network.pow.difficultyReset; var max = timespan; if ((this.height + 1) % interval === 0 || reset) @@ -234,7 +231,7 @@ ChainEntry.prototype.isMainChain = co(function* isMainChain() { var entry; if (this.hash === this.chain.tip.hash - || this.hash === this.network.genesis.hash) { + || this.hash === this.chain.network.genesis.hash) { return true; } @@ -357,7 +354,7 @@ ChainEntry.prototype.getMedianTimeAsync = co(function* getMedianTimeAsync() { ChainEntry.prototype.isHistorical = function isHistorical() { if (this.chain.options.useCheckpoints) { - if (this.height + 1 <= this.network.checkpoints.lastHeight) + if (this.height + 1 <= this.chain.network.checkpoints.lastHeight) return true; } return false; @@ -375,7 +372,7 @@ ChainEntry.prototype.hasUnknown = function hasUnknown() { if ((bits >>> 0) !== topBits) return false; - return (this.version & this.network.unknownBits) !== 0; + return (this.version & this.chain.network.unknownBits) !== 0; }; /**