Merge pull request #2458

7f2f6ee1 protocol: remove hop count on block propagation (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-09-25 17:00:47 +02:00
commit 13be8115e4
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
4 changed files with 2 additions and 16 deletions

View file

@ -91,7 +91,6 @@
#define BLOCKS_IDS_SYNCHRONIZING_DEFAULT_COUNT 10000 //by default, blocks ids count in synchronizing
#define BLOCKS_SYNCHRONIZING_DEFAULT_COUNT_PRE_V4 100 //by default, blocks count in blocks downloading
#define BLOCKS_SYNCHRONIZING_DEFAULT_COUNT 20 //by default, blocks count in blocks downloading
#define CRYPTONOTE_PROTOCOL_HOP_RELAX_COUNT 3 //value of hop, after which we use only announce of new block
#define CRYPTONOTE_MEMPOOL_TX_LIVETIME 86400 //seconds, one day
#define CRYPTONOTE_MEMPOOL_TX_FROM_ALT_BLOCK_LIVETIME 604800 //seconds, one week