Skip to content

Commit 47d381d

Browse files
author
limxdev
committed
Code cleanup
1 parent 5faf433 commit 47d381d

2 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎src/spork.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ bool CSporkManager::IsSporkActive(int nSporkID)
185185
case SPORK_10_MASTERNODE_PAY_UPDATED_NODES: r = SPORK_10_MASTERNODE_PAY_UPDATED_NODES_DEFAULT; break;
186186
case SPORK_12_RECONSIDER_BLOCKS: r = SPORK_12_RECONSIDER_BLOCKS_DEFAULT; break;
187187
case SPORK_13_OLD_SUPERBLOCK_FLAG: r = SPORK_13_OLD_SUPERBLOCK_FLAG_DEFAULT; break;
188-
case SPORK_14_REQUIRE_SENTINEL_FLAG: r = SPORK_14_REQUIRE_SENTINEL_FLAG_DEFAULT; break;
188+
case SPORK_14_UNKNOW: r = SPORK_14_UNKNOW_DEFAULT; break;
189189
// FXTC BEGIN
190190
case SPORK_BTX_01_HANDBRAKE_HEIGHT : r = SPORK_BTX_01_HANDBRAKE_HEIGHT_DEFAULT; break;
191191
case SPORK_BTX_01_HANDBRAKE_FORCE_SHA256D: r = SPORK_BTX_01_HANDBRAKE_FORCE_SHA256D_DEFAULT; break;
@@ -232,7 +232,7 @@ int64_t CSporkManager::GetSporkValue(int nSporkID)
232232
case SPORK_10_MASTERNODE_PAY_UPDATED_NODES: return SPORK_10_MASTERNODE_PAY_UPDATED_NODES_DEFAULT;
233233
case SPORK_12_RECONSIDER_BLOCKS: return SPORK_12_RECONSIDER_BLOCKS_DEFAULT;
234234
case SPORK_13_OLD_SUPERBLOCK_FLAG: return SPORK_13_OLD_SUPERBLOCK_FLAG_DEFAULT;
235-
case SPORK_14_REQUIRE_SENTINEL_FLAG: return SPORK_14_REQUIRE_SENTINEL_FLAG_DEFAULT;
235+
case SPORK_14_UNKNOW: return SPORK_14_UNKNOW_DEFAULT;
236236
// FXTC BEGIN
237237
case SPORK_BTX_01_HANDBRAKE_HEIGHT: return SPORK_BTX_01_HANDBRAKE_HEIGHT_DEFAULT;
238238
case SPORK_BTX_01_HANDBRAKE_FORCE_SHA256D: return SPORK_BTX_01_HANDBRAKE_FORCE_SHA256D_DEFAULT;
@@ -271,7 +271,7 @@ int CSporkManager::GetSporkIDByName(std::string strName)
271271
if (strName == "SPORK_10_MASTERNODE_PAY_UPDATED_NODES") return SPORK_10_MASTERNODE_PAY_UPDATED_NODES;
272272
if (strName == "SPORK_12_RECONSIDER_BLOCKS") return SPORK_12_RECONSIDER_BLOCKS;
273273
if (strName == "SPORK_13_OLD_SUPERBLOCK_FLAG") return SPORK_13_OLD_SUPERBLOCK_FLAG;
274-
if (strName == "SPORK_14_REQUIRE_SENTINEL_FLAG") return SPORK_14_REQUIRE_SENTINEL_FLAG;
274+
if (strName == "SPORK_14_UNKNOW") return SPORK_14_UNKNOW;
275275

276276
if (strName == "SPORK_BTX_01_HANDBRAKE_HEIGHT") return SPORK_BTX_01_HANDBRAKE_HEIGHT;
277277
if (strName == "SPORK_BTX_01_HANDBRAKE_FORCE_SHA256D") return SPORK_BTX_01_HANDBRAKE_FORCE_SHA256D;
@@ -308,7 +308,7 @@ std::string CSporkManager::GetSporkNameByID(int nSporkID)
308308
case SPORK_10_MASTERNODE_PAY_UPDATED_NODES: return "SPORK_10_MASTERNODE_PAY_UPDATED_NODES";
309309
case SPORK_12_RECONSIDER_BLOCKS: return "SPORK_12_RECONSIDER_BLOCKS";
310310
case SPORK_13_OLD_SUPERBLOCK_FLAG: return "SPORK_13_OLD_SUPERBLOCK_FLAG";
311-
case SPORK_14_REQUIRE_SENTINEL_FLAG: return "SPORK_14_REQUIRE_SENTINEL_FLAG";
311+
case SPORK_14_UNKNOW: return "SPORK_14_UNKNOW";
312312

