Fixes for emit ledger_closed.

This commit is contained in:
Arthur Britto
2012-12-03 16:46:27 -08:00
parent 0db2d312bb
commit 2791f43b1d
4 changed files with 16 additions and 14 deletions

View File

@@ -803,7 +803,7 @@ Remote.prototype._server_subscribe = function () {
self._ledger_hash = message.ledger_hash; self._ledger_hash = message.ledger_hash;
self._ledger_current_index = message.ledger_index+1; self._ledger_current_index = message.ledger_index+1;
self.emit('ledger_closed', self._ledger_hash, self._ledger_current_index-1); self.emit('ledger_closed', message);
} }
self.emit('subscribed'); self.emit('subscribed');
@@ -1209,7 +1209,9 @@ Transaction.prototype.submit = function (callback) {
this.submit_index = this.remote._ledger_current_index; this.submit_index = this.remote._ledger_current_index;
// When a ledger closes, look for the result. // When a ledger closes, look for the result.
var on_ledger_closed = function (ledger_hash, ledger_index) { var on_ledger_closed = function (message) {
var ledger_hash = message.ledger_hash;
var ledger_index = message.ledger_index;
var stop = false; var stop = false;
// XXX make sure self.hash is available. // XXX make sure self.hash is available.

View File

@@ -29,7 +29,7 @@ buster.testCase("//Monitor account", {
function (callback) { function (callback) {
self.what = "Close ledger."; self.what = "Close ledger.";
self.remote.once('ledger_closed', function (ledger_closed, ledger_index) { self.remote.once('ledger_closed', function () {
callback(); callback();
}); });

View File

@@ -57,7 +57,7 @@ buster.testCase("Offer tests", {
}, },
function (m, callback) { function (m, callback) {
self.remote self.remote
.once('ledger_closed', function (ledger_hash, ledger_index) { .once('ledger_closed', function (message) {
// console.log("LEDGER_CLOSED: %d: %s", ledger_index, ledger_hash); // console.log("LEDGER_CLOSED: %d: %s", ledger_index, ledger_hash);
}) })
.ledger_accept(); .ledger_accept();
@@ -101,7 +101,7 @@ buster.testCase("Offer tests", {
function (callback) { function (callback) {
if (!final_create) { if (!final_create) {
self.remote self.remote
.once('ledger_closed', function (ledger_hash, ledger_index) { .once('ledger_closed', function (mesage) {
// console.log("LEDGER_CLOSED: %d: %s", ledger_index, ledger_hash); // console.log("LEDGER_CLOSED: %d: %s", ledger_index, ledger_hash);
}) })
@@ -133,7 +133,7 @@ buster.testCase("Offer tests", {
// See if ledger_accept will crash. // See if ledger_accept will crash.
function (callback) { function (callback) {
self.remote self.remote
.once('ledger_closed', function (ledger_hash, ledger_index) { .once('ledger_closed', function (mesage) {
// console.log("LEDGER_CLOSED: A: %d: %s", ledger_index, ledger_hash); // console.log("LEDGER_CLOSED: A: %d: %s", ledger_index, ledger_hash);
callback(); callback();
}) })
@@ -141,7 +141,7 @@ buster.testCase("Offer tests", {
}, },
function (callback) { function (callback) {
self.remote self.remote
.once('ledger_closed', function (ledger_hash, ledger_index) { .once('ledger_closed', function (mesage) {
// console.log("LEDGER_CLOSED: B: %d: %s", ledger_index, ledger_hash); // console.log("LEDGER_CLOSED: B: %d: %s", ledger_index, ledger_hash);
callback(); callback();
}) })
@@ -198,7 +198,7 @@ buster.testCase("Offer tests", {
function (callback) { function (callback) {
if (!final_create) { if (!final_create) {
self.remote self.remote
.once('ledger_closed', function (ledger_hash, ledger_index) { .once('ledger_closed', function (mesage) {
// console.log("LEDGER_CLOSED: %d: %s", ledger_index, ledger_hash); // console.log("LEDGER_CLOSED: %d: %s", ledger_index, ledger_hash);
}) })
@@ -230,7 +230,7 @@ buster.testCase("Offer tests", {
// See if ledger_accept will crash. // See if ledger_accept will crash.
function (callback) { function (callback) {
self.remote self.remote
.once('ledger_closed', function (ledger_hash, ledger_index) { .once('ledger_closed', function (mesage) {
// console.log("LEDGER_CLOSED: A: %d: %s", ledger_index, ledger_hash); // console.log("LEDGER_CLOSED: A: %d: %s", ledger_index, ledger_hash);
callback(); callback();
}) })
@@ -238,7 +238,7 @@ buster.testCase("Offer tests", {
}, },
function (callback) { function (callback) {
self.remote self.remote
.once('ledger_closed', function (ledger_hash, ledger_index) { .once('ledger_closed', function (mesage) {
// console.log("LEDGER_CLOSED: B: %d: %s", ledger_index, ledger_hash); // console.log("LEDGER_CLOSED: B: %d: %s", ledger_index, ledger_hash);
callback(); callback();
}) })
@@ -309,7 +309,7 @@ buster.testCase("Offer tests", {
// See if ledger_accept will crash. // See if ledger_accept will crash.
function (callback) { function (callback) {
self.remote self.remote
.once('ledger_closed', function (ledger_hash, ledger_index) { .once('ledger_closed', function (mesage) {
// console.log("LEDGER_CLOSED: A: %d: %s", ledger_index, ledger_hash); // console.log("LEDGER_CLOSED: A: %d: %s", ledger_index, ledger_hash);
callback(); callback();
}) })
@@ -317,7 +317,7 @@ buster.testCase("Offer tests", {
}, },
function (callback) { function (callback) {
self.remote self.remote
.once('ledger_closed', function (ledger_hash, ledger_index) { .once('ledger_closed', function (mesage) {
// console.log("LEDGER_CLOSED: B: %d: %s", ledger_index, ledger_hash); // console.log("LEDGER_CLOSED: B: %d: %s", ledger_index, ledger_hash);
callback(); callback();
}) })

View File

@@ -442,7 +442,7 @@ buster.testCase("Sending future", {
// self.what = "Close the ledger and check balance."; // self.what = "Close the ledger and check balance.";
// //
// self.remote // self.remote
// .once('ledger_closed', function (ledger_closed, ledger_closed_index) { // .once('ledger_closed', function (message) {
// // console.log("LEDGER_CLOSED: A: %d: %s", ledger_closed_index, ledger_closed); // // console.log("LEDGER_CLOSED: A: %d: %s", ledger_closed_index, ledger_closed);
// callback(); // callback();
// }) // })