From 2791f43b1dc21c48d8f4c65eb4d34736fa8e8a45 Mon Sep 17 00:00:00 2001
From: Arthur Britto <ahbritto@gmail.com>
Date: Mon, 3 Dec 2012 16:46:27 -0800
Subject: [PATCH] Fixes for emit ledger_closed.

---
 src/js/remote.js     |  8 +++++---
 test/monitor-test.js |  2 +-
 test/offer-test.js   | 18 +++++++++---------
 test/send-test.js    |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/js/remote.js b/src/js/remote.js
index bc7b51d3bc..cd36c919c0 100644
--- a/src/js/remote.js
+++ b/src/js/remote.js
@@ -803,7 +803,7 @@ Remote.prototype._server_subscribe = function () {
           self._ledger_hash           = message.ledger_hash;
           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');
@@ -1209,8 +1209,10 @@ Transaction.prototype.submit = function (callback) {
     this.submit_index = this.remote._ledger_current_index;
 
     // When a ledger closes, look for the result.
-    var on_ledger_closed = function (ledger_hash, ledger_index) {
-        var stop  = false;
+    var on_ledger_closed = function (message) {
+        var ledger_hash   = message.ledger_hash;
+        var ledger_index  = message.ledger_index;
+        var stop          = false;
 
 // XXX make sure self.hash is available.
         self.remote.request_transaction_entry(self.hash)
diff --git a/test/monitor-test.js b/test/monitor-test.js
index 6e4abc5a3e..daef55a658 100644
--- a/test/monitor-test.js
+++ b/test/monitor-test.js
@@ -29,7 +29,7 @@ buster.testCase("//Monitor account", {
           function (callback) {
             self.what = "Close ledger.";
 
-            self.remote.once('ledger_closed', function (ledger_closed, ledger_index) {
+            self.remote.once('ledger_closed', function () {
                 callback();
               });
 
diff --git a/test/offer-test.js b/test/offer-test.js
index ccdfa31b6e..b139f318b8 100644
--- a/test/offer-test.js
+++ b/test/offer-test.js
@@ -57,7 +57,7 @@ buster.testCase("Offer tests", {
           },
           function (m, callback) {
             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);
                 })
               .ledger_accept();
@@ -101,7 +101,7 @@ buster.testCase("Offer tests", {
           function (callback) {
             if (!final_create) {
               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);
 
                   })
@@ -133,7 +133,7 @@ buster.testCase("Offer tests", {
           // See if ledger_accept will crash.
           function (callback) {
             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);
                   callback();
                 })
@@ -141,7 +141,7 @@ buster.testCase("Offer tests", {
           },
           function (callback) {
             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);
                   callback();
                 })
@@ -198,7 +198,7 @@ buster.testCase("Offer tests", {
           function (callback) {
             if (!final_create) {
               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);
 
                   })
@@ -230,7 +230,7 @@ buster.testCase("Offer tests", {
           // See if ledger_accept will crash.
           function (callback) {
             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);
                   callback();
                 })
@@ -238,7 +238,7 @@ buster.testCase("Offer tests", {
           },
           function (callback) {
             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);
                   callback();
                 })
@@ -309,7 +309,7 @@ buster.testCase("Offer tests", {
           // See if ledger_accept will crash.
           function (callback) {
             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);
                   callback();
                 })
@@ -317,7 +317,7 @@ buster.testCase("Offer tests", {
           },
           function (callback) {
             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);
                   callback();
                 })
diff --git a/test/send-test.js b/test/send-test.js
index b09ca26431..890f32a7e1 100644
--- a/test/send-test.js
+++ b/test/send-test.js
@@ -442,7 +442,7 @@ buster.testCase("Sending future", {
 //          self.what = "Close the ledger and check balance.";
 //
 //          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);
 //                callback();
 //              })