Merge branch 'master' into feature/header

This commit is contained in:
Bechi 2014-01-15 10:34:45 -03:00
commit 5c31a92932
2 changed files with 6 additions and 7 deletions

View File

@ -26,32 +26,32 @@ function spec() {
} }
Object.defineProperty(this, "totalSent", { Object.defineProperty(this, 'totalSent', {
get: function() { get: function() {
return parseFloat(this.totalSentSat) / parseFloat(BitcoreUtil.COIN); return parseFloat(this.totalSentSat) / parseFloat(BitcoreUtil.COIN);
}, },
set: function(i) { set: function(i) {
totalSentSat = i * BitcoreUtil.COIN; this.totalSentSat = i * BitcoreUtil.COIN;
}, },
enumerable: 1, enumerable: 1,
}); });
Object.defineProperty(this, "balance", { Object.defineProperty(this, 'balance', {
get: function() { get: function() {
return parseFloat(this.balanceSat) / parseFloat(BitcoreUtil.COIN); return parseFloat(this.balanceSat) / parseFloat(BitcoreUtil.COIN);
}, },
set: function(i) { set: function(i) {
balance = i * BitcoreUtil.COIN; this.balance = i * BitcoreUtil.COIN;
}, },
enumerable: 1, enumerable: 1,
}); });
Object.defineProperty(this, "totalReceived", { Object.defineProperty(this, 'totalReceived', {
get: function() { get: function() {
return parseFloat(this.totalReceivedSat) / parseFloat(BitcoreUtil.COIN); return parseFloat(this.totalReceivedSat) / parseFloat(BitcoreUtil.COIN);
}, },
set: function(i) { set: function(i) {
totalReceived = i * BitcoreUtil.COIN; this.totalReceived = i * BitcoreUtil.COIN;
}, },
enumerable: 1, enumerable: 1,
}); });

View File

@ -5,7 +5,6 @@
*/ */
var mongoose = require('mongoose'), var mongoose = require('mongoose'),
Schema = mongoose.Schema, Schema = mongoose.Schema,
bignum = require('bignum'),
RpcClient = require('bitcore/RpcClient').class(), RpcClient = require('bitcore/RpcClient').class(),
util = require('bitcore/util/util'), util = require('bitcore/util/util'),
BitcoreBlock= require('bitcore/Block').class(), BitcoreBlock= require('bitcore/Block').class(),