mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 10:22:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring: move generic stuff to ProtoUtil (reuse for persist.)

Browse Source
This commit is contained in:
Manfred Karrer 2017-04-14 00:29:13 -05:00
parent c14a07abd4
commit 25337c3b7c
35 changed files with 529 additions and 593 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bsq_utxo_provider/src/main/java/io/bisq/bsq_utxo_provider/BsqUtxoProviderModule.java
View File

@ -22,8 +22,8 @@ import io.bisq.common.Clock;
import io.bisq.common.app.AppModule;
import io.bisq.common.crypto.KeyRing;
import io.bisq.common.crypto.KeyStorage;
import io.bisq.common.network.NetworkProtoResolver;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.NetworkProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.Storage;
import io.bisq.core.alert.AlertModule;
import io.bisq.core.app.BisqEnvironment;
@ -31,9 +31,9 @@ import io.bisq.core.arbitration.ArbitratorModule;
import io.bisq.core.btc.BitcoinModule;
import io.bisq.core.dao.DaoModule;
import io.bisq.core.filter.FilterModule;
import io.bisq.core.network.CoreNetworkProtoResolver;
import io.bisq.core.offer.OfferModule;
import io.bisq.core.persistence.CorePersistenceProtoResolver;
import io.bisq.core.proto.CoreNetworkProtoResolver;
import io.bisq.core.proto.CorePersistenceProtoResolver;
import io.bisq.core.trade.TradeModule;
import io.bisq.core.user.Preferences;
import io.bisq.core.user.User;

3
common/src/main/java/io/bisq/common/network/NetworkProtoResolver.java → common/src/main/java/io/bisq/common/proto/NetworkProtoResolver.java
View File

@ -15,8 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bisq.common.network;
package io.bisq.common.proto;
import io.bisq.common.network.Msg;
import io.bisq.generated.protobuffer.PB;
import java.util.Optional;

3
common/src/main/java/io/bisq/common/persistence/PersistenceProtoResolver.java → common/src/main/java/io/bisq/common/proto/PersistenceProtoResolver.java
View File

@ -15,8 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bisq.common.persistence;
package io.bisq.common.proto;
import io.bisq.common.persistence.Persistable;
import io.bisq.generated.protobuffer.PB;
import java.util.Optional;

2
common/src/main/java/io/bisq/common/storage/FileManager.java
View File

@ -20,7 +20,7 @@ package io.bisq.common.storage;
import io.bisq.common.UserThread;
import io.bisq.common.io.LookAheadObjectInputStream;
import io.bisq.common.persistence.Persistable;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.util.Utilities;
import io.bisq.generated.protobuffer.PB;
import org.slf4j.Logger;

2
common/src/main/java/io/bisq/common/storage/Storage.java
View File

@ -19,7 +19,7 @@ package io.bisq.common.storage;
import com.google.inject.Inject;
import io.bisq.common.persistence.Persistable;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
core/src/main/java/io/bisq/core/arbitration/DisputeManager.java
View File

@ -28,7 +28,7 @@ import io.bisq.common.handlers.FaultHandler;
import io.bisq.common.handlers.ResultHandler;
import io.bisq.common.locale.Res;
import io.bisq.common.network.Msg;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.Storage;
import io.bisq.core.arbitration.messages.*;
import io.bisq.core.btc.AddressEntry;

2
core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
View File

@ -28,7 +28,7 @@ import io.bisq.common.app.Log;
import io.bisq.common.handlers.ExceptionHandler;
import io.bisq.common.handlers.ResultHandler;
import io.bisq.common.persistence.LongPersistable;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.FileUtil;
import io.bisq.common.storage.Storage;
import io.bisq.core.app.BisqEnvironment;

2
core/src/main/java/io/bisq/core/dao/blockchain/BsqBlockchainManager.java
View File

