From 102e0c1cf9171bd0a467517d6d51fe6e4b41f9f2 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Fri, 16 Dec 2022 15:38:49 +0100 Subject: [PATCH] disabled aliases registration fee checks for testnet --- .clang-format | 9 +++------ src/currency_core/currency_format_utils.cpp | 6 +++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.clang-format b/.clang-format index 2fa1f67a..12d0e405 100644 --- a/.clang-format +++ b/.clang-format @@ -4,22 +4,19 @@ AlignConsecutiveAssignments: 'true' AlignConsecutiveDeclarations: 'false' AlignEscapedNewlines: Right AlignOperands: 'false' -AlignTrailingComments: 'true' +AlignTrailingComments: 'false' AllowAllParametersOfDeclarationOnNextLine: 'false' AllowShortBlocksOnASingleLine: 'false' AllowShortCaseLabelsOnASingleLine: 'true' AllowShortFunctionsOnASingleLine: None -AllowShortIfStatementsOnASingleLine: 'true' AllowShortLoopsOnASingleLine: 'false' AlwaysBreakAfterReturnType: None AlwaysBreakBeforeMultilineStrings: 'false' -AlwaysBreakTemplateDeclarations: 'true' BinPackArguments: 'true' BinPackParameters: 'true' BreakAfterJavaFieldAnnotations: 'true' BreakBeforeBinaryOperators: None -BreakBeforeBraces: Stroustrup -BreakBeforeInheritanceComma: 'false' +BreakBeforeBraces: Allman BreakBeforeTernaryOperators: 'false' BreakConstructorInitializers: BeforeColon BreakStringLiterals: 'false' @@ -56,4 +53,4 @@ SpacesInParentheses: 'false' SpacesInSquareBrackets: 'false' Standard: Cpp11 TabWidth: '2' -UseTab: Never \ No newline at end of file +UseTab: Never diff --git a/src/currency_core/currency_format_utils.cpp b/src/currency_core/currency_format_utils.cpp index 9adeb482..8249f9b5 100644 --- a/src/currency_core/currency_format_utils.cpp +++ b/src/currency_core/currency_format_utils.cpp @@ -3153,8 +3153,12 @@ namespace currency VARIANT_CASE_CONST(tx_out_zarcanum, o) //@#@ VARIANT_SWITCH_END(); - } +#ifdef TESTNET + found_alias_reward = 10 * COIN; +#else + @#@ fix it for mainnet bui +#endif return found_alias_reward; }