Private testnet (#175)

* add some files related to private testnet setup as well as a documentation explaining how to set it up

* rename README in test/testnet

* add a bundle with 2 trxs in the testing data (update the testnet db) and setup some constants for testing

* safe json parsing, update core test with local private testnet

* remove unused tests

* switch test to local private testnet setup. two tests are still failing for now

* avoid sigsegv in test if number of transfers returned is less than expected for getAccountData test

* first attempt install & run IRI on travis

* skip install of maven on mac

Author: Cylix

.travis.yml

@@ -83,22 +83,44 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
 
 install:
-  # ccache on osx
+  ####
+  # OSX
+  ####
+  # ccache
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi
+  # java
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cask install java; fi
 
-  #  lcov & coveralls on linux
+  ####
+  # Linux
+  ####
+  # lcov & coveralls
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install lcov; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pip install --user cpp-coveralls; fi
+  # java
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install default-jre; fi
+  # maven
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install maven; fi
 
 before_script:
   # setup environment
   - eval "${MATRIX_EVAL}"
+  # set IRI
+  - git clone https://github.com/iotaledger/iri.git
+  - cd iri
+  - cp ../test/testnet/Snapshot.txt src/main/resources
+  - cp ../test/testnet/Snapshot.java src/main/java/com/iota/iri/Snapshot.java
+  - mvn clean compile
+  - mvn package
+  - cp -r ../test/testnet/testnetdb .
+  - java -jar target/iri-1.4.1.6.jar --testnet -p 14265 &
+  - cd ..
 
 script:
   - mkdir -p build
   - cd build
-  - cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_TESTS=1 -DTRAVIS_KEEP_ALIVE=1 ..
+  - cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_TESTS=1 ..
   - make -j4
   - ./bin/runUnitTests ../test/files
 

CMakeLists.txt

@@ -81,10 +81,6 @@ add_library(${CMAKE_PROJECT_NAME} STATIC ${PROJECT_SOURCE_FILES})
 
 include(compilation_settings)
 
-if(TRAVIS_KEEP_ALIVE)
-  set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS "TRAVIS_KEEP_ALIVE=${TRAVIS_KEEP_ALIVE}")
-endif(TRAVIS_KEEP_ALIVE)
-
 ########## EXTERNAL LIBRARIES SETTINGS ##########
 
 include(cpr_settings)

include/iota/api/service.hpp

@@ -66,22 +66,41 @@ class Service {
                                 { "X-IOTA-API-Version", APIVersion } };
     auto res     = cpr::Post(url, body, headers, cpr::Timeout{ timeout * 1000 });
 
-    if (res.elapsed >= timeout) {
-      throw Errors::Timeout("IRI timed out after " + std::to_string(timeout) + "s");
+    json        resJson;
+    std::string error;
+    try {
+      resJson = json::parse(res.text);
+
+      if (resJson.count("error")) {
+        error = resJson["error"].get<std::string>();
+      }
+    } catch (const std::runtime_error&) {
+      if (res.elapsed >= timeout) {
+        throw Errors::Timeout("IRI timed out after " + std::to_string(timeout) + "s");
+      }
+
+      throw Errors::Unrecognized("invalid reply from node (unrecognized format): " + res.text);
     }
 
     Response response;
     // TODO set duration ?
-    if (res.status_code == 200)
-      response.deserialize(json::parse(res.text));
-    else if (res.status_code == 400)
-      throw Errors::BadRequest(json::parse(res.text)["error"].get<std::string>());
-    else if (res.status_code == 401)
-      throw Errors::Unauthorized(json::parse(res.text)["error"].get<std::string>());
-    else if (res.status_code == 500)
-      throw Errors::InternalServerError(json::parse(res.text)["error"].get<std::string>());
-    else
-      throw Errors::Unrecognized(json::parse(res.text)["error"].get<std::string>());
+    switch (res.status_code) {
+      case 200:
+        response.deserialize(resJson);
+        break;
+      case 400:
+        throw Errors::BadRequest(error);
+      case 401:
+        throw Errors::Unauthorized(error);
+      case 500:
+        throw Errors::InternalServerError(error);
+      default:
+        if (res.elapsed >= timeout) {
+          throw Errors::Timeout("IRI timed out after " + std::to_string(timeout) + "s");
+        }
+
+        throw Errors::Unrecognized(error);
+    }
 
     return response;
   }

run_build.sh

@@ -39,7 +39,7 @@ info "Building project..." #
 ############################
 mkdir -p build
 cd build
