syncscript: general cleanup

This commit is contained in:
Daniel Cousens 2014-05-08 13:23:31 +10:00
parent 1e0521f7e5
commit 39d042d058

View file

@ -8,16 +8,13 @@ var secureRandom = require('secure-random')
function b2h(b) { return new Buffer(b).toString('hex') } function b2h(b) { return new Buffer(b).toString('hex') }
function h2b(h) { return new Buffer(h, 'hex') } function h2b(h) { return new Buffer(h, 'hex') }
function randomBuf(s) { function randomBuf(s) { return new Buffer(secureRandom(s)) }
return new Buffer(secureRandom(s))
}
request('https://raw.githubusercontent.com/bitcoin/bitcoin/master/src/test/data/base58_encode_decode.json', function (error, response, body) { request('https://raw.githubusercontent.com/bitcoin/bitcoin/master/src/test/data/base58_encode_decode.json', function (error, response, body) {
assert.ifError(error) assert.ifError(error)
assert.equal(response.statusCode, 200) assert.equal(response.statusCode, 200)
var data = JSON.parse(body) var valid = JSON.parse(body).map(function(x) {
var valid = data.map(function(x) {
return { return {
hex: x[0], hex: x[0],
string: x[1] string: x[1]
@ -31,7 +28,7 @@ request('https://raw.githubusercontent.com/bitcoin/bitcoin/master/src/test/data/
// string: ' \t\n\v\f\r skip \r\f\v\n\t ' // string: ' \t\n\v\f\r skip \r\f\v\n\t '
// }) // })
var fixtureJSON = JSON.stringify({ var fixture = JSON.stringify({
valid: valid, valid: valid,
invalid: [ invalid: [
{ {
@ -58,27 +55,22 @@ request('https://raw.githubusercontent.com/bitcoin/bitcoin/master/src/test/data/
] ]
}, null, ' ') }, null, ' ')
fs.writeFileSync('./test/fixtures/base58.js', 'module.exports = ' + fixtureJSON) fs.writeFileSync('./test/fixtures/base58.js', 'module.exports = ' + fixture)
}) })
request('https://raw.githubusercontent.com/bitcoin/bitcoin/master/src/test/data/base58_keys_valid.json', function (error, response, body) { request('https://raw.githubusercontent.com/bitcoin/bitcoin/master/src/test/data/base58_keys_valid.json', function (error, response, body) {
request('https://raw.githubusercontent.com/bitcoin/bitcoin/master/src/test/data/base58_keys_invalid.json', function (error2, response2, body2) { request('https://raw.githubusercontent.com/bitcoin/bitcoin/master/src/test/data/base58_keys_invalid.json', function (error2, response2, body2) {
assert.ifError(error) assert.ifError(error)
assert.ifError(error2) assert.ifError(error2)
assert.equal(response.statusCode, 200) assert.equal(response.statusCode, 200)
assert.equal(response2.statusCode, 200) assert.equal(response2.statusCode, 200)
var validData = JSON.parse(body) var valid = JSON.parse(body).map(function(x) {
var invalidData = JSON.parse(body2)
var valid = validData.map(function(x) {
var string = x[0] var string = x[0]
var hex = x[1] var hex = x[1]
var params = x[2] var params = x[2]
if (params.isCompressed) { if (params.isCompressed) hex += '01'
hex += '01'
}
assert.equal(b2h(base58check.decode(string).payload), hex) assert.equal(b2h(base58check.decode(string).payload), hex)
return { return {
@ -90,13 +82,13 @@ request('https://raw.githubusercontent.com/bitcoin/bitcoin/master/src/test/data/
} }
} }
}) })
var invalid2 = invalidData.map(function(x) { return x[0] }) var invalid2 = JSON.parse(body2).map(function(x) { return x[0] })
// Our own tests // Our own tests
var hash = crypto.hash160(randomBuf(65)) var hash = crypto.hash160(randomBuf(65))
var checksum = base58check.decode(base58check.encode(hash)).checksum var checksum = base58check.decode(base58check.encode(hash)).checksum
var fixtureJSON = JSON.stringify({ var fixture = JSON.stringify({
valid: valid, valid: valid,
invalid: [ invalid: [
{ {
@ -123,6 +115,6 @@ request('https://raw.githubusercontent.com/bitcoin/bitcoin/master/src/test/data/
invalid2: invalid2 invalid2: invalid2
}, null, ' ') }, null, ' ')
fs.writeFileSync('./test/fixtures/base58check.js', 'module.exports = ' + fixtureJSON) fs.writeFileSync('./test/fixtures/base58check.js', 'module.exports = ' + fixture)
}) })
}) })