mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-22 22:45:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactor: Move classes from io.bisq.core.dao.blockchain.p2p to io.bisq.core.dao.node

Browse source
This commit is contained in:
Manfred Karrer 2018-03-08 10:06:02 -05:00
parent 67340cf7de
commit eca72f658f
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
11 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/io/bisq/core/dao/DaoModule.java
View file

@ -23,8 +23,8 @@ import io.bisq.common.app.AppModule;
import io.bisq.core.dao.blockchain.BsqBlockChain;
import io.bisq.core.dao.blockchain.BsqBlockChainChangeDispatcher;
import io.bisq.core.dao.blockchain.json.JsonBlockChainExporter;
import io.bisq.core.dao.blockchain.p2p.RequestManager;
import io.bisq.core.dao.node.BsqNodeProvider;
import io.bisq.core.dao.node.RequestManager;
import io.bisq.core.dao.node.consensus.*;
import io.bisq.core.dao.node.full.FullNode;
import io.bisq.core.dao.node.full.FullNodeExecutor;

1
core/src/main/java/io/bisq/core/dao/node/BsqNode.java
View file

@ -21,7 +21,6 @@ import com.google.inject.Inject;
import io.bisq.common.handlers.ErrorMessageHandler;
import io.bisq.core.dao.blockchain.BsqBlockChain;
import io.bisq.core.dao.blockchain.BsqBlockChainListener;
import io.bisq.core.dao.blockchain.p2p.RequestManager;
import io.bisq.core.dao.blockchain.vo.BsqBlock;
import io.bisq.core.provider.fee.FeeService;
import io.bisq.network.p2p.P2PService;

7
core/src/main/java/io/bisq/core/dao/blockchain/p2p/GetBlocksRequestHandler.java → core/src/main/java/io/bisq/core/dao/node/GetBlocksRequestHandler.java
View file

