From f3801fa8a7d9e3493d8d0ada2692e2ed16bd5cab Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Sat, 10 Dec 2016 21:51:56 -0800 Subject: [PATCH] refactor: move coins. --- bench/{coin-old.js => coins-old.js} | 2 +- bench/{coin.js => coins.js} | 2 +- bench/tx.js | 2 +- lib/blockchain/index.js | 3 --- lib/{blockchain => coins}/coins.js | 0 lib/{blockchain => coins}/coinview.js | 0 lib/{blockchain => coins}/compress.js | 2 +- lib/coins/index.js | 6 ++++++ lib/{blockchain => coins}/undocoins.js | 0 lib/env.js | 4 ++++ lib/mempool/mempool.js | 4 ++-- lib/primitives/mtx.js | 2 +- lib/workers/parser-client.js | 2 +- migrate/chaindb1to2.js | 6 +++--- {lib/blockchain => migrate}/coins-old.js | 12 ++++++------ {lib/blockchain => migrate}/coinview-old.js | 0 {lib/blockchain => migrate}/compress-old.js | 4 ++-- scripts/dump.js | 4 ++-- test/block-test.js | 2 +- test/tx-test.js | 2 +- 20 files changed, 33 insertions(+), 26 deletions(-) rename bench/{coin-old.js => coins-old.js} (94%) rename bench/{coin.js => coins.js} (93%) rename lib/{blockchain => coins}/coins.js (100%) rename lib/{blockchain => coins}/coinview.js (100%) rename lib/{blockchain => coins}/compress.js (98%) create mode 100644 lib/coins/index.js rename lib/{blockchain => coins}/undocoins.js (100%) rename {lib/blockchain => migrate}/coins-old.js (97%) rename {lib/blockchain => migrate}/coinview-old.js (100%) rename {lib/blockchain => migrate}/compress-old.js (97%) diff --git a/bench/coin-old.js b/bench/coins-old.js similarity index 94% rename from bench/coin-old.js rename to bench/coins-old.js index ede6d754..ecf600f3 100644 --- a/bench/coin-old.js +++ b/bench/coins-old.js @@ -2,7 +2,7 @@ var fs = require('fs'); var bench = require('./bench'); -var Coins = require('../lib/blockchain/coins-old'); +var Coins = require('../migrate/coins-old'); var TX = require('../lib/primitives/tx'); var wtx = fs.readFileSync(__dirname + '/../test/data/wtx.hex', 'utf8'); diff --git a/bench/coin.js b/bench/coins.js similarity index 93% rename from bench/coin.js rename to bench/coins.js index 0e44fa86..c8d31d0a 100644 --- a/bench/coin.js +++ b/bench/coins.js @@ -1,7 +1,7 @@ 'use strict'; var fs = require('fs'); -var Coins = require('../lib/blockchain/coins'); +var Coins = require('../lib/coins/coins'); var TX = require('../lib/primitives/tx'); var bench = require('./bench'); diff --git a/bench/tx.js b/bench/tx.js index c84122e9..4f8cfa29 100644 --- a/bench/tx.js +++ b/bench/tx.js @@ -6,7 +6,7 @@ var Address = require('../lib/primitives/address'); var TX = require('../lib/primitives/tx'); var MTX = require('../lib/primitives/mtx'); var Coin = require('../lib/primitives/coin'); -var CoinView = require('../lib/blockchain/coinview'); +var CoinView = require('../lib/coins/coinview'); var constants = require('../lib/protocol/constants'); var crypto = require('../lib/crypto/crypto'); var bench = require('./bench'); diff --git a/lib/blockchain/index.js b/lib/blockchain/index.js index c1db8eef..f6e35ba8 100644 --- a/lib/blockchain/index.js +++ b/lib/blockchain/index.js @@ -3,6 +3,3 @@ exports.Chain = require('./chain'); exports.ChainDB = require('./chaindb'); exports.ChainEntry = require('./chainentry'); -exports.Coins = require('./coins'); -exports.CoinView = require('./coinview'); -exports.compress = require('./compress'); diff --git a/lib/blockchain/coins.js b/lib/coins/coins.js similarity index 100% rename from lib/blockchain/coins.js rename to lib/coins/coins.js diff --git a/lib/blockchain/coinview.js b/lib/coins/coinview.js similarity index 100% rename from lib/blockchain/coinview.js rename to lib/coins/coinview.js diff --git a/lib/blockchain/compress.js b/lib/coins/compress.js similarity index 98% rename from lib/blockchain/compress.js rename to lib/coins/compress.js index b3fe6eb9..4467c720 100644 --- a/lib/blockchain/compress.js +++ b/lib/coins/compress.js @@ -199,7 +199,7 @@ function skipOutput(br) { /** * Compress value using an exponent. Takes advantage of * the fact that many bitcoin values are divisible by 10. - * @see https://github.com/btcsuite/btcd/blob/master/blockblockchain/compress.go + * @see https://github.com/btcsuite/btcd/blob/master/blockchain/compress.go * @param {Amount} value * @returns {Number} */ diff --git a/lib/coins/index.js b/lib/coins/index.js new file mode 100644 index 00000000..5ef8c9e6 --- /dev/null +++ b/lib/coins/index.js @@ -0,0 +1,6 @@ +'use strict'; + +exports.Coins = require('./coins'); +exports.CoinView = require('./coinview'); +exports.compress = require('./compress'); +exports.UndoCoins = require('./undocoins'); diff --git a/lib/blockchain/undocoins.js b/lib/coins/undocoins.js similarity index 100% rename from lib/blockchain/undocoins.js rename to lib/coins/undocoins.js diff --git a/lib/env.js b/lib/env.js index acffe9cc..feba87e7 100644 --- a/lib/env.js +++ b/lib/env.js @@ -128,6 +128,10 @@ function Environment() { this.require('errors', './btc/errors'); this.require('uri', './btc/uri'); + // Coins + this.require('coins', './coins'); + this.require('coinview', './coinview'); + // Crypto this.require('crypto', './crypto'); this.require('ec', './crypto/ec'); diff --git a/lib/mempool/mempool.js b/lib/mempool/mempool.js index 7f6377b2..c8a07bb0 100644 --- a/lib/mempool/mempool.js +++ b/lib/mempool/mempool.js @@ -24,8 +24,8 @@ var Outpoint = require('../primitives/outpoint'); var TX = require('../primitives/tx'); var Coin = require('../primitives/coin'); var MempoolEntry = require('./mempoolentry'); -var CoinView = require('../blockchain/coinview'); -var Coins = require('../blockchain/coins'); +var CoinView = require('../coins/coinview'); +var Coins = require('../coins/coins'); /** * Represents a mempool. diff --git a/lib/primitives/mtx.js b/lib/primitives/mtx.js index e6b2a73a..7d7ee2bb 100644 --- a/lib/primitives/mtx.js +++ b/lib/primitives/mtx.js @@ -20,7 +20,7 @@ var Input = require('./input'); var Output = require('./output'); var Coin = require('./coin'); var Outpoint = require('./outpoint'); -var CoinView = require('../blockchain/coinview'); +var CoinView = require('../coins/coinview'); var KeyRing = require('./keyring'); var Address = require('./address'); var workerPool = require('../workers/workerpool').pool; diff --git a/lib/workers/parser-client.js b/lib/workers/parser-client.js index e3d0fd63..b4a73522 100644 --- a/lib/workers/parser-client.js +++ b/lib/workers/parser-client.js @@ -13,7 +13,7 @@ var ServerParser = require('./parser'); var MTX = require('../primitives/mtx'); var TX = require('../primitives/tx'); var KeyRing = require('../primitives/keyring'); -var CoinView = require('../blockchain/coinview'); +var CoinView = require('../coins/coinview'); /** * Parser diff --git a/migrate/chaindb1to2.js b/migrate/chaindb1to2.js index 82a38a8b..9b5b868f 100644 --- a/migrate/chaindb1to2.js +++ b/migrate/chaindb1to2.js @@ -4,9 +4,9 @@ var networks = require('../lib/protocol/networks'); var co = require('../lib/utils/co'); var BufferWriter = require('../lib/utils/writer'); var BufferReader = require('../lib/utils/reader'); -var OldCoins = require('../lib/blockchain/coins-old'); -var Coins = require('../lib/blockchain/coins'); -var UndoCoins = require('../lib/blockchain/undocoins'); +var OldCoins = require('../coins-old'); +var Coins = require('../lib/coins/coins'); +var UndoCoins = require('../lib/coins/undocoins'); var Coin = require('../lib/primitives/coin'); var Output = require('../lib/primitives/output'); var util = require('../lib/utils/util'); diff --git a/lib/blockchain/coins-old.js b/migrate/coins-old.js similarity index 97% rename from lib/blockchain/coins-old.js rename to migrate/coins-old.js index 8fff1bc6..80cbb648 100644 --- a/lib/blockchain/coins-old.js +++ b/migrate/coins-old.js @@ -6,13 +6,13 @@ 'use strict'; -var util = require('../utils/util'); var assert = require('assert'); -var constants = require('../protocol/constants'); -var Coin = require('../primitives/coin'); -var Output = require('../primitives/output'); -var BufferReader = require('../utils/reader'); -var BufferWriter = require('../utils/writer'); +var util = require('../lib/utils/util'); +var constants = require('../lib/protocol/constants'); +var Coin = require('../lib/primitives/coin'); +var Output = require('../lib/primitives/output'); +var BufferReader = require('../lib/utils/reader'); +var BufferWriter = require('../lib/utils/writer'); var compressor = require('./compress-old'); var compress = compressor.compress; var decompress = compressor.decompress; diff --git a/lib/blockchain/coinview-old.js b/migrate/coinview-old.js similarity index 100% rename from lib/blockchain/coinview-old.js rename to migrate/coinview-old.js diff --git a/lib/blockchain/compress-old.js b/migrate/compress-old.js similarity index 97% rename from lib/blockchain/compress-old.js rename to migrate/compress-old.js index 32ff8756..dd32bc71 100644 --- a/lib/blockchain/compress-old.js +++ b/migrate/compress-old.js @@ -7,7 +7,7 @@ 'use strict'; var assert = require('assert'); -var ec = require('../crypto/ec'); +var ec = require('../lib/crypto/ec'); /* * Compression @@ -106,7 +106,7 @@ function decompressScript(script, br) { /** * Compress value using an exponent. Takes advantage of * the fact that many bitcoin values are divisible by 10. - * @see https://github.com/btcsuite/btcd/blob/master/blockblockchain/compress.go + * @see https://github.com/btcsuite/btcd/blob/master/blockchain/compress.go * @param {Amount} value * @returns {Number} */ diff --git a/scripts/dump.js b/scripts/dump.js index 4e62a26a..ae7bca81 100644 --- a/scripts/dump.js +++ b/scripts/dump.js @@ -3,9 +3,9 @@ var fs = require('fs'); var heapdump = require('heapdump'); var MempoolEntry = require('../lib/mempool/mempoolentry'); -var Coins = require('../lib/blockchain/coins'); +var Coins = require('../lib/coins/coins'); var TX = require('../lib/primitives/tx'); -var CoinView = require('../lib/blockchain/coinview'); +var CoinView = require('../lib/coins/coinview'); var SNAPSHOT = __dirname + '/../dump.heapsnapshot'; var tx = parseTX('../test/data/tx4.hex'); diff --git a/test/block-test.js b/test/block-test.js index 37e7a44e..313466df 100644 --- a/test/block-test.js +++ b/test/block-test.js @@ -7,7 +7,7 @@ var Bloom = require('../lib/utils/bloom'); var Block = require('../lib/primitives/block'); var Headers = require('../lib/primitives/headers'); var MerkleBlock = require('../lib/primitives/merkleblock'); -var CoinView = require('../lib/blockchain/coinview'); +var CoinView = require('../lib/coins/coinview'); var Coin = require('../lib/primitives/coin'); var constants = require('../lib/protocol/constants'); var bip152 = require('../lib/net/bip152'); diff --git a/test/tx-test.js b/test/tx-test.js index 2a795046..8a05857c 100644 --- a/test/tx-test.js +++ b/test/tx-test.js @@ -12,7 +12,7 @@ var Block = require('../lib/primitives/block'); var Coin = require('../lib/primitives/coin'); var Output = require('../lib/primitives/output'); var Script = require('../lib/script/script'); -var CoinView = require('../lib/blockchain/coinview'); +var CoinView = require('../lib/coins/coinview'); var valid = require('./data/tx_valid.json'); var invalid = require('./data/tx_invalid.json');