This commit is contained in:
wltsmrz
2014-06-03 16:44:36 -07:00
parent c1c18c465d
commit ad08e20085
3 changed files with 2 additions and 19 deletions

View File

@@ -694,7 +694,7 @@ Server.prototype._computeFee = function(transaction) {
var units;
if (transaction instanceof Transaction) {
units = transaction.feeUnits();
units = transaction._getFeeUnits();
} else if (typeof transaction === 'number') {
units = transaction;
} else {

View File

@@ -925,13 +925,6 @@ Transaction.prototype.abort = function(callback) {
}
};
Transaction.prototype.iff = function(fn) {
var self = this;
this._iff = function(callback) {
fn(self.summary(), callback);
};
};
Transaction.prototype.summary = function() {
return Transaction.summary.call(this);
};

View File

@@ -509,17 +509,7 @@ TransactionManager.prototype._request = function(tx) {
submitRequest.server = tx._server;
}
if (typeof tx._iff === 'function') {
tx._iff(function(err, proceed) {
if (err || !proceed) {
tx.emit('abort');
} else {
submitTransaction();
}
});
} else {
submitTransaction();
}
submitTransaction();
};
function requestTimeout() {