JSBN and coverage tests cleanup.

Fixes compiler warning about SJCL.
Fixes coverage source highlighting issue.
Move JSBN outside of src/js/jsbn/.
This commit is contained in:
Stefan Thomas
2013-09-21 05:41:19 -07:00
parent 0986b37267
commit 64df821b38
16 changed files with 88 additions and 97 deletions

View File

@@ -1,7 +1,6 @@
var assert = require('assert');
var utils = require('./testutils');
var jsbn = utils.load_module('jsbn');
var BigInteger = jsbn.BigInteger;
var BigInteger = require('../src/js/jsbn/jsbn').BigInteger;
var Amount = utils.load_module('amount').Amount;
var UInt160 = utils.load_module('uint160').UInt160;
var config = utils.get_config();
@@ -34,7 +33,7 @@ describe('Amount', function() {
});
describe('UInt160', function() {
it('Parse 0', function () {
assert.deepEqual(jsbn.nbi(), UInt160.from_generic('0')._value);
assert.deepEqual(new BigInteger(), UInt160.from_generic('0')._value);
});
it('Parse 0 export', function () {
assert.strictEqual(UInt160.ACCOUNT_ZERO, UInt160.from_generic('0').to_json());
@@ -49,6 +48,7 @@ describe('Amount', function() {
assert.strictEqual(UInt160.ACCOUNT_ONE, UInt160.from_json('rrrrrrrrrrrrrrrrrrrrBZbvji').to_json());
});
it('Parse mtgox export', function () {
console.log(UInt160.from_json('mtgox').to_json());
assert.strictEqual(config.accounts['mtgox'].account, UInt160.from_json('mtgox').to_json());
});
it('is_valid rrrrrrrrrrrrrrrrrrrrrhoLvTp', function () {

View File

@@ -2,8 +2,7 @@ var utils = require('./testutils');
var assert = require('assert');
var SerializedObject = utils.load_module('serializedobject').SerializedObject;
var types = utils.load_module('serializedtypes');
var jsbn = utils.load_module('jsbn');
var BigInteger = jsbn.BigInteger;
var BigInteger = require('../src/js/jsbn/jsbn').BigInteger;
var config = require('./testutils').get_config();

View File

@@ -21,18 +21,31 @@ describe('SJCL Extramath', function() {
});
});
describe('testBit', function() {
it('0x03 test bit 0 => 1', function () {
it('0x03', function () {
var val = new sjcl.bn("03");
assert.strictEqual(val.testBit(0), 1);
});
it('0x03 test bit 1 => 1', function () {
var val = new sjcl.bn("03");
assert.strictEqual(val.testBit(1), 1);
});
it('0x03 test bit 2 => 0', function () {
var val = new sjcl.bn("03");
assert.strictEqual(val.testBit(2), 0);
});
it('0x1000000', function () {
var val = new sjcl.bn("1000000");
assert.strictEqual(val.testBit(25), 0);
assert.strictEqual(val.testBit(24), 1);
assert.strictEqual(val.testBit(23), 0);
assert.strictEqual(val.testBit( 1), 0);
assert.strictEqual(val.testBit( 0), 0);
});
it('0xff7fffffff', function () {
var val = new sjcl.bn("ff7fffffff");
assert.strictEqual(val.testBit(32), 1);
assert.strictEqual(val.testBit(31), 0);
assert.strictEqual(val.testBit(30), 1);
assert.strictEqual(val.testBit(24), 1);
assert.strictEqual(val.testBit(23), 1);
assert.strictEqual(val.testBit(22), 1);
assert.strictEqual(val.testBit( 1), 1);
assert.strictEqual(val.testBit( 0), 1);
});
});
});

View File

@@ -14,11 +14,11 @@ function get_config() {
exports.load_config = load_config;
function load_config(config) {
return( require('../src/js/ripple/config')).load(config);
return load_module('config').load(config);
}
exports.load_module = load_module;
function load_module(name) {
return require((process.env.RIPPLE_LIB_COV ? '../lib-cov/' : '../src/js/ripple/') + name);
return require((process.env.RIPPLE_LIB_COV ? '../src-cov/js/ripple/' : '../src/js/ripple/') + name);
}