monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 08:17:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5384

Browse source 
0eee6cd7 block_weight: catch exceptions in main for clean exit on error (moneromooo-monero)
4b3bb829 epee: init a new ssl related variable in ctor (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-04-11 13:15:20 +02:00
commit 716f5a2a6a
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/epee/include/net/abstract_tcp_server2.inl
View file

@ -95,6 +95,7 @@ PRAGMA_WARNING_DISABLE_VS(4355)
: :
connection_basic(std::move(sock), state, ssl_support), connection_basic(std::move(sock), state, ssl_support),
m_protocol_handler(this, check_and_get(state).config, context), m_protocol_handler(this, check_and_get(state).config, context),
buffer_ssl_init_fill(0),
m_connection_type( connection_type ), m_connection_type( connection_type ),
m_throttle_speed_in("speed_in", "throttle_speed_in"), m_throttle_speed_in("speed_in", "throttle_speed_in"),
m_throttle_speed_out("speed_out", "throttle_speed_out"), m_throttle_speed_out("speed_out", "throttle_speed_out"),

2
tests/block_weight/block_weight.cpp
View file

@ -195,8 +195,10 @@ static void test(test_t t, uint64_t blocks)
int main() int main()
{ {
TRY_ENTRY();
test(test_max, 2 * LONG_TERM_BLOCK_WEIGHT_WINDOW); test(test_max, 2 * LONG_TERM_BLOCK_WEIGHT_WINDOW);
test(test_lcg, 9 * LONG_TERM_BLOCK_WEIGHT_WINDOW); test(test_lcg, 9 * LONG_TERM_BLOCK_WEIGHT_WINDOW);
test(test_min, 1 * LONG_TERM_BLOCK_WEIGHT_WINDOW); test(test_min, 1 * LONG_TERM_BLOCK_WEIGHT_WINDOW);
return 0; return 0;
CATCH_ENTRY_L0("main", 1);
} }