From d304063cdaaaaaf168f984c44da4b52235e52f61 Mon Sep 17 00:00:00 2001 From: Igor Mandrigin Date: Fri, 18 May 2018 12:55:20 +0200 Subject: [PATCH] Use `if-not` for error handling in ethereum core functions. That fixes the exception if we have an error that isn't a string and does not conform to `ISeqable`. Signed-off-by: Igor Mandrigin --- src/status_im/utils/ethereum/core.cljs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/status_im/utils/ethereum/core.cljs b/src/status_im/utils/ethereum/core.cljs index b56cde0825..7aad4d6023 100644 --- a/src/status_im/utils/ethereum/core.cljs +++ b/src/status_im/utils/ethereum/core.cljs @@ -109,24 +109,24 @@ (defn get-block-number [web3 cb] (.getBlockNumber (.-eth web3) (fn [error result] - (if (seq error) - (handle-error error) - (cb result))))) + (if-not error + (cb result) + (handle-error error))))) (defn get-block-info [web3 number cb] (.getBlock (.-eth web3) number (fn [error result] - (if (seq error) - (handle-error error) - (cb (js->clj result :keywordize-keys true)))))) + (if-not error + (cb (js->clj result :keywordize-keys true)) + (handle-error error))))) (defn get-transaction [web3 number cb] (.getTransaction (.-eth web3) number (fn [error result] - (if (seq error) - (handle-error error) - (cb (js->clj result :keywordize-keys true)))))) + (if-not error + (cb (js->clj result :keywordize-keys true)) + (handle-error error))))) (defn get-transaction-receipt [web3 number cb] (.getTransactionReceipt (.-eth web3) number (fn [error result] - (if (seq error) - (handle-error error) - (cb (js->clj result :keywordize-keys true)))))) + (if-not error + (cb (js->clj result :keywordize-keys true)) + (handle-error error)))))