1. Add TxProposals to mocha test page

2. The jshint tool found some instances where var was declared twice within a function. Seemed to originate from copy/paste-style coding. Most were unambiguously intended for a single block within the function. In a few cases, two declarations were consumed by one later reference. In those cases, I removed the duplicate var or I refactored slightly.
This commit is contained in:
Gregg Zigler 2014-08-06 17:07:01 -04:00
parent 8e2802e1e7
commit c8c7a57416
6 changed files with 16 additions and 12 deletions

View File

@ -25,7 +25,7 @@ angular.module('copayApp.controllers').controller('OpenController',
Passphrase.getBase64Async(password, function(passphrase) {
var w, errMsg;
try {
var w = walletFactory.open($scope.selectedWalletId, {
w = walletFactory.open($scope.selectedWalletId, {
passphrase: passphrase
});
} catch (e) {

View File

@ -28,7 +28,7 @@ angular.module('copayApp.filters', [])
})
.filter('limitAddress', function() {
return function(elements, showAll) {
var elements = elements.sort(function(a, b) {
elements = elements.sort(function(a, b) {
return (+b.owned) - (+a.owned);
});

View File

@ -12,11 +12,11 @@ Message.encode = function(topubkey, fromkey, payload, opts) {
//i.e., increment version1 to prevent communications with old clients
var version2 = new Buffer([0]); //peers will not reject messages containing not-understood version2
//i.e., increment version2 to allow communication with old clients, but signal new clients
var nonce;
if (opts && opts.nonce && Buffer.isBuffer(opts.nonce) && opts.nonce.length == 8) {
var nonce = opts.nonce;
nonce = opts.nonce;
} else {
var nonce = new Buffer(8);
nonce = new Buffer(8);
nonce.fill(0); //nonce is a big endian 8 byte number
}
@ -33,10 +33,11 @@ Message.encode = function(topubkey, fromkey, payload, opts) {
};
Message.decode = function(key, encoded, opts) {
var prevnonce;
if (opts && opts.prevnonce && Buffer.isBuffer(opts.prevnonce) && opts.prevnonce.length == 8) {
var prevnonce = opts.prevnonce;
prevnonce = opts.prevnonce;
} else {
var prevnonce = new Buffer(8);
prevnonce = new Buffer(8);
prevnonce.fill(0); //nonce is a big endian 8 byte number
}

View File

@ -20,6 +20,7 @@
<script src="test.PrivateKey.js"></script>
<script src="test.PublicKeyRing.js"></script>
<script src="test.storage.LocalEncrypted.js"></script>
<script src="test.TxProposals.js"></script>
<script src="test.Wallet.js"></script>
<script src="test.WalletFactory.js"></script>
<script src="test.performance.js"></script>

View File

@ -225,14 +225,15 @@ describe('PublicKeyRing model', function() {
it('should merge backup', function() {
var w = getCachedW().w;
var hasChanged;
w.copayersBackup = ["a", "b"];
var hasChanged = w.mergeBackups(["b", "c"]);
hasChanged = w.mergeBackups(["b", "c"]);
w.copayersBackup.length.should.equal(3);
hasChanged.should.equal(true);
w.copayersBackup = ["a", "b", "c"];
var hasChanged = w.mergeBackups(["b", "c"]);
hasChanged = w.mergeBackups(["b", "c"]);
w.copayersBackup.length.should.equal(3);
hasChanged.should.equal(false);
});
@ -348,9 +349,10 @@ describe('PublicKeyRing model', function() {
var config = {
networkName: 'livenet',
};
var copayers;
var w = new PublicKeyRing(config);
should.exist(w);
var copayers = [];
copayers = [];
for (var i = 0; i < 2; i++) {
w.isComplete().should.equal(false);
w.addCopayer(getNewEpk());
@ -361,7 +363,7 @@ describe('PublicKeyRing model', function() {
id: w.id,
});
should.exist(w);
var copayers = [];
copayers = [];
for (var i = 0; i < 3; i++) {
w2.isComplete().should.equal(false);
w2.addCopayer(getNewEpk());

View File

@ -298,7 +298,7 @@ describe('WalletFactory model', function() {
var w = wf.create({
name: 'test wallet'
});
var ws = wf.getWallets();
ws = wf.getWallets();
ws.length.should.equal(1);
ws[0].name.should.equal('test wallet');
});