313313
case SPORK_BTX_01_HANDBRAKE_HEIGHT: return "SPORK_BTX_01_HANDBRAKE_HEIGHT";
314314
case SPORK_BTX_01_HANDBRAKE_FORCE_SHA256D: return "SPORK_BTX_01_HANDBRAKE_FORCE_SHA256D";

‎src/spork.h‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ class CSporkManager;
2424
Don't ever reuse these IDs for other sporks
2525
- This would result in old clients getting confused about which spork is for what
2626
*/
27-
static const int SPORK_START = 10001;
28-
static const int SPORK_END = 10013;
27+
static const int SPORK_START = 10001;
28+
static const int SPORK_END = 10013;
2929
// FXTC BEGIN
3030
static const int SPORK_BTX_START = 94680010;
3131
static const int SPORK_BTX_END = 94680033;
3232
// FXTC END
3333

34-
static const int SPORK_2_INSTANTSEND_ENABLED = 10001;
35-
static const int SPORK_3_INSTANTSEND_BLOCK_FILTERING = 10002;
36-
static const int SPORK_5_INSTANTSEND_MAX_VALUE = 10004;
37-
static const int SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT = 10007;
38-
static const int SPORK_9_SUPERBLOCKS_ENABLED = 10008;
39-
static const int SPORK_10_MASTERNODE_PAY_UPDATED_NODES = 10009;
40-
static const int SPORK_12_RECONSIDER_BLOCKS = 10011;
41-
static const int SPORK_13_OLD_SUPERBLOCK_FLAG = 10012;
42-
static const int SPORK_14_REQUIRE_SENTINEL_FLAG = 10013;
34+
static const int SPORK_2_INSTANTSEND_ENABLED = 10001;
35+
static const int SPORK_3_INSTANTSEND_BLOCK_FILTERING = 10002;
36+
static const int SPORK_5_INSTANTSEND_MAX_VALUE = 10004;
37+
static const int SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT = 10007;
38+
static const int SPORK_9_SUPERBLOCKS_ENABLED = 10008;
39+
static const int SPORK_10_MASTERNODE_PAY_UPDATED_NODES = 10009;
40+
static const int SPORK_12_RECONSIDER_BLOCKS = 10011;
41+
static const int SPORK_13_OLD_SUPERBLOCK_FLAG = 10012;
42+
static const int SPORK_14_UNKNOW = 10013;
4343
// FXTC BEGIN
4444
static const int SPORK_BTX_01_HANDBRAKE_HEIGHT = 94680010;
4545
static const int SPORK_BTX_01_HANDBRAKE_FORCE_SHA256D = 94680011;
@@ -49,17 +49,17 @@ static const int SPORK_BTX_01_HANDBRAKE_FORCE_LYRA2Z = 94680014;
4949
static const int SPORK_BTX_01_HANDBRAKE_FORCE_X11 = 94680015;
5050
static const int SPORK_BTX_01_HANDBRAKE_FORCE_X16R = 94680016;
5151