@ -19,7 +19,7 @@ package io.bisq.core.dao.blockchain;
import com.google.inject.Inject;
import io.bisq.common.handlers.ErrorMessageHandler;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.Storage;
import io.bisq.core.btc.wallet.WalletUtils;
import io.bisq.core.dao.RpcOptionKeys;

2
core/src/main/java/io/bisq/core/dao/blockchain/BsqTXOMap.java
View File

@ -18,7 +18,7 @@
package io.bisq.core.dao.blockchain;
import io.bisq.common.persistence.Persistable;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.Storage;
import javafx.collections.FXCollections;
import javafx.collections.MapChangeListener;

2
core/src/main/java/io/bisq/core/offer/OpenOfferManager.java
View File

@ -26,7 +26,7 @@ import io.bisq.common.crypto.KeyRing;
import io.bisq.common.handlers.ErrorMessageHandler;
import io.bisq.common.handlers.ResultHandler;
import io.bisq.common.network.Msg;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.Storage;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.wallet.BsqWalletService;

893
core/src/main/java/io/bisq/core/network/CoreNetworkProtoResolver.java → core/src/main/java/io/bisq/core/proto/CoreNetworkProtoResolver.java
View File

File diff suppressed because it is too large Load Diff

4
core/src/main/java/io/bisq/core/persistence/CorePersistenceProtoResolver.java → core/src/main/java/io/bisq/core/proto/CorePersistenceProtoResolver.java
View File

@ -1,9 +1,9 @@
package io.bisq.core.persistence;
package io.bisq.core.proto;
import com.google.inject.Provider;
import io.bisq.common.locale.*;
import io.bisq.common.persistence.Persistable;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.AddressEntryList;
import io.bisq.core.payment.PaymentAccount;

129
core/src/main/java/io/bisq/core/proto/ProtoUtil.java Normal file
View File

