Merge pull request #922 from GolosChain/golos-v0.18.4

Golos v0.18.4

.travis.yml

@@ -13,7 +13,6 @@ env:
   - DOCKERFILE=Dockerfile DOCKERNAME=""
   - DOCKERFILE=share/golosd/docker/Dockerfile-test DOCKERNAME="-test"
   - DOCKERFILE=share/golosd/docker/Dockerfile-testnet DOCKERNAME="-testnet"
-  - DOCKERFILE=share/golosd/docker/Dockerfile-lowmem DOCKERNAME="-lowmem"
   - DOCKERFILE=share/golosd/docker/Dockerfile-mongo DOCKERNAME="-mongo"
 
 matrix:
@@ -26,12 +25,16 @@ script:
     elif [ -n "$TRAVIS_TAG" ]; then
       export DOCKERNAME="$TRAVIS_TAG""$DOCKERNAME";
       export EXPORTNAME="$DOCKERNAME";
-    else
+    elif [ "$DOCKERNAME" == "-testnet" ] || [ "$DOCKERNAME" == "-test" ]; then
       export DOCKERNAME=develop"$DOCKERNAME";
+    else
+      export DOCKERNAME="";
     fi
   - echo "$DOCKERFILE"
   - echo "$DOCKERNAME"
-  - docker build -t goloschain/golos:"$DOCKERNAME" -f "$DOCKERFILE" .
+  - if [ -n "$DOCKERNAME" ]; then
+      docker build -t goloschain/golos:"$DOCKERNAME" -f "$DOCKERFILE" .;
+    fi
 
 after_success:
   - echo "$EXPORTNAME"

CMakeLists.txt

@@ -73,16 +73,6 @@ if(MAX_19_VOTED_WITNESSES AND BUILD_GOLOS_TESTNET)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSTEEMIT_MAX_VOTED_WITNESSES=19")
 endif()
 
-option(LOW_MEMORY_NODE "Build source for low memory node (ON OR OFF)" FALSE)
-message(STATUS "LOW_MEMORY_NODE: ${LOW_MEMORY_NODE}")
-if(LOW_MEMORY_NODE)
-    message(STATUS "     ")
-    message(STATUS "             CONFIGURING FOR LOW MEMORY NODE      ")
-    message(STATUS "     ")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIS_LOW_MEM")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DIS_LOW_MEM")
-endif()
-
 option(CHAINBASE_CHECK_LOCKING "Check locks in chainbase (ON or OFF)" TRUE)
 message(STATUS "CHAINBASE_CHECK_LOCKING: ${CHAINBASE_CHECK_LOCKING}")
 if(CHAINBASE_CHECK_LOCKING)
@@ -285,10 +275,3 @@ else()
     message(STATUS "\n\n             CONFIGURED FOR GOLOS NETWORK             \n\n")
 endif()
 
-if(LOW_MEMORY_NODE)
-    message(STATUS "\n\n             CONFIGURED FOR LOW MEMORY NODE          \n\n")
-else()
-    message(STATUS "\n\n             CONFIGURED FOR FULL NODE                \n\n")
-endif()
-
-

Dockerfile

@@ -41,7 +41,6 @@ RUN \
         -DCMAKE_BUILD_TYPE=Release \
         -DBUILD_GOLOS_TESTNET=FALSE \
         -DBUILD_SHARED_LIBRARIES=FALSE \
-        -DLOW_MEMORY_NODE=FALSE \
         -DCHAINBASE_CHECK_LOCKING=FALSE \
         -DENABLE_MONGO_PLUGIN=FALSE \
         .. \

documentation/building.md

@@ -8,12 +8,6 @@ Specifies whether to build with or without optimization and without or with
 the symbol table for debugging. Unless you are specifically debugging or
 running tests, it is recommended to build as release.
 
-### LOW_MEMORY_NODE=[FALSE/TRUE]
-
-Builds golosd to be a consensus-only low memory node. Data and fields not
-needed for consensus are not stored in the object database.  This option is
-recommended for witnesses and seed-nodes.
-
 ### BUILD_GOLOS_TESTNET=[FALSE/TRUE]
 
 Builds golos for use in a private testnet. Also required for building unit tests.

libraries/api/CMakeLists.txt

@@ -14,7 +14,6 @@ list(APPEND CURRENT_TARGET_HEADERS
 list(APPEND CURRENT_TARGET_SOURCES
     account_api_object.cpp
     discussion_helper.cpp
-    comment_api_object.cpp
     chain_api_properties.cpp
     witness_api_object.cpp
 )

libraries/api/account_api_object.cpp

@@ -38,16 +38,16 @@ account_api_object::account_api_object(const account_object& a, const golos::cha
         proxied_vsf_votes.push_back(a.proxied_vsf_votes[i]);
     }
 
-    const auto& auth = db.get<account_authority_object, by_account>(name);
+    const auto& auth = db.get_authority(name);
     owner = authority(auth.owner);
     active = authority(auth.active);
     posting = authority(auth.posting);
     last_owner_update = auth.last_owner_update;
 
-#ifndef IS_LOW_MEM
-    const auto& meta = db.get<account_metadata_object, by_account>(name);
-    json_metadata = golos::chain::to_string(meta.json_metadata);
-#endif
+    auto meta = db.find<account_metadata_object, by_account>(name);
+    if (meta != nullptr) {
+        json_metadata = golos::chain::to_string(meta->json_metadata);
+    }
 
     auto post = db.find<account_bandwidth_object, by_account_bandwidth_type>(std::make_tuple(name, bandwidth_type::post));
     if (post != nullptr) {