Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bitcoin p2p: Use different timeouts #2609

Merged
merged 1 commit into from
May 14, 2019

Conversation

oscarguindzberg
Copy link
Contributor

Bitcoin p2p: Use different timeouts for socket connection and version message exchange.

Version message exchange timeout should be greater than socket connection timeout.

@ManfredKarrer ManfredKarrer changed the title Bitcoin p2p: Use different timeouts WIP Bitcoin p2p: Use different timeouts Apr 1, 2019
@ManfredKarrer
Copy link
Member

As we are in release preparations we have code freeze, so I set it to WIP to not get merged by accident.

@ripcurlx ripcurlx changed the title WIP Bitcoin p2p: Use different timeouts [WIP] Bitcoin p2p: Use different timeouts Apr 2, 2019
@ManfredKarrer
Copy link
Member

FYI we will delay all not DAO related PR after DAO launch.

@ManfredKarrer ManfredKarrer added this to the v1.1.0 milestone Apr 7, 2019
@ripcurlx ripcurlx modified the milestones: v1.1.0, v1.2.0 May 7, 2019
@ManfredKarrer ManfredKarrer changed the title [WIP] Bitcoin p2p: Use different timeouts Bitcoin p2p: Use different timeouts May 14, 2019
Copy link
Member

@ManfredKarrer ManfredKarrer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@@ -87,7 +87,9 @@
// Does the basic wiring
@Slf4j
public class WalletConfig extends AbstractIdleService {
private static final int TIMEOUT = 120 * 1000; // connectTimeoutMillis. 60 sec used in bitcoinj, but for Tor we allow more.
private static final int TOR_SOCKET_TIMEOUT = 120 * 1000; // 1 sec used in bitcoinj, but since bisq uses Tor we allow more.
private static final int TOR_VERSION_EXCHANGE_TIMEOUT = 125 * 1000; // 5 sec used in bitcoinj, but since bisq uses Tor we allow more.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it intended to just have a slightly diff. value to TOR_SOCKET_TIMEOUT?

@ManfredKarrer ManfredKarrer merged commit 299d36c into bisq-network:master May 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants