Merge pull request #62 from airswap/response-handling

More explicit response handling for peer calls
airswap · Feb 14, 2020 · be84776 · be84776
2 parents 80d250e + e331733
commit be84776
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/commands/quote/get.ts b/src/commands/quote/get.ts
@@ -32,8 +32,10 @@ export default class QuoteGet extends Command {
             this.log()
           }
           process.exit(0)
-        } else {
+        } else if (quote) {
           await printOrder(this, request, locator, quote, wallet, metadata)
+        } else {
+          this.log('No valid response received.\n')
         }
       })
     } catch (e) {

diff --git a/src/lib/requests.ts b/src/lib/requests.ts
@@ -48,13 +48,13 @@ export function peerCall(locator: string, method: string, params: any, callback:
 
   client.request(method, params, function(err: any, error: any, result: any) {
     if (err) {
-      callback(`\n${chalk.yellow('Connection Error')}: ${locator} \n ${err}`)
+      callback(`\n${chalk.yellow('Server Error')}: ${locator} \n ${err}`, null)
+    } else if (error) {
+      callback(`\n${chalk.yellow('Maker Error')}: ${error.message}\n`, null)
+    } else if (result) {
+      callback(null, result)
     } else {
-      if (error) {
-        callback(`\n${chalk.yellow('Error Response')}: ${error.message}\n`)
-      } else {
-        callback(null, result)
-      }
+      callback(null, null)
     }
   })
 }