52-
static const int SPORK_BTX_15_COINBASE_MATURITY_STAGE_2 = 94680021;
53-
static const int SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK = 94680022;
54-
static const int SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE = 94680023;
55-
static const int SPORK_BTX_16_UNKNOW = 94680024;
56-
static const int SPORK_BTX_17_UNKNOW = 94680025;
57-
58-
static const int SPORK_BTX_18_MIN_PEER_PROTO_VERSION = 94680031;
59-
static const int SPORK_BTX_19_SHOW_UPDATE_MESSAGE = 94680032;
60-
static const int SPORK_BTX_20_UNKNOW = 94680026;
61-
static const int SPORK_BTX_21_UNKNOW = 94680027;
62-
static const int SPORK_BTX_22_UNKNOW = 94680028;
52+
static const int SPORK_BTX_15_COINBASE_MATURITY_STAGE_2 = 94680021;
53+
static const int SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK = 94680022;
54+
static const int SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE = 94680023;
55+
static const int SPORK_BTX_16_UNKNOW = 94680024;
56+
static const int SPORK_BTX_17_UNKNOW = 94680025;
57+
58+
static const int SPORK_BTX_18_MIN_PEER_PROTO_VERSION = 94680031;
59+
static const int SPORK_BTX_19_SHOW_UPDATE_MESSAGE = 94680032;
60+
static const int SPORK_BTX_20_UNKNOW = 94680026;
61+
static const int SPORK_BTX_21_UNKNOW = 94680027;
62+
static const int SPORK_BTX_22_UNKNOW = 94680028;
6363
// FXTC END
6464

6565
static const int64_t SPORK_2_INSTANTSEND_ENABLED_DEFAULT = 0; // ON
@@ -70,7 +70,7 @@ static const int64_t SPORK_9_SUPERBLOCKS_ENABLED_DEFAULT = 407090
7070
static const int64_t SPORK_10_MASTERNODE_PAY_UPDATED_NODES_DEFAULT = 4070908800ULL;// OFF
7171
static const int64_t SPORK_12_RECONSIDER_BLOCKS_DEFAULT = 0; // 0 BLOCKS
7272
static const int64_t SPORK_13_OLD_SUPERBLOCK_FLAG_DEFAULT = 4070908800ULL;// OFF
73-
static const int64_t SPORK_14_REQUIRE_SENTINEL_FLAG_DEFAULT = 4070908800ULL;// OFF
73+
static const int64_t SPORK_14_UNKNOW_DEFAULT = 4070908800ULL;// OFF
7474
// FXTC BEGIN
7575
static const int64_t SPORK_BTX_01_HANDBRAKE_HEIGHT_DEFAULT = 4070908800ULL;// OFF
7676
static const int64_t SPORK_BTX_01_HANDBRAKE_FORCE_SHA256D_DEFAULT = 1; // 1x
@@ -80,14 +80,14 @@ static const int64_t SPORK_BTX_01_HANDBRAKE_FORCE_LYRA2Z_DEFAULT = 1;
8080
static const int64_t SPORK_BTX_01_HANDBRAKE_FORCE_X11_DEFAULT = 1; // 1x
8181
static const int64_t SPORK_BTX_01_HANDBRAKE_FORCE_X16R_DEFAULT = 1; // 1x
8282

83-
static const int64_t SPORK_BTX_15_COINBASE_MATURITY_STAGE_2_DEFAULT = 4070908800ULL;// OFF
83+
static const int64_t SPORK_BTX_15_COINBASE_MATURITY_STAGE_2_DEFAULT = 4070908800ULL;// OFF
8484
static const int64_t SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK_DEFAULT = 4070908800ULL;// OFF
8585
static const int64_t SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE_DEFAULT = 4070908800ULL;// OFF
8686
static const int64_t SPORK_BTX_16_UNKNOW_DEFAULT = 4070908800ULL;// OFF
8787
static const int64_t SPORK_BTX_17_UNKNOW_DEFAULT = 4070908800ULL;// OFF
8888

8989
static const int64_t SPORK_BTX_18_MIN_PEER_PROTO_VERSION_DEFAULT = 70016;// OFF
90-
static const int64_t SPORK_BTX_19_SHOW_UPDATE_MESSAGE_DEFAULT = 4070908800ULL;// OFF
90+
static const int64_t SPORK_BTX_19_SHOW_UPDATE_MESSAGE_DEFAULT = 4070908800ULL;// OFF
9191
static const int64_t SPORK_BTX_20_UNKNOW_DEFAULT = 4070908800ULL;// OFF
9292
static const int64_t SPORK_BTX_21_UNKNOW_DEFAULT = 4070908800ULL;// OFF
9393
static const int64_t SPORK_BTX_22_UNKNOW_DEFAULT = 4070908800ULL;// OFF

0 commit comments

Comments
 (0)