Handle service network errors

Author: thibault-martinez

include/iota/api/service.hpp

@@ -30,7 +30,7 @@
 #include <iota/constants.hpp>
 #include <iota/errors/bad_request.hpp>
 #include <iota/errors/internal_server_error.hpp>
-#include <iota/errors/timeout.hpp>
+#include <iota/errors/network.hpp>
 #include <iota/errors/unauthorized.hpp>
 #include <iota/errors/unrecognized.hpp>
 
@@ -66,8 +66,12 @@ class Service {
                                 { "X-IOTA-API-Version", APIVersion } };
     auto res     = cpr::Post(url, body, headers, cpr::Timeout{ timeout * 1000 });
 
+    if (res.error.code != cpr::ErrorCode::OK)
+      throw Errors::Network(res.error.message);
+
     json        resJson;
     std::string error;
+
     try {
       resJson = json::parse(res.text);
 
@@ -76,10 +80,10 @@ class Service {
       }
     } catch (const std::runtime_error&) {
       if (res.elapsed >= timeout) {
-        throw Errors::Timeout("IRI timed out after " + std::to_string(timeout) + "s");
+        throw Errors::Network("Time out after " + std::to_string(timeout) + "s");
       }
 
-      throw Errors::Unrecognized("invalid reply from node (unrecognized format): " + res.text);
+      throw Errors::Unrecognized("Invalid reply from node (unrecognized format): " + res.text);
     }
 
     Response response;
@@ -96,7 +100,7 @@ class Service {
         throw Errors::InternalServerError(error);
       default:
         if (res.elapsed >= timeout) {
-          throw Errors::Timeout("IRI timed out after " + std::to_string(timeout) + "s");
+          throw Errors::Network("Time out after " + std::to_string(timeout) + "s");
         }
 
         throw Errors::Unrecognized(error);

include/iota/errors/timeout.hpp include/iota/errors/network.hppinclude/iota/errors/timeout.hpp renamed to include/iota/errors/network.hpp

@@ -31,9 +31,9 @@ namespace IOTA {
 
 namespace Errors {
 
-class Timeout : public Generic {
+class Network : public Generic {
 public:
-  Timeout(const std::string& content) : Generic(content){};
+  Network(const std::string& content) : Generic(content){};
 };
 
 }  // namespace Errors

test/source/errors/timeout_test.cpp test/source/errors/network_test.cpptest/source/errors/timeout_test.cpp renamed to test/source/errors/network_test.cpp

@@ -25,9 +25,9 @@
 
 #include <gtest/gtest.h>
 
-#include <iota/errors/timeout.hpp>
+#include <iota/errors/network.hpp>
 #include <test/utils/expect_exception.hpp>
 
-TEST(Errors, Timeout) {
-  EXPECT_EXCEPTION(throw(IOTA::Errors::Timeout("Timeout"));, IOTA::Errors::Timeout, "Timeout")
+TEST(Errors, Network) {
+  EXPECT_EXCEPTION(throw(IOTA::Errors::Network("Network"));, IOTA::Errors::Network, "Network")
 }