@ -0,0 +1,129 @@
/*
* This file is part of bisq.
*
* bisq is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* bisq is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bisq.core.proto;
import com.google.protobuf.ByteString;
import io.bisq.common.crypto.PubKeyRing;
import io.bisq.common.locale.CurrencyUtil;
import io.bisq.common.monetary.Price;
import io.bisq.core.arbitration.Dispute;
import io.bisq.core.filter.PaymentAccountFilter;
import io.bisq.core.payment.payload.BankAccountPayload;
import io.bisq.core.payment.payload.CountryBasedPaymentAccountPayload;
import io.bisq.core.trade.Contract;
import io.bisq.generated.protobuffer.PB;
import io.bisq.network.p2p.NodeAddress;
import org.bitcoinj.core.Coin;
import org.jetbrains.annotations.NotNull;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
public class ProtoUtil {
///////////////////////////////////////////////////////////////////////////////////////////
// Get Domain objects
///////////////////////////////////////////////////////////////////////////////////////////
static Dispute getDispute(PB.Dispute dispute) {
return new Dispute(dispute.getTradeId(), dispute.getTraderId(),
dispute.getDisputeOpenerIsBuyer(), dispute.getDisputeOpenerIsMaker(),
getPubKeyRing(dispute.getTraderPubKeyRing()), new Date(dispute.getTradeDate()), getContract(dispute.getContract()),
dispute.getContractHash().toByteArray(), dispute.getDepositTxSerialized().toByteArray(),
dispute.getPayoutTxSerialized().toByteArray(),
dispute.getDepositTxId(), dispute.getPayoutTxId(), dispute.getContractAsJson(), dispute.getMakerContractSignature(),
dispute.getTakerContractSignature(), getPubKeyRing(dispute.getArbitratorPubKeyRing()), dispute.getIsSupportTicket());
}
private static Contract getContract(PB.Contract contract) {
return new Contract(CoreNetworkProtoResolver.getOfferPayload(contract.getOfferPayload()),
Coin.valueOf(contract.getTradeAmount()),
Price.valueOf(getCurrencyCode(contract.getOfferPayload()), contract.getTradePrice()),
contract.getTakerFeeTxId(),
getNodeAddress(contract.getBuyerNodeAddress()),
getNodeAddress(contract.getSellerNodeAddress()),
getNodeAddress(contract.getArbitratorNodeAddress()),
getNodeAddress(contract.getMediatorNodeAddress()),
contract.getIsBuyerMakerAndSellerTaker(),
contract.getMakerAccountId(),
contract.getTakerAccountId(),
CoreNetworkProtoResolver.getPaymentAccountPayload(contract.getMakerPaymentAccountPayload()),
CoreNetworkProtoResolver.getPaymentAccountPayload(contract.getTakerPaymentAccountPayload()),
getPubKeyRing(contract.getMakerPubKeyRing()),
getPubKeyRing(contract.getTakerPubKeyRing()),
contract.getMakerPayoutAddressString(),
contract.getTakerPayoutAddressString(),
contract.getMakerBtcPubKey().toByteArray(),
contract.getTakerBtcPubKey().toByteArray());
}
@NotNull
static PubKeyRing getPubKeyRing(PB.PubKeyRing pubKeyRing) {
return new PubKeyRing(pubKeyRing.getSignaturePubKeyBytes().toByteArray(),
pubKeyRing.getEncryptionPubKeyBytes().toByteArray(),
pubKeyRing.getPgpPubKeyAsPem());
}
static NodeAddress getNodeAddress(PB.NodeAddress protoNode) {
return new NodeAddress(protoNode.getHostName(), protoNode.getPort());
}
static PaymentAccountFilter getPaymentAccountFilter(PB.PaymentAccountFilter accountFilter) {
return new PaymentAccountFilter(accountFilter.getPaymentMethodId(), accountFilter.getGetMethodName(),
accountFilter.getValue());
}
static Set<byte[]> getByteSet(List<ByteString> byteStringList) {
return new HashSet<>(
byteStringList
.stream()
.map(ByteString::toByteArray).collect(Collectors.toList()));
}
public static String getCurrencyCode(PB.OfferPayload pbOffer) {
String currencyCode;
if (CurrencyUtil.isCryptoCurrency(pbOffer.getBaseCurrencyCode()))
currencyCode = pbOffer.getBaseCurrencyCode();
else
currencyCode = pbOffer.getCounterCurrencyCode();
return currencyCode;
}
///////////////////////////////////////////////////////////////////////////////////////////
// PaymentAccountPayload Utils
///////////////////////////////////////////////////////////////////////////////////////////
static void fillInBankAccountPayload(PB.PaymentAccountPayload protoEntry, BankAccountPayload bankAccountPayload) {
PB.BankAccountPayload bankProto = protoEntry.getCountryBasedPaymentAccountPayload().getBankAccountPayload();
bankAccountPayload.setHolderName(bankProto.getHolderName());
bankAccountPayload.setBankName(bankProto.getBankName());
bankAccountPayload.setBankId(bankProto.getBankId());
bankAccountPayload.setBranchId(bankProto.getBranchId());
bankAccountPayload.setAccountNr(bankProto.getAccountNr());
bankAccountPayload.setAccountType(bankProto.getAccountType());
}
static void fillInCountryBasedPaymentAccountPayload(PB.PaymentAccountPayload protoEntry,
CountryBasedPaymentAccountPayload countryBasedPaymentAccountPayload) {
countryBasedPaymentAccountPayload.setCountryCode(protoEntry.getCountryBasedPaymentAccountPayload().getCountryCode());
}
}

2
core/src/main/java/io/bisq/core/trade/TradeManager.java
View File

@ -25,7 +25,7 @@ import io.bisq.common.handlers.ErrorMessageHandler;
import io.bisq.common.handlers.FaultHandler;
import io.bisq.common.handlers.ResultHandler;
import io.bisq.common.network.Msg;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.Storage;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.AddressEntryException;

2
core/src/main/java/io/bisq/core/trade/closed/ClosedTradableManager.java
View File

@ -19,7 +19,7 @@ package io.bisq.core.trade.closed;
import com.google.inject.Inject;
import io.bisq.common.crypto.KeyRing;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.Storage;
import io.bisq.core.offer.Offer;
import io.bisq.core.provider.price.PriceFeedService;

2
core/src/main/java/io/bisq/core/trade/failed/FailedTradesManager.java
View File

@ -19,7 +19,7 @@ package io.bisq.core.trade.failed;
import com.google.inject.Inject;
import io.bisq.common.crypto.KeyRing;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.Storage;
import io.bisq.core.offer.Offer;
import io.bisq.core.provider.price.PriceFeedService;

8
gui/src/main/java/io/bisq/gui/app/BisqAppModule.java
View File

@ -22,8 +22,8 @@ import io.bisq.common.Clock;
import io.bisq.common.app.AppModule;
import io.bisq.common.crypto.KeyRing;
import io.bisq.common.crypto.KeyStorage;
import io.bisq.common.network.NetworkProtoResolver;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.NetworkProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.Storage;
import io.bisq.core.alert.AlertModule;
import io.bisq.core.app.BisqEnvironment;
@ -31,9 +31,9 @@ import io.bisq.core.arbitration.ArbitratorModule;
import io.bisq.core.btc.BitcoinModule;
import io.bisq.core.dao.DaoModule;
import io.bisq.core.filter.FilterModule;
import io.bisq.core.network.CoreNetworkProtoResolver;
import io.bisq.core.offer.OfferModule;
import io.bisq.core.persistence.CorePersistenceProtoResolver;
import io.bisq.core.proto.CoreNetworkProtoResolver;
import io.bisq.core.proto.CorePersistenceProtoResolver;
import io.bisq.core.trade.TradeModule;
import io.bisq.core.user.Preferences;
import io.bisq.core.user.User;

2
gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java
View File

@ -21,7 +21,7 @@ import com.google.inject.Inject;
import io.bisq.common.locale.CryptoCurrency;
import io.bisq.common.locale.FiatCurrency;
import io.bisq.common.locale.TradeCurrency;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.core.offer.OpenOfferManager;
import io.bisq.core.payment.CryptoCurrencyAccount;
import io.bisq.core.payment.PaymentAccount;

2
gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsDataModel.java
View File

@ -21,7 +21,7 @@ import com.google.inject.Inject;
import io.bisq.common.locale.CryptoCurrency;
import io.bisq.common.locale.FiatCurrency;
import io.bisq.common.locale.TradeCurrency;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.core.offer.OpenOfferManager;
import io.bisq.core.payment.CryptoCurrencyAccount;
import io.bisq.core.payment.PaymentAccount;

2
gui/src/main/java/io/bisq/gui/util/GUIUtil.java
View File

@ -28,7 +28,7 @@ import io.bisq.common.locale.CurrencyUtil;
import io.bisq.common.locale.Res;
import io.bisq.common.locale.TradeCurrency;
import io.bisq.common.persistence.ListPersistable;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.Storage;
import io.bisq.common.util.Utilities;
import io.bisq.core.payment.PaymentAccount;

2
network/src/main/java/io/bisq/network/crypto/EncryptionService.java
View File

@ -21,7 +21,7 @@ import com.google.protobuf.InvalidProtocolBufferException;
import io.bisq.common.Marshaller;
import io.bisq.common.crypto.*;
import io.bisq.common.network.Msg;
import io.bisq.common.network.NetworkProtoResolver;
import io.bisq.common.proto.NetworkProtoResolver;
import io.bisq.generated.protobuffer.PB;
import io.bisq.network.p2p.DecryptedMsgWithPubKey;
import lombok.extern.slf4j.Slf4j;

4
network/src/main/java/io/bisq/network/p2p/P2PService.java
View File

@ -13,8 +13,8 @@ import io.bisq.common.crypto.CryptoException;
import io.bisq.common.crypto.KeyRing;
import io.bisq.common.crypto.PubKeyRing;
import io.bisq.common.network.Msg;
import io.bisq.common.network.NetworkProtoResolver;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.NetworkProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.FileUtil;
import io.bisq.common.storage.Storage;
import io.bisq.common.util.Utilities;

2
network/src/main/java/io/bisq/network/p2p/network/Connection.java
View File

@ -8,7 +8,7 @@ import io.bisq.common.app.DevEnv;
import io.bisq.common.app.Log;
import io.bisq.common.app.Version;
import io.bisq.common.network.Msg;
import io.bisq.common.network.NetworkProtoResolver;
import io.bisq.common.proto.NetworkProtoResolver;
import io.bisq.common.util.Tuple2;
import io.bisq.common.util.Utilities;
import io.bisq.generated.protobuffer.PB;

2
network/src/main/java/io/bisq/network/p2p/network/InboundConnection.java
View File

@ -1,6 +1,6 @@
package io.bisq.network.p2p.network;
import io.bisq.common.network.NetworkProtoResolver;
import io.bisq.common.proto.NetworkProtoResolver;
import java.net.Socket;

2
network/src/main/java/io/bisq/network/p2p/network/LocalhostNetworkNode.java
View File

@ -8,7 +8,7 @@ import com.msopentech.thali.java.toronionproxy.JavaOnionProxyContext;
import com.msopentech.thali.java.toronionproxy.JavaOnionProxyManager;
import io.bisq.common.UserThread;
import io.bisq.common.app.Log;
import io.bisq.common.network.NetworkProtoResolver;
import io.bisq.common.proto.NetworkProtoResolver;
import io.bisq.common.util.Utilities;
import io.bisq.network.p2p.NodeAddress;
import io.nucleo.net.HiddenServiceDescriptor;

2
network/src/main/java/io/bisq/network/p2p/network/NetworkNode.java
View File

@ -5,7 +5,7 @@ import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import io.bisq.common.UserThread;
import io.bisq.common.app.Log;
import io.bisq.common.network.Msg;
import io.bisq.common.network.NetworkProtoResolver;
import io.bisq.common.proto.NetworkProtoResolver;
import io.bisq.common.util.Utilities;
import io.bisq.network.p2p.NodeAddress;
import javafx.beans.property.ObjectProperty;

2
network/src/main/java/io/bisq/network/p2p/network/OutboundConnection.java
View File

@ -1,6 +1,6 @@
package io.bisq.network.p2p.network;
import io.bisq.common.network.NetworkProtoResolver;
import io.bisq.common.proto.NetworkProtoResolver;
import io.bisq.network.p2p.NodeAddress;
import java.net.Socket;

2
network/src/main/java/io/bisq/network/p2p/network/Server.java
View File

@ -1,7 +1,7 @@
package io.bisq.network.p2p.network;
import io.bisq.common.app.Log;
import io.bisq.common.network.NetworkProtoResolver;
import io.bisq.common.proto.NetworkProtoResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
network/src/main/java/io/bisq/network/p2p/network/TorNetworkNode.java
View File

@ -10,7 +10,7 @@ import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import io.bisq.common.Timer;
import io.bisq.common.UserThread;
import io.bisq.common.app.Log;
import io.bisq.common.network.NetworkProtoResolver;
import io.bisq.common.proto.NetworkProtoResolver;
import io.bisq.common.util.Utilities;
import io.bisq.network.p2p.NodeAddress;
import io.bisq.network.p2p.Utils;

2
network/src/main/java/io/bisq/network/p2p/peers/PeerManager.java
View File

@ -5,7 +5,7 @@ import io.bisq.common.Timer;
import io.bisq.common.UserThread;
import io.bisq.common.app.Log;
import io.bisq.common.persistence.HashSetPersistable;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.Storage;
import io.bisq.network.p2p.NodeAddress;
import io.bisq.network.p2p.network.*;

2
network/src/main/java/io/bisq/network/p2p/storage/P2PDataStorage.java
View File

@ -11,7 +11,7 @@ import io.bisq.common.crypto.Sig;
import io.bisq.common.network.Msg;
import io.bisq.common.persistence.HashMapPersistable;
import io.bisq.common.persistence.Persistable;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.FileUtil;
import io.bisq.common.storage.ResourceNotFoundException;
import io.bisq.common.storage.Storage;

4
network/src/test/java/io/bisq/network/p2p/TestUtils.java
View File

@ -3,9 +3,9 @@ package io.bisq.network.p2p;
import io.bisq.common.Clock;
import io.bisq.common.crypto.KeyRing;
import io.bisq.common.network.Msg;
import io.bisq.common.network.NetworkProtoResolver;
import io.bisq.common.persistence.Persistable;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.NetworkProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.generated.protobuffer.PB;
import io.bisq.network.crypto.EncryptionService;
import io.bisq.network.p2p.seed.SeedNodesRepository;

4
network/src/test/java/io/bisq/network/p2p/storage/P2PDataStorageTest.java
View File

@ -3,8 +3,8 @@ package io.bisq.network.p2p.storage;
import io.bisq.common.crypto.CryptoException;
import io.bisq.common.crypto.KeyRing;
import io.bisq.common.crypto.KeyStorage;
import io.bisq.common.network.NetworkProtoResolver;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.NetworkProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.FileUtil;
import io.bisq.network.crypto.EncryptionService;
import io.bisq.network.p2p.NodeAddress;

8
seednode/src/main/java/io/bisq/seednode/SeedNodeModule.java
View File

@ -22,8 +22,8 @@ import io.bisq.common.Clock;
import io.bisq.common.app.AppModule;
import io.bisq.common.crypto.KeyRing;
import io.bisq.common.crypto.KeyStorage;
import io.bisq.common.network.NetworkProtoResolver;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.NetworkProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.Storage;
import io.bisq.core.alert.AlertModule;
import io.bisq.core.app.BisqEnvironment;
@ -31,9 +31,9 @@ import io.bisq.core.arbitration.ArbitratorModule;
import io.bisq.core.btc.BitcoinModule;
import io.bisq.core.dao.DaoModule;
import io.bisq.core.filter.FilterModule;
import io.bisq.core.network.CoreNetworkProtoResolver;
import io.bisq.core.offer.OfferModule;
import io.bisq.core.persistence.CorePersistenceProtoResolver;
import io.bisq.core.proto.CoreNetworkProtoResolver;
import io.bisq.core.proto.CorePersistenceProtoResolver;
import io.bisq.core.trade.TradeModule;
import io.bisq.core.user.Preferences;
import io.bisq.core.user.User;

8
statistics/src/main/java/io/bisq/statistics/StatisticsModule.java
View File

@ -22,8 +22,8 @@ import io.bisq.common.Clock;
import io.bisq.common.app.AppModule;
import io.bisq.common.crypto.KeyRing;
import io.bisq.common.crypto.KeyStorage;
import io.bisq.common.network.NetworkProtoResolver;
import io.bisq.common.persistence.PersistenceProtoResolver;
import io.bisq.common.proto.NetworkProtoResolver;
import io.bisq.common.proto.PersistenceProtoResolver;
import io.bisq.common.storage.Storage;
import io.bisq.core.alert.AlertModule;
import io.bisq.core.app.BisqEnvironment;
@ -31,9 +31,9 @@ import io.bisq.core.arbitration.ArbitratorModule;
import io.bisq.core.btc.BitcoinModule;
import io.bisq.core.dao.DaoModule;
import io.bisq.core.filter.FilterModule;
import io.bisq.core.network.CoreNetworkProtoResolver;
import io.bisq.core.offer.OfferModule;
import io.bisq.core.persistence.CorePersistenceProtoResolver;
import io.bisq.core.proto.CoreNetworkProtoResolver;
import io.bisq.core.proto.CorePersistenceProtoResolver;
import io.bisq.core.trade.TradeModule;
import io.bisq.core.user.Preferences;
import io.bisq.core.user.User;