Change compilation flags for tests.

Author: afalaleev

libraries/protocol/include/golos/protocol/config.hpp

@@ -48,7 +48,9 @@
 #define STEEMIT_INIT_MINER_NAME                 "cyberfounder"
 #define STEEMIT_NUM_INIT_MINERS                 1
 #define STEEMIT_INIT_TIME                       (fc::time_point_sec());
-#define STEEMIT_MAX_VOTED_WITNESSES             19
+#ifndef STEEMIT_MAX_VOTED_WITNESSES
+#  define STEEMIT_MAX_VOTED_WITNESSES           1
+#endif
 #define STEEMIT_MAX_MINER_WITNESSES             1
 #define STEEMIT_MAX_RUNNER_WITNESSES            1
 #define STEEMIT_MAX_WITNESSES                   (STEEMIT_MAX_VOTED_WITNESSES+STEEMIT_MAX_MINER_WITNESSES+STEEMIT_MAX_RUNNER_WITNESSES) /// 21 is more than enough

plugins/market_history/include/golos/plugins/market_history/market_history_objects.hpp

@@ -180,8 +180,8 @@ FC_REFLECT((golos::plugins::market_history::order_book),
            (bids)(asks));
 FC_REFLECT((golos::plugins::market_history::market_trade),
            (date)(current_pays)(open_pays));
-FC_REFLECT((golos::plugins::market_history::limit_order),
-           (real_price)(rewarded));
+
+FC_REFLECT_DERIVED((golos::plugins::market_history::limit_order),((golos::plugins::market_history::limit_order_api_object)) ,(real_price)(rewarded));
 
 
 

share/golosd/docker/Dockerfile-test

@@ -44,6 +44,7 @@ RUN \
         -DBUILD_GOLOS_TESTNET=TRUE \
         -DLOW_MEMORY_NODE=FALSE \
         -DCLEAR_VOTES=TRUE \
+        -DSTEEMIT_MAX_VOTED_WITNESSES=19 \
         .. && \
     make -j$(nproc) chain_test plugin_test && \
     ./tests/chain_test && \
@@ -61,6 +62,7 @@ RUN \
         -DBUILD_GOLOS_TESTNET=TRUE \
         -DLOW_MEMORY_NODE=FALSE \
         -DCLEAR_VOTES=TRUE \
+        -DSTEEMIT_MAX_VOTED_WITNESSES=19 \
         .. && \
     make -j$(nproc) chain_test plugin_test && \
     ./tests/chain_test && \