Merge branch 'master' of github.com:thibault-martinez/iota.lib.cpp

Author: thibault-martinez

include/iota/api/core.hpp

@@ -50,7 +50,8 @@ namespace API {
  */
 class Core {
 public:
-  explicit Core(const std::string& host, const uint16_t& port, bool localPow = true);
+  explicit Core(const std::string& host, const uint16_t& port, bool localPow = true,
+                int timeout = 60);
   virtual ~Core();
 
 public:

include/iota/api/extended.hpp

@@ -52,7 +52,7 @@ namespace API {
  */
 class Extended : public Core {
 public:
-  Extended(const std::string& host, const uint16_t& port, bool localPow = true,
+  Extended(const std::string& host, const uint16_t& port, bool localPow = true, int timeout = 60,
            Crypto::SpongeType cryptoType = Crypto::SpongeType::KERL);
   virtual ~Extended();
 

include/iota/api/service.hpp

@@ -44,11 +44,8 @@ namespace IOTA {
 namespace API {
 
 class Service {
-private:
-  static const int timeout = 60;
-
 public:
-  Service(const std::string& host, const uint16_t& port);
+  Service(const std::string& host, const uint16_t& port, int timeout = 60);
   virtual ~Service();
 
 public:
@@ -64,7 +61,7 @@ class Service {
     auto headers = cpr::Header{ { "Content-Type", "application/json" },
                                 { "Content-Length", std::to_string(body.size()) },
                                 { "X-IOTA-API-Version", APIVersion } };
-    auto res     = cpr::Post(url, body, headers, cpr::Timeout{ timeout * 1000 });
+    auto res     = cpr::Post(url, body, headers, cpr::Timeout{ timeout_ * 1000 });
 
     if (res.error.code != cpr::ErrorCode::OK)
       throw Errors::Network(res.error.message);
@@ -79,8 +76,8 @@ class Service {
         error = resJson["error"].get<std::string>();
       }
     } catch (const std::runtime_error&) {
-      if (res.elapsed >= timeout) {
-        throw Errors::Network("Time out after " + std::to_string(timeout) + "s");
+      if (res.elapsed >= timeout_) {
+        throw Errors::Network("Time out after " + std::to_string(timeout_) + "s");
       }
 
       throw Errors::Unrecognized("Invalid reply from node (unrecognized format): " + res.text);
@@ -97,8 +94,8 @@ class Service {
       case 500:
         throw Errors::InternalServerError(error);
       default:
-        if (res.elapsed >= timeout) {
-          throw Errors::Network("Time out after " + std::to_string(timeout) + "s");
+        if (res.elapsed >= timeout_) {
+          throw Errors::Network("Time out after " + std::to_string(timeout_) + "s");
         }
 
         throw Errors::Unrecognized(error);
@@ -110,6 +107,7 @@ class Service {
 private:
   std::string  host_;
   unsigned int port_;
+  const int    timeout_;
 };
 
 }  // namespace API

source/api/core.cpp

@@ -47,8 +47,8 @@ namespace IOTA {
 
 namespace API {
 
-Core::Core(const std::string& host, const uint16_t& port, bool localPow)
-    : service_(host, port), localPow_(localPow) {
+Core::Core(const std::string& host, const uint16_t& port, bool localPow, int timeout)
+    : service_(host, port, timeout), localPow_(localPow) {
 }
 
 Core::~Core() {

source/api/extended.cpp

@@ -38,9 +38,9 @@ namespace IOTA {
 
 namespace API {
 
-Extended::Extended(const std::string& host, const uint16_t& port, bool localPow,
+Extended::Extended(const std::string& host, const uint16_t& port, bool localPow, int timeout,
                    Crypto::SpongeType t)
-    : Core(host, port, localPow), cryptoType_(t) {
+    : Core(host, port, localPow, timeout), cryptoType_(t) {
 }
 
 Extended::~Extended() {

source/api/service.cpp

@@ -29,7 +29,8 @@ namespace IOTA {
 
 namespace API {
 
-Service::Service(const std::string& host, const uint16_t& port) : host_(host), port_(port) {
+Service::Service(const std::string& host, const uint16_t& port, int timeout)
+    : host_(host), port_(port), timeout_(timeout) {
 }
 
 Service::~Service() {

test/include/test/utils/constants.hpp

@@ -0,0 +1,64 @@
+//
+// MIT License
+//
+// Copyright (c) 2017-2018 Thibault Martinez and Simon Ninon
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+//
+
+#include <gtest/gtest.h>
+
+#include <iota/api/extended.hpp>
+#include <iota/crypto/checksum.hpp>
+#include <iota/errors/bad_request.hpp>
+#include <iota/errors/illegal_state.hpp>
+#include <test/utils/configuration.hpp>
+#include <test/utils/constants.hpp>
+#include <test/utils/expect_exception.hpp>
+
+TEST(Extended, ReplayBundle) {
+  IOTA::API::Extended api(get_proxy_host(), get_proxy_port(), true, 380);
+
+  auto res = api.replayBundle(BUNDLE_3_TRX_1_HASH, 27, 14);
+
+  ASSERT_EQ(res.getSuccessfully().size(), 4UL);
+  ASSERT_EQ(res.getSuccessfully(), std::vector<bool>({ true, true, true, true }));
+}
+
+TEST(Extended, ReplayBundleNonTailTransaction) {
+  IOTA::API::Extended api(get_proxy_host(), get_proxy_port());
+
+  EXPECT_EXCEPTION(api.replayBundle(BUNDLE_3_TRX_4_HASH, 27, 14), IOTA::Errors::IllegalState,
+                   "Invalid tail transaction supplied.");
+}
+
+TEST(Extended, ReplayBundleBundleHash) {
+  IOTA::API::Extended api(get_proxy_host(), get_proxy_port());
+
+  EXPECT_EXCEPTION(api.replayBundle(BUNDLE_3_HASH, 27, 14), IOTA::Errors::IllegalState,
+                   "Invalid transaction supplied.");
+}
+
+TEST(Extended, ReplayBundleInvalidHash) {
+  IOTA::API::Extended api(get_proxy_host(), get_proxy_port());
+
+  EXPECT_EXCEPTION(api.replayBundle("hello", 27, 14), IOTA::Errors::IllegalState,
+                   "Invalid transaction supplied.");
+}

test/source/api/extended/replay_bundle.cpp

@@ -21,3 +21,21 @@
 
 # Propagate
 api.send_transfer(1, [output_trx])
+
+#
+# Create a new bundle transaction
+# Send from 42 iota account 5 to account 5
+#
+
+# Connect to the node
+api = Iota('http://localhost:14265', "UYXMZDTITKOAPKPFCAZYB9DTPJ9VARFKCWVSYIOZROLBSUJECBLBZA99TTBFJTPUXEYN9PETLVENOHRKJ")
+
+# Trx setup
+output_trx = ProposedTransaction(
+    address = Address("BUDGFXLIN9FYRZGHQHQKEVIROEKCOVZUQKIFGRSOWGVBQEGVMPWDEAKGDPFPXUODDYVDLCEUL9VPPMLKA"),
+    message = TryteString.from_string("Sending some money"),
+    tag     = Tag("PACIFICSOUND"),
+    value   = 42)
+
+# Propagate
+api.send_transfer(1, [output_trx])