-cmake -DBUILD_TESTS=1 -DTRAVIS_KEEP_ALIVE=1 ..
+cmake -DBUILD_TESTS=1 ..
 make -j4
 if [ $? -ne 0 ]; then
     fail "Error : compilation failed !"

source/api/core.cpp

@@ -79,6 +79,11 @@ Core::findTransactions(const std::vector<Types::Trytes>& addresses,
                        const std::vector<Types::Trytes>& tags,
                        const std::vector<Types::Trytes>& approvees,
                        const std::vector<Types::Trytes>& bundles) const {
+  //! skip request if no input, simply return empty
+  if (addresses.empty() && tags.empty() && approvees.empty() && bundles.empty()) {
+    return Responses::FindTransactions();
+  }
+
   return service_.request<Requests::FindTransactions, Responses::FindTransactions>(
       addresses, tags, approvees, bundles);
 }

source/api/extended.cpp

@@ -175,10 +175,6 @@ Extended::getNewAddresses(const Types::Trytes& seed, const uint32_t& index, cons
   // of addresses.
   else {
     for (int32_t i = index; true; i++) {
-#ifdef TRAVIS_KEEP_ALIVE
-      std::cout << "TRAVIS_KEEP_ALIVE: getNewAddresses[" << i << "]" << std::endl;
-#endif /* TRAVIS_KEEP_ALIVE */
-
       const auto addr = newAddress(seed, i, security, checksum);
       const auto res  = findTransactionsByAddresses({ addr });
 
@@ -337,16 +333,6 @@ Extended::bundlesFromAddresses(const std::vector<Types::Trytes>& addresses,
   std::mutex                  bundlesMtx;
 
   Utils::parallel_for(0, tailTransactions.size(), [&](int i) {
-#ifdef TRAVIS_KEEP_ALIVE
-    //! This part can be very slow, especially if network bandwidth is limited
-    //! When running tests on Travis, Travis stops and report failure if the program does not output
-    //! anything for too long
-    //! So if TRAVIS_KEEP_ALIVE is defined, then we add some intermediate output while running the
-    //! tests to make sure Travis does not termine the tests while it is actually running
-    std::cout << "TRAVIS_KEEP_ALIVE: bundlesFromAddresses[" << tailTransactions[i] << "]"
-              << std::endl;
-#endif /* TRAVIS_KEEP_ALIVE */
-
     try {
       const auto& transaction    = tailTransactions[i];
       const auto  bundleResponse = getBundle(transaction);

source/api/responses/add_neighbors.cpp

@@ -37,7 +37,10 @@ AddNeighbors::AddNeighbors(const int64_t& addedNeighbors) : addedNeighbors_(adde
 void
 AddNeighbors::deserialize(const json& res) {
   Base::deserialize(res);
-  addedNeighbors_ = res.at("addedNeighbors").get<int64_t>();
+
+  if (res.count("addedNeighbors")) {
+    addedNeighbors_ = res.at("addedNeighbors").get<int64_t>();
+  }
 }
 
 const int64_t&

source/api/responses/attach_to_tangle.cpp

@@ -37,7 +37,10 @@ AttachToTangle::AttachToTangle(const std::vector<Types::Trytes>& trytes) : tryte
 void
 AttachToTangle::deserialize(const json& res) {
   Base::deserialize(res);
-  trytes_ = res.at("trytes").get<std::vector<Types::Trytes>>();
+
+  if (res.count("trytes")) {
+    trytes_ = res.at("trytes").get<std::vector<Types::Trytes>>();
+  }
 }
 
 const std::vector<Types::Trytes>&

source/api/responses/base.cpp

@@ -36,7 +36,9 @@ Base::Base(const int64_t& duration) : duration_(duration) {
 
 void
 Base::deserialize(const json& res) {
-  duration_ = res.at("duration").get<long>();
+  if (res.count("duration")) {
+    duration_ = res.at("duration").get<long>();
+  }
 }
 
 const int64_t&

source/api/responses/find_transactions.cpp

@@ -37,7 +37,10 @@ FindTransactions::FindTransactions(const std::vector<Types::Trytes>& hashes) : h
 void
 FindTransactions::deserialize(const json& res) {
   Base::deserialize(res);
-  hashes_ = res.at("hashes").get<std::vector<Types::Trytes>>();
+
+  if (res.count("hashes")) {
+    hashes_ = res.at("hashes").get<std::vector<Types::Trytes>>();
+  }
 }
 
 const std::vector<Types::Trytes>&