@ -1,4 +1,4 @@
package io.bisq.core.dao.blockchain.p2p;
package io.bisq.core.dao.node;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
@ -7,9 +7,9 @@ import io.bisq.common.Timer;
import io.bisq.common.UserThread;
import io.bisq.common.app.Log;
import io.bisq.core.dao.blockchain.BsqBlockChain;
import io.bisq.core.dao.blockchain.p2p.messages.GetBsqBlocksRequest;
import io.bisq.core.dao.blockchain.p2p.messages.GetBsqBlocksResponse;
import io.bisq.core.dao.blockchain.vo.BsqBlock;
import io.bisq.core.dao.node.messages.GetBsqBlocksRequest;
import io.bisq.core.dao.node.messages.GetBsqBlocksResponse;
import io.bisq.network.p2p.network.CloseConnectionReason;
import io.bisq.network.p2p.network.Connection;
import io.bisq.network.p2p.network.NetworkNode;
@ -18,6 +18,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.concurrent.TimeUnit;
@Slf4j
public class GetBlocksRequestHandler {
private static final long TIMEOUT = 120;

6
core/src/main/java/io/bisq/core/dao/blockchain/p2p/RequestBlocksHandler.java → core/src/main/java/io/bisq/core/dao/node/RequestBlocksHandler.java
View file

@ -1,4 +1,4 @@
package io.bisq.core.dao.blockchain.p2p;
package io.bisq.core.dao.node;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
@ -7,8 +7,8 @@ import io.bisq.common.Timer;
import io.bisq.common.UserThread;
import io.bisq.common.app.Log;
import io.bisq.common.proto.network.NetworkEnvelope;
import io.bisq.core.dao.blockchain.p2p.messages.GetBsqBlocksRequest;
import io.bisq.core.dao.blockchain.p2p.messages.GetBsqBlocksResponse;
import io.bisq.core.dao.node.messages.GetBsqBlocksRequest;
import io.bisq.core.dao.node.messages.GetBsqBlocksResponse;
import io.bisq.network.p2p.NodeAddress;
import io.bisq.network.p2p.network.CloseConnectionReason;
import io.bisq.network.p2p.network.Connection;

8
core/src/main/java/io/bisq/core/dao/blockchain/p2p/RequestManager.java → core/src/main/java/io/bisq/core/dao/node/RequestManager.java
View file

@ -1,4 +1,4 @@
package io.bisq.core.dao.blockchain.p2p;
package io.bisq.core.dao.node;
import io.bisq.common.Timer;
import io.bisq.common.UserThread;
@ -7,10 +7,10 @@ import io.bisq.common.app.Log;
import io.bisq.common.proto.network.NetworkEnvelope;
import io.bisq.common.util.Tuple2;
import io.bisq.core.dao.blockchain.BsqBlockChain;
import io.bisq.core.dao.blockchain.p2p.messages.GetBsqBlocksRequest;
import io.bisq.core.dao.blockchain.p2p.messages.GetBsqBlocksResponse;
import io.bisq.core.dao.blockchain.p2p.messages.NewBsqBlockBroadcastMessage;
import io.bisq.core.dao.blockchain.vo.BsqBlock;
import io.bisq.core.dao.node.messages.GetBsqBlocksRequest;
import io.bisq.core.dao.node.messages.GetBsqBlocksResponse;
import io.bisq.core.dao.node.messages.NewBsqBlockBroadcastMessage;
import io.bisq.network.p2p.NodeAddress;
import io.bisq.network.p2p.network.*;
import io.bisq.network.p2p.peers.Broadcaster;

2
core/src/main/java/io/bisq/core/dao/node/full/FullNode.java
View file

@ -24,9 +24,9 @@ import io.bisq.core.dao.blockchain.BsqBlockChain;
import io.bisq.core.dao.blockchain.BsqBlockChainListener;
import io.bisq.core.dao.blockchain.exceptions.BlockNotConnectingException;
import io.bisq.core.dao.blockchain.json.JsonBlockChainExporter;
import io.bisq.core.dao.blockchain.p2p.RequestManager;
import io.bisq.core.dao.blockchain.vo.BsqBlock;
import io.bisq.core.dao.node.BsqNode;
import io.bisq.core.dao.node.RequestManager;
import io.bisq.core.provider.fee.FeeService;
import io.bisq.network.p2p.P2PService;
import lombok.extern.slf4j.Slf4j;

6
core/src/main/java/io/bisq/core/dao/node/lite/LiteNode.java
View file

@ -23,11 +23,11 @@ import io.bisq.common.handlers.ErrorMessageHandler;
import io.bisq.core.dao.blockchain.BsqBlockChain;
import io.bisq.core.dao.blockchain.BsqBlockChainListener;
import io.bisq.core.dao.blockchain.exceptions.BlockNotConnectingException;
import io.bisq.core.dao.blockchain.p2p.RequestManager;
import io.bisq.core.dao.blockchain.p2p.messages.GetBsqBlocksResponse;
import io.bisq.core.dao.blockchain.p2p.messages.NewBsqBlockBroadcastMessage;
import io.bisq.core.dao.blockchain.vo.BsqBlock;
import io.bisq.core.dao.node.BsqNode;
import io.bisq.core.dao.node.RequestManager;
import io.bisq.core.dao.node.messages.GetBsqBlocksResponse;
import io.bisq.core.dao.node.messages.NewBsqBlockBroadcastMessage;
import io.bisq.core.provider.fee.FeeService;
import io.bisq.network.p2p.P2PService;
import io.bisq.network.p2p.network.Connection;

2
core/src/main/java/io/bisq/core/dao/blockchain/p2p/messages/GetBsqBlocksRequest.java → core/src/main/java/io/bisq/core/dao/node/messages/GetBsqBlocksRequest.java
View file

@ -1,4 +1,4 @@
package io.bisq.core.dao.blockchain.p2p.messages;
package io.bisq.core.dao.node.messages;
import io.bisq.common.app.Capabilities;
import io.bisq.common.app.Version;

2
core/src/main/java/io/bisq/core/dao/blockchain/p2p/messages/GetBsqBlocksResponse.java → core/src/main/java/io/bisq/core/dao/node/messages/GetBsqBlocksResponse.java
View file

@ -1,4 +1,4 @@
package io.bisq.core.dao.blockchain.p2p.messages;
package io.bisq.core.dao.node.messages;
import io.bisq.common.app.Version;
import io.bisq.common.proto.network.NetworkEnvelope;

2
core/src/main/java/io/bisq/core/dao/blockchain/p2p/messages/NewBsqBlockBroadcastMessage.java → core/src/main/java/io/bisq/core/dao/node/messages/NewBsqBlockBroadcastMessage.java
View file

@ -1,4 +1,4 @@
package io.bisq.core.dao.blockchain.p2p.messages;
package io.bisq.core.dao.node.messages;
import io.bisq.common.app.Version;
import io.bisq.common.proto.network.NetworkEnvelope;

6
core/src/main/java/io/bisq/core/proto/network/CoreNetworkProtoResolver.java
View file

@ -9,9 +9,9 @@ import io.bisq.core.alert.PrivateNotificationMessage;
import io.bisq.core.arbitration.Arbitrator;
import io.bisq.core.arbitration.Mediator;
import io.bisq.core.arbitration.messages.*;
import io.bisq.core.dao.blockchain.p2p.messages.GetBsqBlocksRequest;
import io.bisq.core.dao.blockchain.p2p.messages.GetBsqBlocksResponse;
import io.bisq.core.dao.blockchain.p2p.messages.NewBsqBlockBroadcastMessage;
import io.bisq.core.dao.node.messages.GetBsqBlocksRequest;
import io.bisq.core.dao.node.messages.GetBsqBlocksResponse;
import io.bisq.core.dao.node.messages.NewBsqBlockBroadcastMessage;
import io.bisq.core.dao.request.compensation.CompensationRequestPayload;
import io.bisq.core.filter.Filter;
import io.bisq.core.offer.OfferPayload;