From 8ef3168af13f3979cd11a2905ba35206857ef06d Mon Sep 17 00:00:00 2001
From: Kagami Hiiragi <kagami@genshiken.org>
Date: Thu, 8 Jan 2015 05:00:19 +0300
Subject: [PATCH] Make code more consistent

---
 lib/address.js |  6 +++---
 lib/structs.js | 16 +++++++++-------
 lib/wif.js     |  6 +++---
 test.js        | 11 +++++++----
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/lib/address.js b/lib/address.js
index 3fc88f4..ce247ef 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -54,7 +54,7 @@ Address.decode = function(str) {
   var bytes = bs58.decode(str);
   var data = new Buffer(bytes.slice(0, -4));
   var checksum = new Buffer(bytes.slice(-4));
-  assert(bufferEqual(checksum, getchecksum(data)), "Bad checkum");
+  assert(bufferEqual(checksum, getaddrchecksum(data)), "Bad checkum");
 
   var decoded = var_int.decode(data);
   var version = decoded.value;
@@ -72,7 +72,7 @@ Address.decode = function(str) {
 };
 
 // Compute the Bitmessage checksum for the given data.
-function getchecksum(data) {
+function getaddrchecksum(data) {
   return bmcrypto.sha512(bmcrypto.sha512(data)).slice(0, 4);
 }
 
@@ -176,7 +176,7 @@ Address.prototype.encode = function() {
     var_int.encode(this.stream),
     ripe,
   ]);
-  var addr = Buffer.concat([data, getchecksum(data)]);
+  var addr = Buffer.concat([data, getaddrchecksum(data)]);
   return "BM-" + bs58.encode(addr);
 };
 
diff --git a/lib/structs.js b/lib/structs.js
index 966aee9..49bdc88 100644
--- a/lib/structs.js
+++ b/lib/structs.js
@@ -20,7 +20,8 @@ function isAscii(str) {
   return true;
 }
 
-function getchecksum(data) {
+// Compute the message checksum for the given data.
+function getmsgchecksum(data) {
   return bmcrypto.sha512(data).slice(0, 4);
 }
 
@@ -45,20 +46,21 @@ var message = exports.message = {
     assert(buf.length >= 24, "Buffer is too small");
     assert(buf.readUInt32BE(0, true) === message.MAGIC, "Wrong magic");
     var command = buf.slice(4, 16);
-    var firstNonNull;
+    var firstNonNull = 0;
     for (var i = 11; i >=0; i--) {
       assert(command[i] <= 127, "Non-ASCII characters in command");
-      if (firstNonNull === undefined && command[i] !== 0) {
-        firstNonNull = i;
+      if (!firstNonNull && command[i] !== 0) {
+        firstNonNull = i + 1;
       }
     }
-    command = command.slice(0, firstNonNull + 1).toString("ascii");
+    // Command could be empty.
+    command = command.slice(0, firstNonNull).toString("ascii");
     var payloadLength = buf.readUInt32BE(16, true);
     assert(payloadLength <= 262144, "Payload is too big");
     var checksum = buf.slice(20, 24);
     var length = 24 + payloadLength;
     var payload = buf.slice(24, length);
-    assert(bufferEqual(checksum, getchecksum(payload)), "Bad checkum");
+    assert(bufferEqual(checksum, getmsgchecksum(payload)), "Bad checkum");
     var rest = buf.slice(length);
     return {command: command, payload: payload, length: length, rest: rest};
   },
@@ -77,7 +79,7 @@ var message = exports.message = {
     buf.writeUInt32BE(message.MAGIC, 0, true);
     buf.write(opts.command, 4);
     buf.writeUInt32BE(opts.payload.length, 16, true);
-    getchecksum(opts.payload).copy(buf, 20);
+    getmsgchecksum(opts.payload).copy(buf, 20);
     opts.payload.copy(buf, 24);
     return buf;
   },
diff --git a/lib/wif.js b/lib/wif.js
index b721bf3..8e77931 100644
--- a/lib/wif.js
+++ b/lib/wif.js
@@ -12,7 +12,7 @@ var assert = require("./util").assert;
 var bmcrypto = require("./crypto");
 
 // Compute the WIF checksum for the given data.
-function getchecksum(data) {
+function getwifchecksum(data) {
   return bmcrypto.sha256(bmcrypto.sha256(data)).slice(0, 4);
 }
 
@@ -26,7 +26,7 @@ exports.decode = function(wif) {
   assert(bytes[0] === 0x80, "Bad WIF");
   var data = new Buffer(bytes.slice(0, -4));
   var checksum = new Buffer(bytes.slice(-4));
-  assert(bufferEqual(checksum, getchecksum(data)), "Bad checkum");
+  assert(bufferEqual(checksum, getwifchecksum(data)), "Bad checkum");
   return data.slice(1);
 };
 
@@ -37,7 +37,7 @@ exports.decode = function(wif) {
  */
 exports.encode = function(privateKey) {
   var data = Buffer.concat([new Buffer([0x80]), privateKey]);
-  var checksum = getchecksum(data);
+  var checksum = getwifchecksum(data);
   var bytes = Buffer.concat([data, checksum]);
   return bs58.encode(bytes);
 };
diff --git a/test.js b/test.js
index 7fd014a..bc2a726 100644
--- a/test.js
+++ b/test.js
@@ -57,10 +57,6 @@ describe("Crypto", function() {
 
 describe("Common structures", function() {
   describe("message", function() {
-    it("should encode", function() {
-      expect(message.encode({command: "test", payload: Buffer("payload")}).toString("hex")).to.equal("e9beb4d97465737400000000000000000000000770b33ce97061796c6f6164");
-    });
-
     it("should decode", function() {
       var res;
       res = message.decode(Buffer("e9beb4d97465737400000000000000000000000770b33ce97061796c6f6164", "hex"));
@@ -68,6 +64,13 @@ describe("Common structures", function() {
       expect(res.payload.toString()).to.equal("payload");
       expect(res.length).to.equal(31);
       expect(res.rest.toString("hex")).to.equal("");
+
+      res = message.decode(Buffer("e9beb4d90000000000000000000000000000000770b33ce97061796c6f6164", "hex"));
+      expect(res.command).to.equal("");
+    });
+
+    it("should encode", function() {
+      expect(message.encode({command: "test", payload: Buffer("payload")}).toString("hex")).to.equal("e9beb4d97465737400000000000000000000000770b33ce97061796c6f6164");
     });
   });