From bb83eb151aa594ca827ca52de5738e23309b453c Mon Sep 17 00:00:00 2001 From: tobtoht Date: Fri, 12 May 2023 17:31:21 +0200 Subject: [PATCH] daemon: remove --fluffy-blocks --- src/cryptonote_core/cryptonote_core.cpp | 9 --------- utils/fish/monerod.fish | 1 - 2 files changed, 10 deletions(-) diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 72ddd0dc9..ff8c1cc0a 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -173,11 +173,6 @@ namespace cryptonote , "Check for new versions of monero: [disabled|notify|download|update]" , "notify" }; - static const command_line::arg_descriptor arg_fluffy_blocks = { - "fluffy-blocks" - , "Relay blocks as fluffy blocks (obsolete, now default)" - , true - }; static const command_line::arg_descriptor arg_no_fluffy_blocks = { "no-fluffy-blocks" , "Relay blocks as normal blocks" @@ -340,7 +335,6 @@ namespace cryptonote command_line::add_arg(desc, arg_show_time_stats); command_line::add_arg(desc, arg_block_sync_size); command_line::add_arg(desc, arg_check_updates); - command_line::add_arg(desc, arg_fluffy_blocks); command_line::add_arg(desc, arg_no_fluffy_blocks); command_line::add_arg(desc, arg_test_dbg_lock_sleep); command_line::add_arg(desc, arg_offline); @@ -393,9 +387,6 @@ namespace cryptonote m_offline = get_arg(vm, arg_offline); m_disable_dns_checkpoints = get_arg(vm, arg_disable_dns_checkpoints); - if (!command_line::is_arg_defaulted(vm, arg_fluffy_blocks)) - MWARNING(arg_fluffy_blocks.name << " is obsolete, it is now default"); - if (command_line::get_arg(vm, arg_test_drop_download) == true) test_drop_download(); diff --git a/utils/fish/monerod.fish b/utils/fish/monerod.fish index d2836a6b2..985890770 100644 --- a/utils/fish/monerod.fish +++ b/utils/fish/monerod.fish @@ -33,7 +33,6 @@ complete -c monerod -l fast-block-sync -r -d "Sync up most of the way by using e complete -c monerod -l show-time-stats -r -d "(=0) Show time-stats when processing blocks/txs and disk synchronization. Default: 0" complete -c monerod -l block-sync-size -r -d "(=0) How many blocks to sync at once during chain synchronization (0 = adaptive). Default: 0" complete -c monerod -l check-updates -x -a "disabled notify download update" -d "Check for new versions of monero. Default: notify" -complete -c monerod -l fluffy-blocks -d "Relay blocks as fluffy blocks (obsolete, now default)" complete -c monerod -l no-fluffy-blocks -d "Relay blocks as normal blocks" complete -c monerod -l test-dbg-lock-sleep -r -d "Sleep time in ms, defaults to 0 (off), used to debug before/after locking mutex. Values 100 to 1000 are good for tests." complete -c monerod -l offline -d "Do not listen for peers, nor connect to any"