BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #738 from matiu/bug/unitname 

Bug/unitname
This commit is contained in:
Gustavo Maximiliano Cortez 2014-06-24 15:04:42 -03:00
parent 6da7e4aa2a 6b7b00769d
commit 53e0371b7f
6 changed files with 113 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/controllers/addresses.js
View File

@ -31,8 +31,8 @@ angular.module('copayApp.controllers').controller('AddressesController',
for (var i = 0; i < addrInfos.length; i++) {
var addrinfo = addrInfos[i];
$scope.addresses.push({
'address': addrinfo.address.toString(),
'balance': $rootScope.balanceByAddr ? $rootScope.balanceByAddr[addrinfo.address.toString()] : 0,
'address': addrinfo.addressStr,
'balance': $rootScope.balanceByAddr ? $rootScope.balanceByAddr[addrinfo.addressStr] : 0,
'isChange': addrinfo.isChange
});
}
@ -41,5 +41,4 @@ angular.module('copayApp.controllers').controller('AddressesController',
$rootScope.receivedFund = null;
}
}
});

6
js/models/core/PublicKeyRing.js
View File

@ -209,8 +209,10 @@ PublicKeyRing.prototype.getAddressesInfo = function(opts) {
var ret = [];
if (!opts.excludeChange) {
for (var i = 0; i < this.indexes.getChangeIndex(); i++) {
var a = this.getAddress(i, true);
ret.unshift({
address: this.getAddress(i, true),
addressStr: a.toString(),
isChange: true
});
}
@ -218,8 +220,10 @@ PublicKeyRing.prototype.getAddressesInfo = function(opts) {
if (!opts.excludeMain) {
for (var i = 0; i < this.indexes.getReceiveIndex(); i++) {
var a = this.getAddress(i, false);
ret.unshift({
address: this.getAddress(i, false),
address: a,
addressStr: a.toString(),
isChange: false
});
}

48
js/services/controllerUtils.js
View File

@ -14,6 +14,8 @@ angular.module('copayApp.services')
};
root.logout = function() {
Socket.removeAllListeners();
$rootScope.wallet = null;
delete $rootScope['wallet'];
video.close();
@ -70,10 +72,35 @@ angular.module('copayApp.services')
});
};
root.setupRootVariables = function() {
$rootScope.unitName = config.unitName;
$rootScope.txAlertCount = 0;
$rootScope.insightError = 0;
$rootScope.isCollapsed = true;
$rootScope.$watch('insightError', function(status) {
if (status === -1) {
$rootScope.$flashMessage = {
type: 'success',
message: 'Networking Restored :)',
};
$rootScope.insightError = 0;
}
});
$rootScope.$watch('txAlertCount', function(txAlertCount) {
if (txAlertCount && txAlertCount > 0) {
notification.info('New Transaction', ($rootScope.txAlertCount == 1) ? 'You have a pending transaction proposal' : 'You have ' + $rootScope.txAlertCount + ' pending transaction proposals', txAlertCount);
}
});
};
root.startNetwork = function(w, $scope) {
Socket.removeAllListeners();
root.setupRootVariables();
root.installStartupHandlers(w, $scope);
root.setSocketHandlers();
var handlePeerVideo = function(err, peerID, url) {
if (err) {
@ -103,8 +130,8 @@ angular.module('copayApp.services')
});
w.on('publicKeyRingUpdated', function(dontDigest) {
root.setSocketHandlers();
root.updateAddressList();
root.setSocketHandlers();
if (!dontDigest) {
$rootScope.$digest();
}
@ -273,20 +300,23 @@ angular.module('copayApp.services')
if (!$rootScope.wallet) return;
var currentAddrs = Socket.getListeners();
var addrs = $rootScope.wallet.getAddressesStr();
var allAddrs = $rootScope.addrInfos;
var newAddrs = [];
for (var i in addrs) {
var a = addrs[i];
if (!currentAddrs[a])
for (var i in allAddrs) {
var a = allAddrs[i];
if (!currentAddrs[a.addressStr])
newAddrs.push(a);
}
for (var i = 0; i < newAddrs.length; i++) {
Socket.emit('subscribe', newAddrs[i]);
Socket.emit('subscribe', newAddrs[i].addressStr);
}
newAddrs.forEach(function(addr) {
Socket.on(addr, function(txid) {
$rootScope.receivedFund = [txid, addr];
newAddrs.forEach(function(a) {
Socket.on(a.addressStr, function(txid) {
if (!a.isChange)
notification.funds('Received fund', a.addressStr);
root.updateBalance(function() {
$rootScope.$digest();
});

2
js/services/socket.js
View File

@ -68,7 +68,7 @@ angular.module('copayApp.services').factory('Socket',
removeAllListeners: function() {
for (var i = 0; i < listeners.length; i++) {
var details = listeners[i];
socket.removeListener(details.event, details.fn);
socket.removeAllListeners(details.event);
}
listeners = [];

6
test/test.PublicKeyRing.js
View File

@ -147,11 +147,13 @@ describe('PublicKeyRing model', function() {
for (var i = 0; i < 2; i++)
w.generateAddress(isChange);
var as = w.getAddresses();
var as = w.getAddressesInfo();
as.length.should.equal(4);
for (var j in as) {
var a = as[j];
a.isValid().should.equal(true);
a.address.isValid().should.equal(true);
a.addressStr.should.equal(a.address.toString());
a.isChange.should.equal([false, false, true, true][j]);
}
});

117
test/unit/services/servicesSpec.js
View File

@ -70,65 +70,72 @@ describe("Unit: Walletfactory Service", function() {
});
describe("Unit: controllerUtils", function() {
beforeEach(angular.mock.module('copayApp.services'));
beforeEach(angular.mock.module('copayApp.services'));
it('should updateBalance in bits', inject(function(controllerUtils, $rootScope) {
expect(controllerUtils.updateBalance).not.to.equal(null);
scope = $rootScope.$new();
it('should updateBalance in bits', inject(function(controllerUtils, $rootScope) {
expect(controllerUtils.updateBalance).not.to.equal(null);
scope = $rootScope.$new();
$rootScope.wallet = new FakeWallet();
var addr = '1CjPR7Z5ZSyWk6WtXvSFgkptmpoi4UM9BC';
var a = {};
a[addr] = 100;
//SATs
$rootScope.wallet.set(100000001, 90000002, a);
$rootScope.wallet = new FakeWallet();
var addr = '1CjPR7Z5ZSyWk6WtXvSFgkptmpoi4UM9BC';
var a = {};
a[addr] = 100;
//SATs
$rootScope.wallet.set(100000001, 90000002, a);
//retuns values in DEFAULT UNIT(bits)
controllerUtils.updateBalance(function() {
expect($rootScope.totalBalanceBTC).to.be.equal('1.0000');
expect($rootScope.availableBalanceBTC).to.be.equal('0.9000');
expect($rootScope.totalBalance).to.be.equal(1000000.01);
expect($rootScope.availableBalance).to.be.equal(900000.02);
expect($rootScope.addrInfos).not.to.equal(null);
expect($rootScope.addrInfos[0].address).to.equal(addr);
//retuns values in DEFAULT UNIT(bits)
controllerUtils.updateBalance(function() {
expect($rootScope.totalBalanceBTC).to.be.equal('1.0000');
expect($rootScope.availableBalanceBTC).to.be.equal('0.9000');
expect($rootScope.totalBalance).to.be.equal(1000000.01);
expect($rootScope.availableBalance).to.be.equal(900000.02);
expect($rootScope.addrInfos).not.to.equal(null);
expect($rootScope.addrInfos[0].address).to.equal(addr);
});
}));
it('should set the rootScope', inject(function(controllerUtils, $rootScope) {
controllerUtils.setupRootVariables(function() {
expect($rootScope.txAlertCount).to.be.equal(0);
expect($rootScope.insightError).to.be.equal(0);
expect($rootScope.isCollapsed).to.be.equal(0);
expect($rootScope.unitName).to.be.equal('bits');
});
}));
});
}));
describe("Unit: Notification Service", function() {
beforeEach(angular.mock.module('copayApp.services'));
it('should contain a notification service', inject(function(notification) {
expect(notification).not.to.equal(null);
}));
});
});
describe("Unit: Backup Service", function() {
beforeEach(angular.mock.module('copayApp.services'));
it('should contain a backup service', inject(function(backupService) {
expect(backupService).not.to.equal(null);
}));
it('should backup in file', inject(function(backupService) {
var mock = sinon.mock(window);
var expectation = mock.expects('saveAs');
backupService.download(new FakeWallet());
expectation.once();
}));
});
describe("Unit: Notification Service", function() {
beforeEach(angular.mock.module('copayApp.services'));
it('should contain a notification service', inject(function(notification) {
expect(notification).not.to.equal(null);
}));
});
describe("Unit: Backup Service", function() {
beforeEach(angular.mock.module('copayApp.services'));
it('should contain a backup service', inject(function(backupService) {
expect(backupService).not.to.equal(null);
}));
it('should backup in file', inject(function(backupService) {
var mock = sinon.mock(window);
var expectation = mock.expects('saveAs');
backupService.download(new FakeWallet());
expectation.once();
}));
});
describe("Unit: isMobile Service", function() {
beforeEach(angular.mock.module('copayApp.services'));
it('should contain a isMobile service', inject(function(isMobile) {
expect(isMobile).not.to.equal(null);
}));
it('should not detect mobile by default', inject(function(isMobile) {
isMobile.any().should.equal(false);
}));
it('should detect mobile if user agent is Android', inject(function(isMobile) {
navigator.__defineGetter__('userAgent', function() {
return 'Android 2.2.3';
});
isMobile.any().should.equal(true);
}));
});
describe("Unit: isMobile Service", function() {
beforeEach(angular.mock.module('copayApp.services'));
it('should contain a isMobile service', inject(function(isMobile) {
expect(isMobile).not.to.equal(null);
}));
it('should not detect mobile by default', inject(function(isMobile) {
isMobile.any().should.equal(false);
}));
it('should detect mobile if user agent is Android', inject(function(isMobile) {
navigator.__defineGetter__('userAgent', function() {
return 'Android 2.2.3';
});
isMobile.any().should.equal(true);
}));
});