From 7f3c265085d1aa8185f66a2c8338f94f3019147a Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Sat, 19 Nov 2016 06:53:59 -0800 Subject: [PATCH] net: rename timedata. --- lib/chain/chain.js | 2 +- lib/env.js | 2 +- lib/http/rpc.js | 2 +- lib/http/server.js | 2 +- lib/miner/miner.js | 2 +- lib/miner/minerblock.js | 2 +- lib/net/index.js | 2 +- lib/net/packets.js | 2 +- lib/net/peer.js | 2 +- lib/net/pool.js | 2 +- lib/net/{timedata.js => time.js} | 2 +- lib/node/node.js | 2 +- lib/primitives/abstractblock.js | 2 +- lib/primitives/netaddress.js | 2 +- lib/script/index.js | 2 +- lib/script/script.js | 4 ++-- 16 files changed, 17 insertions(+), 17 deletions(-) rename lib/net/{timedata.js => time.js} (98%) diff --git a/lib/chain/chain.js b/lib/chain/chain.js index c57fd991..7b522da2 100644 --- a/lib/chain/chain.js +++ b/lib/chain/chain.js @@ -21,7 +21,7 @@ var assert = require('assert'); var errors = require('../utils/errors'); var VerifyError = errors.VerifyError; var VerifyResult = errors.VerifyResult; -var time = require('../net/timedata'); +var time = require('../net/time'); var co = require('../utils/co'); /** diff --git a/lib/env.js b/lib/env.js index dc0bcd9c..188e9f79 100644 --- a/lib/env.js +++ b/lib/env.js @@ -158,7 +158,7 @@ function Environment() { this.require('packets', './net/packets'); this.require('peer', './net/peer'); this.require('pool', './net/pool'); - this.require('time', './net/timedata'); // -> time? + this.require('time', './net/time'); // Node this.require('node', './node'); diff --git a/lib/http/rpc.js b/lib/http/rpc.js index 7fb05393..bf4f10ff 100644 --- a/lib/http/rpc.js +++ b/lib/http/rpc.js @@ -12,7 +12,7 @@ var crypto = require('../crypto/crypto'); var assert = require('assert'); var constants = require('../protocol/constants'); var ec = require('../crypto/ec'); -var time = require('../net/timedata'); +var time = require('../net/time'); var NetworkAddress = require('../primitives/netaddress'); var Script = require('../script/script'); var Address = require('../primitives/address'); diff --git a/lib/http/server.js b/lib/http/server.js index 29d79dbe..3de68b17 100644 --- a/lib/http/server.js +++ b/lib/http/server.js @@ -25,7 +25,7 @@ var Outpoint = require('../primitives/outpoint'); var HD = require('../hd/hd'); var Script = require('../script/script'); var crypto = require('../crypto/crypto'); -var time = require('../net/timedata'); +var time = require('../net/time'); var con = co.con; var RPC; diff --git a/lib/miner/miner.js b/lib/miner/miner.js index 83fd6e1b..99a37d12 100644 --- a/lib/miner/miner.js +++ b/lib/miner/miner.js @@ -14,7 +14,7 @@ var constants = require('../protocol/constants'); var AsyncObject = require('../utils/async'); var MinerBlock = require('./minerblock'); var Address = require('../primitives/address'); -var time = require('../net/timedata'); +var time = require('../net/time'); /** * A bitcoin miner (supports mining witness blocks). diff --git a/lib/miner/minerblock.js b/lib/miner/minerblock.js index a773d7bc..dc2640ae 100644 --- a/lib/miner/minerblock.js +++ b/lib/miner/minerblock.js @@ -20,7 +20,7 @@ var TX = require('../primitives/tx'); var Block = require('../primitives/block'); var Input = require('../primitives/input'); var Output = require('../primitives/output'); -var time = require('../net/timedata'); +var time = require('../net/time'); var mine = require('./mine'); var workerPool = require('../workers/workerpool').pool; diff --git a/lib/net/index.js b/lib/net/index.js index b57fb87c..184793aa 100644 --- a/lib/net/index.js +++ b/lib/net/index.js @@ -9,4 +9,4 @@ exports.Parser = require('./parser'); exports.Peer = require('./peer'); exports.Pool = require('./pool'); exports.tcp = require('./tcp'); -exports.time = require('./timedata'); +exports.time = require('./time'); diff --git a/lib/net/packets.js b/lib/net/packets.js index f87d2eda..b7059e4f 100644 --- a/lib/net/packets.js +++ b/lib/net/packets.js @@ -12,7 +12,7 @@ var constants = require('../protocol/constants'); var utils = require('../utils/utils'); var assert = require('assert'); var crypto = require('../crypto/crypto'); -var time = require('./timedata'); +var time = require('./time'); var ec = require('../crypto/ec'); var Bloom = require('../utils/bloom'); var bip152 = require('./bip152'); diff --git a/lib/net/peer.js b/lib/net/peer.js index 2761e986..b3172c87 100644 --- a/lib/net/peer.js +++ b/lib/net/peer.js @@ -26,7 +26,7 @@ var BIP150 = require('./bip150'); var BIP152 = require('./bip152'); var Block = require('../primitives/block'); var TX = require('../primitives/tx'); -var time = require('./timedata'); +var time = require('./time'); /** * Represents a remote peer. diff --git a/lib/net/pool.js b/lib/net/pool.js index c0ca02c4..ead7d638 100644 --- a/lib/net/pool.js +++ b/lib/net/pool.js @@ -25,7 +25,7 @@ var ec = require('../crypto/ec'); var InvItem = require('../primitives/invitem'); var Locker = require('../utils/locker'); var Network = require('../protocol/network'); -var time = require('./timedata'); +var time = require('./time'); var Peer = require('./peer'); var TX = require('../primitives/tx'); var tcp = require('./tcp'); diff --git a/lib/net/timedata.js b/lib/net/time.js similarity index 98% rename from lib/net/timedata.js rename to lib/net/time.js index a3ed3b54..4b51f11e 100644 --- a/lib/net/timedata.js +++ b/lib/net/time.js @@ -1,5 +1,5 @@ /*! - * timedata.js - time management for bcoin + * time.js - time management for bcoin * Copyright (c) 2014-2015, Fedor Indutny (MIT License) * Copyright (c) 2014-2016, Christopher Jeffrey (MIT License). * https://github.com/bcoin-org/bcoin diff --git a/lib/node/node.js b/lib/node/node.js index e12a070a..b6d93ce3 100644 --- a/lib/node/node.js +++ b/lib/node/node.js @@ -13,7 +13,7 @@ var co = require('../utils/co'); var assert = require('assert'); var Network = require('../protocol/network'); var Logger = require('./logger'); -var time = require('../net/timedata'); +var time = require('../net/time'); var workerPool = require('../workers/workerpool').pool; /** diff --git a/lib/primitives/abstractblock.js b/lib/primitives/abstractblock.js index 42805a21..17170d41 100644 --- a/lib/primitives/abstractblock.js +++ b/lib/primitives/abstractblock.js @@ -14,7 +14,7 @@ var crypto = require('../crypto/crypto'); var btcutils = require('../utils/btcutils'); var VerifyResult = require('../utils/errors').VerifyResult; var BufferWriter = require('../utils/writer'); -var time = require('../net/timedata'); +var time = require('../net/time'); var InvItem = require('./invitem'); /** diff --git a/lib/primitives/netaddress.js b/lib/primitives/netaddress.js index 5ed15f65..465eff98 100644 --- a/lib/primitives/netaddress.js +++ b/lib/primitives/netaddress.js @@ -8,7 +8,7 @@ var constants = require('../protocol/constants'); var Network = require('../protocol/network'); -var time = require('../net/timedata'); +var time = require('../net/time'); var utils = require('../utils/utils'); var IP = require('../utils/ip'); var assert = require('assert'); diff --git a/lib/script/index.js b/lib/script/index.js index aa1a0ba1..30f777f3 100644 --- a/lib/script/index.js +++ b/lib/script/index.js @@ -4,6 +4,6 @@ exports.encoding = require('./encoding'); exports.Opcode = require('./opcode'); exports.Program = require('./program'); exports.Script = require('./script'); -exports.SigCache = require('./sigcache'); +exports.sigcache = require('./sigcache'); exports.Stack = require('./stack'); exports.Witness = require('./witness'); diff --git a/lib/script/script.js b/lib/script/script.js index eaa93d72..b3d9fa1f 100644 --- a/lib/script/script.js +++ b/lib/script/script.js @@ -23,7 +23,7 @@ var scriptTypes = constants.scriptTypes; var Program = require('./program'); var Opcode = require('./opcode'); var Stack = require('./stack'); -var SigCache = require('./sigcache'); +var sigcache = require('./sigcache'); var encoding = require('./encoding'); var ec = require('../crypto/ec'); var Address = require('../primitives/address'); @@ -3407,7 +3407,7 @@ Script.checksig = function checksig(msg, sig, key, flags) { if (!(flags & constants.flags.VERIFY_LOW_S)) high = true; - return SigCache.verify(msg, sig.slice(0, -1), key, historical, high); + return sigcache.verify(msg, sig.slice(0, -1), key, historical, high); }; /**