diff options
| -rwxr-xr-x | qa/rpc-tests/test_framework/mininode.py | 4 | ||||
| -rw-r--r-- | src/validation.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py index 0b4b0dc1d..89d0ae4f1 100755 --- a/qa/rpc-tests/test_framework/mininode.py +++ b/qa/rpc-tests/test_framework/mininode.py @@ -36,7 +36,7 @@ from threading import RLock from threading import Thread import logging import copy -import ltc_scrypt +import litecoin_scrypt from test_framework.siphash import siphash256 BIP0031_VERSION = 60000 @@ -583,7 +583,7 @@ class CBlockHeader(object): r += struct.pack("<I", self.nNonce) self.sha256 = uint256_from_str(hash256(r)) self.hash = encode(hash256(r)[::-1], 'hex_codec').decode('ascii') - self.scrypt256 = uint256_from_str(ltc_scrypt.getPoWHash(r)) + self.scrypt256 = uint256_from_str(litecoin_scrypt.getPoWHash(r)) def rehash(self): self.sha256 = None diff --git a/src/validation.h b/src/validation.h index 714422ac9..386979a14 100644 --- a/src/validation.h +++ b/src/validation.h @@ -119,10 +119,10 @@ static const unsigned int INVENTORY_BROADCAST_MAX = 7 * INVENTORY_BROADCAST_INTE static const unsigned int AVG_FEEFILTER_BROADCAST_INTERVAL = 10 * 60; /** Maximum feefilter broadcast delay after significant change. */ static const unsigned int MAX_FEEFILTER_CHANGE_DELAY = 5 * 60; -/** Block download timeout base, expressed in millionths of the block interval (i.e. 10 min) */ -static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 10000000; -/** Additional block download timeout per parallel downloading peer (i.e. 5 min) */ -static const int64_t BLOCK_DOWNLOAD_TIMEOUT_PER_PEER = 5000000; +/** Block download timeout base, expressed in millionths of the block interval (i.e. 5 min) */ +static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 5000000; +/** Additional block download timeout per parallel downloading peer (i.e. 2.5 min) */ +static const int64_t BLOCK_DOWNLOAD_TIMEOUT_PER_PEER = 2500000; static const unsigned int DEFAULT_LIMITFREERELAY = 0; static const bool DEFAULT_RELAYPRIORITY = true; |