From 6223066d914aded6d79c0b62b831ed81e66d4449 Mon Sep 17 00:00:00 2001
From: Dan Janosik <janoside@gmail.com>
Date: Mon, 18 Jun 2018 00:05:23 +0100
Subject: [PATCH] get rid of some duplication

---
 app/rpcApi.js | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/app/rpcApi.js b/app/rpcApi.js
index d306c51..6c80c28 100644
--- a/app/rpcApi.js
+++ b/app/rpcApi.js
@@ -165,31 +165,16 @@ function getMempoolStats() {
 }
 
 function getBlockByHeight(blockHeight) {
-	console.log("getBlockByHeight: " + blockHeight);
-
 	return new Promise(function(resolve, reject) {
-		var client = global.client;
-		
-		client.command('getblockhash', blockHeight, function(err, result, resHeaders) {
-			if (err) {
-				console.log("Error 0928317yr3w: " + err);
-
-				reject(err);
+		getBlocksByHeight([blockHeight]).then(function(results) {
+			if (results && results.length > 0) {
+				resolve({ success:true, getblock:results[0] });
 
-				return;
+			} else {
+				resolve({ success:false });
 			}
-
-			client.command('getblock', result, function(err2, result2, resHeaders2) {
-				if (err2) {
-					console.log("Error 320fh7e0hg: " + err2);
-
-					reject(err2);
-
-					return;
-				}
-
-				resolve({ success:true, getblockhash:result, getblock:result2 });
-			});
+		}).catch(function(err) {
+			reject(err);
 		});
 	});
 }