From c174bed58d804d9574508e6a14ea4f1ab3cb019d Mon Sep 17 00:00:00 2001
From: Christopher Jeffrey <chjjeffrey@gmail.com>
Date: Tue, 14 Mar 2017 04:07:56 -0700
Subject: [PATCH] rpc: getmemoryinfo.

---
 lib/http/rpc.js   | 7 ++++---
 lib/wallet/rpc.js | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/http/rpc.js b/lib/http/rpc.js
index 4838302d..7ef69368 100644
--- a/lib/http/rpc.js
+++ b/lib/http/rpc.js
@@ -147,7 +147,7 @@ RPC.prototype.init = function init() {
   this.add('gettxoutproof', this.getTXOutProof);
   this.add('verifytxoutproof', this.verifyTXOutProof);
 
-  this.add('getmemory', this.getMemory);
+  this.add('getmemoryinfo', this.getMemoryInfo);
   this.add('setloglevel', this.setLogLevel);
 };
 
@@ -2012,6 +2012,7 @@ RPC.prototype.estimateSmartPriority = co(function* estimateSmartPriority(args, h
 RPC.prototype.invalidateBlock = co(function* invalidateBlock(args, help) {
   var valid = new Validator([args]);
   var hash = valid.hash(0);
+  var entry;
 
   if (help || args.length !== 1)
     throw new RPCError('invalidateblock "hash"');
@@ -2059,9 +2060,9 @@ RPC.prototype.setMockTime = co(function* setMockTime(args, help) {
   return null;
 });
 
-RPC.prototype.getMemory = co(function* getMemory(args, help) {
+RPC.prototype.getMemoryInfo = co(function* getMemoryInfo(args, help) {
   if (help || args.length !== 0)
-    throw new RPCError('getmemory');
+    throw new RPCError('getmemoryinfo');
 
   return util.memoryUsage();
 });
diff --git a/lib/wallet/rpc.js b/lib/wallet/rpc.js
index 6246b752..96e7af2a 100644
--- a/lib/wallet/rpc.js
+++ b/lib/wallet/rpc.js
@@ -106,7 +106,7 @@ RPC.prototype.init = function init() {
   this.add('walletpassphrase', this.walletPassphrase);
   this.add('removeprunedfunds', this.removePrunedFunds);
   this.add('selectwallet', this.selectWallet);
-  this.add('getmemory', this.getMemory);
+  this.add('getmemoryinfo', this.getMemoryInfo);
   this.add('setloglevel', this.setLogLevel);
 };
 
@@ -1617,9 +1617,9 @@ RPC.prototype.selectWallet = co(function* selectWallet(args, help) {
   return null;
 });
 
-RPC.prototype.getMemory = co(function* getMemory(args, help) {
+RPC.prototype.getMemoryInfo = co(function* getMemoryInfo(args, help) {
   if (help || args.length !== 0)
-    throw new RPCError('getmemory');
+    throw new RPCError('getmemoryinfo');
 
   return util.memoryUsage();
 });