Update configs for changed market history options steemit#3599

sshyran · Feb 11, 2020 · 03993ad · 03993ad
1 parent d5a6127
commit 03993ad
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 21 deletions.
diff --git a/contrib/config-for-ahnode.ini b/contrib/config-for-ahnode.ini
@@ -44,10 +44,10 @@ follow-max-feed-size = 500
 # follow-start-feeds = 0
 
 # Track market history by grouping orders into buckets of equal size measured in seconds specified as a JSON array of numbers
-market-history-bucket-size = [15,60,300,3600,86400]
+market-history-bucket-size = [15,60,300,3600,21600]
 
-# How far back in time to track history for each bucket size, measured in the number of buckets (default: 5760)
-market-history-buckets-per-size = 5760
+# How far back in time to track market history, measure in seconds (default: 604800)
+market-history-track-time = 604800
 
 # The local IP address and port to listen for incoming connections.
 # p2p-endpoint =

diff --git a/contrib/config-for-broadcaster.ini b/contrib/config-for-broadcaster.ini
@@ -44,10 +44,10 @@ follow-max-feed-size = 500
 # follow-start-feeds = 0
 
 # Track market history by grouping orders into buckets of equal size measured in seconds specified as a JSON array of numbers
-market-history-bucket-size = [15,60,300,3600,86400]
+market-history-bucket-size = [15,60,300,3600,21600]
 
-# How far back in time to track history for each bucket size, measured in the number of buckets (default: 5760)
-market-history-buckets-per-size = 5760
+# How far back in time to track market history, measure in seconds (default: 604800)
+market-history-track-time = 604800
 
 # The local IP address and port to listen for incoming connections.
 # p2p-endpoint =

diff --git a/contrib/config-for-docker.ini b/contrib/config-for-docker.ini
@@ -54,10 +54,10 @@ follow-max-feed-size = 500
 # follow-start-feeds = 0
 
 # Track market history by grouping orders into buckets of equal size measured in seconds specified as a JSON array of numbers
-market-history-bucket-size = [15,60,300,3600,86400]
+market-history-bucket-size = [15,60,300,3600,21600]
 
-# How far back in time to track history for each bucket size, measured in the number of buckets (default: 5760)
-market-history-buckets-per-size = 5760
+# How far back in time to track market history, measure in seconds (default: 604800)
+market-history-track-time = 604800
 
 # The local IP address and port to listen for incoming connections.
 # p2p-endpoint =

diff --git a/contrib/fullnode.config.ini b/contrib/fullnode.config.ini
@@ -44,10 +44,10 @@ follow-max-feed-size = 500
 # follow-start-feeds = 0
 
 # Track market history by grouping orders into buckets of equal size measured in seconds specified as a JSON array of numbers
-market-history-bucket-size = [15,60,300,3600,86400]
+market-history-bucket-size = [15,60,300,3600,21600]
 
-# How far back in time to track history for each bucket size, measured in the number of buckets (default: 5760)
-market-history-buckets-per-size = 5760
+# How far back in time to track market history, measure in seconds (default: 604800)
+market-history-track-time = 604800
 
 # The local IP address and port to listen for incoming connections.
 # p2p-endpoint =

diff --git a/contrib/fullnode.opswhitelist.config.ini b/contrib/fullnode.opswhitelist.config.ini
@@ -44,10 +44,10 @@ follow-max-feed-size = 500
 # follow-start-feeds = 0
 
 # Track market history by grouping orders into buckets of equal size measured in seconds specified as a JSON array of numbers
-market-history-bucket-size = [15,60,300,3600,86400]
+market-history-bucket-size = [15,60,300,3600,21600]
 
-# How far back in time to track history for each bucket size, measured in the number of buckets (default: 5760)
-market-history-buckets-per-size = 5760
+# How far back in time to track market history, measure in seconds (default: 604800)
+market-history-track-time = 604800
 
 # The local IP address and port to listen for incoming connections.
 # p2p-endpoint =

diff --git a/doc/example_config.ini b/doc/example_config.ini
@@ -48,10 +48,10 @@ follow-max-feed-size = 500
 # follow-start-feeds = 0
 
 # Track market history by grouping orders into buckets of equal size measured in seconds specified as a JSON array of numbers
-market-history-bucket-size = [15,60,300,3600,86400]
+market-history-bucket-size = [15,60,300,3600,21600]
 
-# How far back in time to track history for each bucket size, measured in the number of buckets (default: 5760)
-market-history-buckets-per-size = 5760
+# How far back in time to track market history, measure in seconds (default: 604800)
+market-history-track-time = 604800
 
 # The local IP address and port to listen for incoming connections.
 # p2p-endpoint =

diff --git a/libraries/plugins/market_history/market_history_plugin.cpp b/libraries/plugins/market_history/market_history_plugin.cpp
@@ -9,7 +9,6 @@
 #include <fc/io/json.hpp>
 
 #define MH_BUCKET_SIZE "market-history-bucket-size"
-#define MH_BUCKETS_PER_SIZE "market-history-buckets-per-size"
 #define MH_TRACK_TIME "market-history-track-time"
 
 namespace steem { namespace plugins { namespace market_history {
@@ -159,8 +158,6 @@ void market_history_plugin::set_program_options(
    cfg.add_options()
          (MH_BUCKET_SIZE, boost::program_options::value<string>()->default_value("[15,60,300,3600,21600]"),
            "Track market history by grouping orders into buckets of equal size measured in seconds specified as a JSON array of numbers")
-         (MH_BUCKETS_PER_SIZE, boost::program_options::value<uint32_t>()->default_value(5760),
-           "How far back in time to track history for each bucket size, measured in the number of buckets (default: 5760)")
          (MH_TRACK_TIME, boost::program_options::value<uint32_t>()->default_value(604800),
            "How far back in time to track market history, measure in seconds (default: 604800)")
          ;