Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-20 15:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Renamed network package

Browse Source
This commit is contained in:
Manfred Karrer 2015-03-20 00:08:43 +01:00
parent 2f2d6b68e0
commit 62cb8d7683
58 changed files with 122 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java
View File

@ -17,7 +17,7 @@
package io.bitsquare.app.bootstrap;
import io.bitsquare.network.Node;
import io.bitsquare.p2p.Node;
import net.tomp2p.connection.ChannelClientConfiguration;
import net.tomp2p.connection.ChannelServerConfiguration;

2
bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java
View File

@ -19,7 +19,7 @@ package io.bitsquare.app.bootstrap;
import io.bitsquare.app.BitsquareEnvironment;
import io.bitsquare.app.BitsquareExecutable;
import io.bitsquare.network.Node;
import io.bitsquare.p2p.Node;
import joptsimple.OptionParser;
import joptsimple.OptionSet;

8
core/src/main/java/io/bitsquare/app/BitsquareAppMain.java
View File

@ -19,8 +19,8 @@ package io.bitsquare.app;
import io.bitsquare.BitsquareException;
import io.bitsquare.btc.BitcoinNetwork;
import io.bitsquare.network.BootstrapNodes;
import io.bitsquare.network.Node;
import io.bitsquare.p2p.BootstrapNodes;
import io.bitsquare.p2p.Node;
import io.bitsquare.util.joptsimple.EnumValueConverter;
import java.io.File;
@ -39,8 +39,8 @@ import joptsimple.OptionParser;
import joptsimple.OptionSet;
import static io.bitsquare.app.BitsquareEnvironment.*;
import static io.bitsquare.network.Node.*;
import static io.bitsquare.network.tomp2p.TomP2PModule.*;
import static io.bitsquare.p2p.Node.*;
import static io.bitsquare.p2p.tomp2p.TomP2PModule.*;
import static java.util.Arrays.asList;
public class BitsquareAppMain extends BitsquareExecutable {

4
core/src/main/java/io/bitsquare/app/BitsquareAppModule.java
View File

@ -23,8 +23,8 @@ import io.bitsquare.arbitration.tomp2p.TomP2PArbitratorModule;
import io.bitsquare.btc.BitcoinModule;
import io.bitsquare.crypto.CryptoModule;
import io.bitsquare.gui.GuiModule;
import io.bitsquare.network.NetworkModule;
import io.bitsquare.network.tomp2p.TomP2PModule;
import io.bitsquare.p2p.NetworkModule;
import io.bitsquare.p2p.tomp2p.TomP2PModule;
import io.bitsquare.offer.OfferModule;
import io.bitsquare.offer.tomp2p.TomP2POfferModule;
import io.bitsquare.persistence.Persistence;

2
core/src/main/java/io/bitsquare/arbitration/ArbitratorService.java
View File

@ -19,7 +19,7 @@ package io.bitsquare.arbitration;
import io.bitsquare.arbitration.listeners.ArbitratorListener;
import io.bitsquare.network.DHTService;
import io.bitsquare.p2p.DHTService;
import java.util.Locale;

4
core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorService.java
View File

@ -20,8 +20,8 @@ package io.bitsquare.arbitration.tomp2p;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.arbitration.ArbitratorService;
import io.bitsquare.arbitration.listeners.ArbitratorListener;
import io.bitsquare.network.tomp2p.TomP2PDHTService;
import io.bitsquare.network.tomp2p.TomP2PNode;
import io.bitsquare.p2p.tomp2p.TomP2PDHTService;
import io.bitsquare.p2p.tomp2p.TomP2PNode;
import java.io.IOException;

6
core/src/main/java/io/bitsquare/gui/main/MainViewModel.java
View File

@ -29,9 +29,9 @@ import io.bitsquare.fiat.FiatAccountType;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.locale.CountryUtil;
import io.bitsquare.locale.LanguageUtil;
import io.bitsquare.network.BootstrapState;
import io.bitsquare.network.ClientNode;
import io.bitsquare.network.MessageService;
import io.bitsquare.p2p.BootstrapState;
import io.bitsquare.p2p.ClientNode;
import io.bitsquare.p2p.MessageService;
import io.bitsquare.persistence.Persistence;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.TradeManager;

2
core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
View File

@ -20,7 +20,7 @@ package io.bitsquare.gui.main.settings.network;
import io.bitsquare.btc.BitcoinNetwork;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.InitializableView;
import io.bitsquare.network.ClientNode;
import io.bitsquare.p2p.ClientNode;
import javax.inject.Inject;

2
core/src/main/java/io/bitsquare/offer/OfferBookService.java
View File

@ -19,7 +19,7 @@ package io.bitsquare.offer;
import io.bitsquare.common.handlers.FaultHandler;
import io.bitsquare.common.handlers.ResultHandler;
import io.bitsquare.network.DHTService;
import io.bitsquare.p2p.DHTService;
import java.util.List;

7
core/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBookService.java
View File

@ -19,10 +19,10 @@ package io.bitsquare.offer.tomp2p;
import io.bitsquare.common.handlers.FaultHandler;
import io.bitsquare.common.handlers.ResultHandler;
import io.bitsquare.network.tomp2p.TomP2PDHTService;
import io.bitsquare.network.tomp2p.TomP2PNode;
import io.bitsquare.offer.Offer;
import io.bitsquare.offer.OfferBookService;
import io.bitsquare.p2p.tomp2p.TomP2PDHTService;
import io.bitsquare.p2p.tomp2p.TomP2PNode;
import java.io.IOException;
@ -30,6 +30,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.inject.Inject;
import javafx.beans.property.LongProperty;
import javafx.beans.property.SimpleLongProperty;
@ -54,6 +56,7 @@ public class TomP2POfferBookService extends TomP2PDHTService implements OfferBoo
private final LongProperty invalidationTimestamp = new SimpleLongProperty(0);
@Inject
public TomP2POfferBookService(TomP2PNode tomP2PNode) {
super(tomP2PNode);
}

4
core/src/main/java/io/bitsquare/network/AddressService.java → core/src/main/java/io/bitsquare/p2p/AddressService.java
View File

@ -15,10 +15,10 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network;
package io.bitsquare.p2p;
import io.bitsquare.network.listener.GetPeerAddressListener;
import io.bitsquare.p2p.listener.GetPeerAddressListener;
import java.security.PublicKey;

2
core/src/main/java/io/bitsquare/network/BootstrapNodes.java → core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network;
package io.bitsquare.p2p;
import java.util.Arrays;
import java.util.List;

2
core/src/main/java/io/bitsquare/network/BootstrapState.java → core/src/main/java/io/bitsquare/p2p/BootstrapState.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network;
package io.bitsquare.p2p;
public enum BootstrapState {
PEER_CREATION_FAILED,

2
core/src/main/java/io/bitsquare/network/ClientNode.java → core/src/main/java/io/bitsquare/p2p/ClientNode.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network;
package io.bitsquare.p2p;
import java.security.KeyPair;

2
core/src/main/java/io/bitsquare/network/ConnectionType.java → core/src/main/java/io/bitsquare/p2p/ConnectionType.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network;
package io.bitsquare.p2p;
public enum ConnectionType {
UNKNOWN, DIRECT, MANUAL_PORT_FORWARDING, AUTO_PORT_FORWARDING, RELAY

2
core/src/main/java/io/bitsquare/network/DHTService.java → core/src/main/java/io/bitsquare/p2p/DHTService.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network;
package io.bitsquare.p2p;
import java.security.PublicKey;

2
core/src/main/java/io/bitsquare/network/Message.java → core/src/main/java/io/bitsquare/p2p/Message.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network;
package io.bitsquare.p2p;
import java.io.Serializable;

2
core/src/main/java/io/bitsquare/network/MessageHandler.java → core/src/main/java/io/bitsquare/p2p/MessageHandler.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network;
package io.bitsquare.p2p;
public interface MessageHandler {
void handleMessage(Message message, Peer sender);

4
core/src/main/java/io/bitsquare/network/MessageService.java → core/src/main/java/io/bitsquare/p2p/MessageService.java
View File

@ -15,10 +15,10 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network;
package io.bitsquare.p2p;
import io.bitsquare.network.listener.SendMessageListener;
import io.bitsquare.p2p.listener.SendMessageListener;
public interface MessageService extends P2PService, MessageHandler {

2
core/src/main/java/io/bitsquare/network/NetworkException.java → core/src/main/java/io/bitsquare/p2p/NetworkException.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network;
package io.bitsquare.p2p;
import java.io.IOException;

2
core/src/main/java/io/bitsquare/network/NetworkModule.java → core/src/main/java/io/bitsquare/p2p/NetworkModule.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network;
package io.bitsquare.p2p;
import io.bitsquare.BitsquareModule;

2
core/src/main/java/io/bitsquare/network/Node.java → core/src/main/java/io/bitsquare/p2p/Node.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network;
package io.bitsquare.p2p;
import com.google.common.base.Objects;

2
core/src/main/java/io/bitsquare/network/P2PService.java → core/src/main/java/io/bitsquare/p2p/P2PService.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network;
package io.bitsquare.p2p;
import java.util.concurrent.Executor;

2
core/src/main/java/io/bitsquare/network/Peer.java → core/src/main/java/io/bitsquare/p2p/Peer.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network;
package io.bitsquare.p2p;
/**
* A peer on the Bitsquare network.

4
core/src/main/java/io/bitsquare/network/listener/GetPeerAddressListener.java → core/src/main/java/io/bitsquare/p2p/listener/GetPeerAddressListener.java
View File

@ -15,9 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network.listener;
package io.bitsquare.p2p.listener;
import io.bitsquare.network.Peer;
import io.bitsquare.p2p.Peer;
public interface GetPeerAddressListener {
void onResult(Peer peer);

2
core/src/main/java/io/bitsquare/network/listener/SendMessageListener.java → core/src/main/java/io/bitsquare/p2p/listener/SendMessageListener.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network.listener;
package io.bitsquare.p2p.listener;
public interface SendMessageListener {
void handleFault();

6
core/src/main/java/io/bitsquare/network/tomp2p/BootstrappedPeerBuilder.java → core/src/main/java/io/bitsquare/p2p/tomp2p/BootstrappedPeerBuilder.java
View File

@ -15,10 +15,10 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network.tomp2p;
package io.bitsquare.p2p.tomp2p;
import io.bitsquare.network.BootstrapState;
import io.bitsquare.network.Node;
import io.bitsquare.p2p.BootstrapState;
import io.bitsquare.p2p.Node;
import com.google.common.util.concurrent.SettableFuture;

12
core/src/main/java/io/bitsquare/network/tomp2p/TomP2PAddressService.java → core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PAddressService.java
View File

@ -15,12 +15,12 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network.tomp2p;
package io.bitsquare.p2p.tomp2p;
import io.bitsquare.network.AddressService;
import io.bitsquare.network.NetworkException;
import io.bitsquare.network.Peer;
import io.bitsquare.network.listener.GetPeerAddressListener;
import io.bitsquare.p2p.AddressService;
import io.bitsquare.p2p.NetworkException;
import io.bitsquare.p2p.Peer;
import io.bitsquare.p2p.listener.GetPeerAddressListener;
import io.bitsquare.user.User;
import java.io.IOException;
@ -171,7 +171,7 @@ public class TomP2PAddressService extends TomP2PDHTService implements AddressSer
private void removeAddress() {
try {
Data data = new Data(new TomP2PPeer(peerDHT.peerAddress()));
removeFromDataMap(locationKey, data).awaitUninterruptibly();
removeFromDataMap(locationKey, data).awaitUninterruptibly(1000);
} catch (IOException e) {
e.printStackTrace();
log.error("Exception at removeAddress " + e.toString());

4
core/src/main/java/io/bitsquare/network/tomp2p/TomP2PDHTService.java → core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PDHTService.java
View File

@ -15,9 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network.tomp2p;
package io.bitsquare.p2p.tomp2p;
import io.bitsquare.network.DHTService;
import io.bitsquare.p2p.DHTService;
import java.security.PublicKey;

12
core/src/main/java/io/bitsquare/network/tomp2p/TomP2PMessageService.java → core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java
View File

@ -15,13 +15,13 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network.tomp2p;
package io.bitsquare.p2p.tomp2p;
import io.bitsquare.network.Message;
import io.bitsquare.network.MessageHandler;
import io.bitsquare.network.MessageService;
import io.bitsquare.network.Peer;
import io.bitsquare.network.listener.SendMessageListener;
import io.bitsquare.p2p.Message;
import io.bitsquare.p2p.MessageHandler;
import io.bitsquare.p2p.MessageService;
import io.bitsquare.p2p.Peer;
import io.bitsquare.p2p.listener.SendMessageListener;
import java.util.concurrent.CopyOnWriteArrayList;

16
core/src/main/java/io/bitsquare/network/tomp2p/TomP2PModule.java → core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PModule.java
View File

@ -15,14 +15,14 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network.tomp2p;
package io.bitsquare.p2p.tomp2p;
import io.bitsquare.network.AddressService;
import io.bitsquare.network.BootstrapNodes;
import io.bitsquare.network.ClientNode;
import io.bitsquare.network.MessageService;
import io.bitsquare.network.NetworkModule;
import io.bitsquare.network.Node;
import io.bitsquare.p2p.AddressService;
import io.bitsquare.p2p.BootstrapNodes;
import io.bitsquare.p2p.ClientNode;
import io.bitsquare.p2p.MessageService;
import io.bitsquare.p2p.NetworkModule;
import io.bitsquare.p2p.Node;
import com.google.inject.Injector;
import com.google.inject.Singleton;
@ -30,7 +30,7 @@ import com.google.inject.name.Names;
import org.springframework.core.env.Environment;
import static io.bitsquare.network.tomp2p.BootstrappedPeerBuilder.*;
import static io.bitsquare.p2p.tomp2p.BootstrappedPeerBuilder.*;
public class TomP2PModule extends NetworkModule {
public static final String BOOTSTRAP_NODE_NAME_KEY = "bootstrap.node.name";

14
core/src/main/java/io/bitsquare/network/tomp2p/TomP2PNode.java → core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PNode.java
View File

@ -15,15 +15,15 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network.tomp2p;
package io.bitsquare.p2p.tomp2p;
import io.bitsquare.BitsquareException;
import io.bitsquare.network.BootstrapState;
import io.bitsquare.network.ClientNode;
import io.bitsquare.network.ConnectionType;
import io.bitsquare.network.Message;
import io.bitsquare.network.MessageHandler;
import io.bitsquare.network.Node;
import io.bitsquare.p2p.BootstrapState;
import io.bitsquare.p2p.ClientNode;
import io.bitsquare.p2p.ConnectionType;
import io.bitsquare.p2p.Message;
import io.bitsquare.p2p.MessageHandler;
import io.bitsquare.p2p.Node;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;

4
core/src/main/java/io/bitsquare/network/tomp2p/TomP2PPeer.java → core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PPeer.java
View File

@ -15,9 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network.tomp2p;
package io.bitsquare.p2p.tomp2p;
import io.bitsquare.network.Peer;
import io.bitsquare.p2p.Peer;
import com.google.common.base.Objects;

6
core/src/main/java/io/bitsquare/network/tomp2p/TomP2PService.java → core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PService.java
View File

@ -15,10 +15,10 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network.tomp2p;
package io.bitsquare.p2p.tomp2p;
import io.bitsquare.network.BootstrapState;
import io.bitsquare.network.P2PService;
import io.bitsquare.p2p.BootstrapState;
import io.bitsquare.p2p.P2PService;
import java.util.concurrent.Executor;

10
core/src/main/java/io/bitsquare/trade/TradeManager.java
View File

@ -23,11 +23,11 @@ import io.bitsquare.common.handlers.ErrorMessageHandler;
import io.bitsquare.common.handlers.ResultHandler;
import io.bitsquare.crypto.SignatureService;
import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.network.AddressService;
import io.bitsquare.network.Message;
import io.bitsquare.network.MessageService;
import io.bitsquare.network.Peer;
import io.bitsquare.network.listener.SendMessageListener;
import io.bitsquare.p2p.AddressService;
import io.bitsquare.p2p.Message;
import io.bitsquare.p2p.MessageService;
import io.bitsquare.p2p.Peer;
import io.bitsquare.p2p.listener.SendMessageListener;
import io.bitsquare.offer.Direction;
import io.bitsquare.offer.Offer;
import io.bitsquare.offer.OfferBookService;

6
core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityModel.java
View File

@ -18,9 +18,9 @@
package io.bitsquare.trade.protocol.availability;
import io.bitsquare.common.taskrunner.SharedTaskModel;
import io.bitsquare.network.AddressService;
import io.bitsquare.network.MessageService;
import io.bitsquare.network.Peer;
import io.bitsquare.p2p.AddressService;
import io.bitsquare.p2p.MessageService;
import io.bitsquare.p2p.Peer;
import io.bitsquare.offer.Offer;
import io.bitsquare.trade.protocol.trade.messages.OfferMessage;

6
core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java
View File

@ -20,9 +20,9 @@ package io.bitsquare.trade.protocol.availability;
import io.bitsquare.common.handlers.ErrorMessageHandler;
import io.bitsquare.common.handlers.ResultHandler;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.network.Message;
import io.bitsquare.network.MessageHandler;
import io.bitsquare.network.Peer;
import io.bitsquare.p2p.Message;
import io.bitsquare.p2p.MessageHandler;
import io.bitsquare.p2p.Peer;
import io.bitsquare.trade.protocol.availability.messages.ReportOfferAvailabilityMessage;
import io.bitsquare.trade.protocol.availability.tasks.GetPeerAddress;
import io.bitsquare.trade.protocol.availability.tasks.ProcessReportOfferAvailabilityMessage;

4
core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
View File

@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.availability.tasks;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.network.Peer;
import io.bitsquare.network.listener.GetPeerAddressListener;
import io.bitsquare.p2p.Peer;
import io.bitsquare.p2p.listener.GetPeerAddressListener;
import io.bitsquare.offer.Offer;
import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityModel;

2
core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/RequestIsOfferAvailable.java
View File

@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.availability.tasks;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.network.listener.SendMessageListener;
import io.bitsquare.p2p.listener.SendMessageListener;
import io.bitsquare.offer.Offer;
import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityModel;
import io.bitsquare.trade.protocol.availability.messages.RequestIsOfferAvailableMessage;

2
core/src/main/java/io/bitsquare/trade/protocol/trade/SharedTradeModel.java
View File

@ -22,7 +22,7 @@ import io.bitsquare.btc.TradeWalletService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.common.taskrunner.SharedTaskModel;
import io.bitsquare.crypto.SignatureService;
import io.bitsquare.network.MessageService;
import io.bitsquare.p2p.MessageService;
import io.bitsquare.offer.Offer;
import io.bitsquare.persistence.Persistence;
import io.bitsquare.trade.protocol.trade.messages.TradeMessage;

2
core/src/main/java/io/bitsquare/trade/protocol/trade/messages/OfferMessage.java
View File

@ -17,7 +17,7 @@
package io.bitsquare.trade.protocol.trade.messages;
import io.bitsquare.network.Message;
import io.bitsquare.p2p.Message;
import java.io.Serializable;

2
core/src/main/java/io/bitsquare/trade/protocol/trade/messages/TradeMessage.java
View File

@ -17,7 +17,7 @@
package io.bitsquare.trade.protocol.trade.messages;
import io.bitsquare.network.Message;
import io.bitsquare.p2p.Message;
import java.io.Serializable;

6
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java
View File

@ -17,9 +17,9 @@
package io.bitsquare.trade.protocol.trade.offerer;
import io.bitsquare.network.Message;
import io.bitsquare.network.MessageHandler;
import io.bitsquare.network.Peer;
import io.bitsquare.p2p.Message;
import io.bitsquare.p2p.MessageHandler;
import io.bitsquare.p2p.Peer;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.messages.RequestDepositTxInputsMessage;

2
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/BuyerAsOffererModel.java
View File

@ -20,7 +20,7 @@ package io.bitsquare.trade.protocol.trade.offerer.models;
import io.bitsquare.btc.BlockChainService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.crypto.SignatureService;
import io.bitsquare.network.MessageService;
import io.bitsquare.p2p.MessageService;
import io.bitsquare.persistence.Persistence;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.protocol.trade.SharedTradeModel;

2
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/TakerModel.java
View File

@ -18,7 +18,7 @@
package io.bitsquare.trade.protocol.trade.offerer.models;
import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.network.Peer;
import io.bitsquare.p2p.Peer;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.Transaction;

2
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestDepositPayment.java
View File

@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.network.listener.SendMessageListener;
import io.bitsquare.p2p.listener.SendMessageListener;
import io.bitsquare.trade.protocol.trade.messages.RequestDepositPaymentMessage;
import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel;

2
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferStartedMessage.java
View File

@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.network.listener.SendMessageListener;
import io.bitsquare.p2p.listener.SendMessageListener;
import io.bitsquare.trade.protocol.trade.messages.BankTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel;

2
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
View File

@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.network.listener.SendMessageListener;
import io.bitsquare.p2p.listener.SendMessageListener;
import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel;

6
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java
View File

@ -17,9 +17,9 @@
package io.bitsquare.trade.protocol.trade.taker;
import io.bitsquare.network.Message;
import io.bitsquare.network.MessageHandler;
import io.bitsquare.network.Peer;
import io.bitsquare.p2p.Message;
import io.bitsquare.p2p.MessageHandler;
import io.bitsquare.p2p.Peer;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.protocol.trade.messages.BankTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage;

2
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/OffererModel.java
View File

@ -18,7 +18,7 @@
package io.bitsquare.trade.protocol.trade.taker.models;
import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.network.Peer;
import io.bitsquare.p2p.Peer;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.TransactionOutput;

4
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/SellerAsTakerModel.java
View File

@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade.taker.models;
import io.bitsquare.btc.BlockChainService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.crypto.SignatureService;
import io.bitsquare.network.MessageService;
import io.bitsquare.network.Peer;
import io.bitsquare.p2p.MessageService;
import io.bitsquare.p2p.Peer;
import io.bitsquare.persistence.Persistence;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.protocol.trade.SharedTradeModel;

2
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java
View File

@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.network.listener.SendMessageListener;
import io.bitsquare.p2p.listener.SendMessageListener;
import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel;

2
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendRequestDepositTxInputsMessage.java
View File

@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.network.listener.SendMessageListener;
import io.bitsquare.p2p.listener.SendMessageListener;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.protocol.trade.messages.RequestDepositTxInputsMessage;
import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel;

2
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTx.java
View File

@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.network.listener.SendMessageListener;
import io.bitsquare.p2p.listener.SendMessageListener;
import io.bitsquare.trade.protocol.trade.messages.RequestOffererPublishDepositTxMessage;
import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel;

6
core/src/test/java/io/bitsquare/msg/TomP2PTests.java
View File

@ -17,9 +17,9 @@
package io.bitsquare.msg;
import io.bitsquare.network.BootstrapNodes;
import io.bitsquare.network.ConnectionType;
import io.bitsquare.network.Node;
import io.bitsquare.p2p.BootstrapNodes;
import io.bitsquare.p2p.ConnectionType;
import io.bitsquare.p2p.Node;
import io.bitsquare.util.Repeat;
import io.bitsquare.util.RepeatRule;

2
core/src/test/java/io/bitsquare/network/NodeTests.java → core/src/test/java/io/bitsquare/p2p/NodeTests.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network;
package io.bitsquare.p2p;
import org.junit.Test;

2
core/src/test/java/io/bitsquare/network/tomp2p/TomP2PPeerTest.java → core/src/test/java/io/bitsquare/p2p/tomp2p/TomP2PPeerTest.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.network.tomp2p;
package io.bitsquare.p2p.tomp2p;
import org.junit.Test;

12
core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
View File

@ -25,17 +25,17 @@ import io.bitsquare.btc.UserAgent;
import io.bitsquare.btc.WalletService;
import io.bitsquare.locale.CountryUtil;
import io.bitsquare.locale.LanguageUtil;
import io.bitsquare.network.BootstrapState;
import io.bitsquare.network.Node;
import io.bitsquare.network.tomp2p.BootstrappedPeerBuilder;
import io.bitsquare.network.tomp2p.TomP2PNode;
import io.bitsquare.p2p.BootstrapState;
import io.bitsquare.p2p.Node;
import io.bitsquare.p2p.tomp2p.BootstrappedPeerBuilder;
import io.bitsquare.p2p.tomp2p.TomP2PNode;
import io.bitsquare.offer.Direction;
import io.bitsquare.offer.Offer;
import io.bitsquare.offer.OfferBookService;
import io.bitsquare.offer.tomp2p.TomP2POfferBookService;
import io.bitsquare.persistence.Persistence;
import io.bitsquare.network.MessageService;
import io.bitsquare.network.tomp2p.TomP2PMessageService;
import io.bitsquare.p2p.MessageService;
import io.bitsquare.p2p.tomp2p.TomP2PMessageService;
import io.bitsquare.user.User;
import io.bitsquare.util.DSAKeyUtil;