Skip to content

Commit

Permalink
refactor: move coins.
Browse files Browse the repository at this point in the history
  • Loading branch information
chjj committed Dec 11, 2016
1 parent 5e23b28 commit f3801fa
Show file tree
Hide file tree
Showing 20 changed files with 33 additions and 26 deletions.
2 changes: 1 addition & 1 deletion bench/coin-old.js → bench/coins-old.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion bench/coin.js → bench/coins.js
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
2 changes: 1 addition & 1 deletion bench/tx.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
3 changes: 0 additions & 3 deletions lib/blockchain/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/blockchain/compress.js → lib/coins/compress.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}
*/
Expand Down
6 changes: 6 additions & 0 deletions lib/coins/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
'use strict';

exports.Coins = require('./coins');
exports.CoinView = require('./coinview');
exports.compress = require('./compress');
exports.UndoCoins = require('./undocoins');
File renamed without changes.
4 changes: 4 additions & 0 deletions lib/env.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
4 changes: 2 additions & 2 deletions lib/mempool/mempool.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/primitives/mtx.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lib/workers/parser-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions migrate/chaindb1to2.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
12 changes: 6 additions & 6 deletions lib/blockchain/coins-old.js → migrate/coins-old.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions lib/blockchain/compress-old.js → migrate/compress-old.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
'use strict';

var assert = require('assert');
var ec = require('../crypto/ec');
var ec = require('../lib/crypto/ec');

/*
* Compression
Expand Down Expand Up @@ -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}
*/
Expand Down
4 changes: 2 additions & 2 deletions scripts/dump.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion test/block-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion test/tx-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down

0 comments on commit f3801fa

Please sign in to comment.