aiolabs/lightning-pub
2
0
Fork 0
Code Issues 9 Pull requests 4 Projects Releases Packages Wiki Activity Actions

Merge pull request #9 from shocknet/bug/wallet_status_response

Browse source 
Fixed status response inconsistencies
This commit is contained in:
Emad-salah 2019-12-13 16:12:55 -05:00 • committed by GitHub
commit 745c50be79
1 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/routes.js
View file

@ -45,7 +45,7 @@ module.exports = (
success: true success: true
}); });
} else if (err.code === 14) { } else if (err.code === 14) {
resolve({ reject({
service: "unknown", service: "unknown",
message: message:
"Failed to connect to LND server, make sure it's up and running.", "Failed to connect to LND server, make sure it's up and running.",
@ -157,22 +157,27 @@ module.exports = (
// Hack to check whether or not a wallet exists // Hack to check whether or not a wallet exists
const walletExists = async () => { const walletExists = async () => {
const availableService = await getAvailableService(); try {
if (availableService.service === "lightning") { const availableService = await getAvailableService();
return true; if (availableService.service === "lightning") {
}
if (availableService.service === "walletUnlocker") {
const randomPassword = Crypto.randomBytes(4).toString('hex');
try {
await unlockWallet(randomPassword);
return true; return true;
} catch (err) {
if (err.message.indexOf("invalid passphrase") > -1) {
return true;
}
return false;
} }
if (availableService.service === "walletUnlocker") {
const randomPassword = Crypto.randomBytes(4).toString('hex');
try {
await unlockWallet(randomPassword);
return true;
} catch (err) {
if (err.message.indexOf("invalid passphrase") > -1) {
return true;
}
return false;
}
}
} catch(err) {
logger.error("LND error:", err);
return false;
} }
}; };
@ -216,8 +221,8 @@ module.exports = (
logger.error(err); logger.error(err);
const sanitizedMessage = sanitizeLNDError(err.message); const sanitizedMessage = sanitizeLNDError(err.message);
res.status(500).json({ res.status(500).json({
walletExists: null, field: "LND",
walletStatus: sanitizedMessage ? sanitizedMessage : "An unknown error has occurred, please try restarting your LND and API servers" errorMessage: sanitizedMessage ? sanitizedMessage : "An unknown error has occurred, please try restarting your LND and API servers"
}); });
} }
}); });