Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-13 17:05:40 -04:00
Code Issues Projects Releases Packages Wiki Activity

rename core package from btc to xmr

Browse source
This commit is contained in:
woodser 2023-03-07 14:28:25 -05:00
parent e71f9a54ac
commit 5b8f9237ce
178 changed files with 357 additions and 358 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/haveno/core/trade/ArbitratorTrade.java
View file

@ -1,10 +1,10 @@
package haveno.core.trade;
import haveno.common.proto.ProtoUtil;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.proto.CoreProtoResolver;
import haveno.core.trade.protocol.ProcessModel;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import java.math.BigInteger;
import java.util.UUID;

2
core/src/main/java/haveno/core/trade/BuyerAsMakerTrade.java
View file

@ -18,10 +18,10 @@
package haveno.core.trade;
import haveno.common.proto.ProtoUtil;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.proto.CoreProtoResolver;
import haveno.core.trade.protocol.ProcessModel;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import java.math.BigInteger;
import java.util.UUID;

2
core/src/main/java/haveno/core/trade/BuyerAsTakerTrade.java
View file

@ -18,10 +18,10 @@
package haveno.core.trade;
import haveno.common.proto.ProtoUtil;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.proto.CoreProtoResolver;
import haveno.core.trade.protocol.ProcessModel;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import java.math.BigInteger;
import java.util.UUID;

2
core/src/main/java/haveno/core/trade/BuyerTrade.java
View file

@ -17,9 +17,9 @@
package haveno.core.trade;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.trade.protocol.ProcessModel;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import lombok.extern.slf4j.Slf4j;

2
core/src/main/java/haveno/core/trade/SellerAsMakerTrade.java
View file

@ -18,10 +18,10 @@
package haveno.core.trade;
import haveno.common.proto.ProtoUtil;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.proto.CoreProtoResolver;
import haveno.core.trade.protocol.ProcessModel;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import java.math.BigInteger;
import java.util.UUID;

2
core/src/main/java/haveno/core/trade/SellerAsTakerTrade.java
View file

@ -18,10 +18,10 @@
package haveno.core.trade;
import haveno.common.proto.ProtoUtil;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.proto.CoreProtoResolver;
import haveno.core.trade.protocol.ProcessModel;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import java.math.BigInteger;
import java.util.UUID;

2
core/src/main/java/haveno/core/trade/SellerTrade.java
View file

@ -17,9 +17,9 @@
package haveno.core.trade;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.trade.protocol.ProcessModel;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import lombok.extern.slf4j.Slf4j;

2
core/src/main/java/haveno/core/trade/TradableList.java
View file

@ -21,9 +21,9 @@ import com.google.protobuf.Message;
import haveno.common.proto.ProtoUtil;
import haveno.common.proto.ProtobufferRuntimeException;
import haveno.common.proto.persistable.PersistableListAsObservable;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.OpenOffer;
import haveno.core.proto.CoreProtoResolver;
import haveno.core.xmr.wallet.XmrWalletService;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;

4
core/src/main/java/haveno/core/trade/Trade.java
View file

@ -27,8 +27,6 @@ import haveno.common.proto.ProtoUtil;
import haveno.common.taskrunner.Model;
import haveno.common.util.Utilities;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.CurrencyUtil;
import haveno.core.monetary.Price;
import haveno.core.monetary.Volume;
@ -50,6 +48,8 @@ import haveno.core.trade.protocol.TradePeer;
import haveno.core.trade.protocol.TradeProtocol;
import haveno.core.trade.txproof.AssetTxProofResult;
import haveno.core.util.VolumeUtil;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.AckMessage;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;

2
core/src/main/java/haveno/core/trade/TradeDataValidation.java
View file

@ -35,9 +35,9 @@ import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.offer.Offer;
import haveno.core.support.dispute.Dispute;
import haveno.core.xmr.wallet.BtcWalletService;
@Slf4j
public class TradeDataValidation {

4
core/src/main/java/haveno/core/trade/TradeManager.java
View file

@ -30,8 +30,6 @@ import haveno.common.proto.persistable.PersistedDataHost;
import haveno.core.api.AccountServiceListener;
import haveno.core.api.CoreAccountService;
import haveno.core.api.CoreNotificationService;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferBookService;
@ -67,6 +65,8 @@ import haveno.core.trade.statistics.ReferralIdService;
import haveno.core.trade.statistics.TradeStatisticsManager;
import haveno.core.user.User;
import haveno.core.util.Validator;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.BootstrapListener;
import haveno.network.p2p.DecryptedDirectMessageListener;
import haveno.network.p2p.DecryptedMessageWithPubKey;

2
core/src/main/java/haveno/core/trade/TradeUtil.java
View file

@ -20,9 +20,9 @@ package haveno.core.trade;
import haveno.common.crypto.KeyRing;
import haveno.common.util.Tuple2;
import haveno.common.util.Utilities;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.Offer;
import haveno.core.xmr.wallet.BtcWalletService;
import javax.inject.Inject;
import javax.inject.Singleton;

4
core/src/main/java/haveno/core/trade/failed/FailedTradesManager.java
View file

@ -21,14 +21,14 @@ import com.google.inject.Inject;
import haveno.common.crypto.KeyRing;
import haveno.common.persistence.PersistenceManager;
import haveno.common.proto.persistable.PersistedDataHost;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.Offer;
import haveno.core.provider.price.PriceFeedService;
import haveno.core.trade.CleanupMailboxMessages;
import haveno.core.trade.TradableList;
import haveno.core.trade.Trade;
import haveno.core.trade.TradeUtil;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.core.xmr.wallet.XmrWalletService;
import javafx.collections.ObservableList;
import java.util.Optional;

6
core/src/main/java/haveno/core/trade/protocol/ProcessModel.java
View file

@ -25,9 +25,6 @@ import haveno.common.proto.ProtoUtil;
import haveno.common.proto.persistable.PersistablePayload;
import haveno.common.taskrunner.Model;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.TradeWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.filter.FilterManager;
import haveno.core.network.MessageState;
import haveno.core.offer.Offer;
@ -47,6 +44,9 @@ import haveno.core.trade.messages.TradeMessage;
import haveno.core.trade.statistics.ReferralIdService;
import haveno.core.trade.statistics.TradeStatisticsManager;
import haveno.core.user.User;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.core.xmr.wallet.TradeWalletService;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.AckMessage;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;

6
core/src/main/java/haveno/core/trade/protocol/ProcessModelServiceProvider.java
View file

@ -19,9 +19,6 @@ package haveno.core.trade.protocol;
import haveno.common.crypto.KeyRing;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.TradeWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.filter.FilterManager;
import haveno.core.offer.OpenOfferManager;
import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
@ -30,6 +27,9 @@ import haveno.core.support.dispute.refund.refundagent.RefundAgentManager;
import haveno.core.trade.statistics.ReferralIdService;
import haveno.core.trade.statistics.TradeStatisticsManager;
import haveno.core.user.User;
import haveno.core.xmr.wallet.BtcWalletService;
import haveno.core.xmr.wallet.TradeWalletService;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.P2PService;
import javax.inject.Inject;

2
core/src/main/java/haveno/core/trade/protocol/TradePeer.java
View file

@ -23,9 +23,9 @@ import haveno.common.crypto.PubKeyRing;
import haveno.common.proto.ProtoUtil;
import haveno.common.proto.persistable.PersistablePayload;
import haveno.core.account.witness.AccountAgeWitness;
import haveno.core.btc.model.RawTransactionInput;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.proto.CoreProtoResolver;
import haveno.core.xmr.model.RawTransactionInput;
import haveno.network.p2p.NodeAddress;
import java.util.ArrayList;
import java.util.List;

2
core/src/main/java/haveno/core/trade/protocol/tasks/MakerSendInitTradeRequest.java
View file

@ -19,10 +19,10 @@ package haveno.core.trade.protocol.tasks;
import haveno.common.app.Version;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.offer.Offer;
import haveno.core.trade.Trade;
import haveno.core.trade.messages.InitTradeRequest;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.network.p2p.SendDirectMessageListener;
import java.util.UUID;

2
core/src/main/java/haveno/core/trade/protocol/tasks/MakerSetLockTime.java
View file

@ -19,8 +19,8 @@ package haveno.core.trade.protocol.tasks;
import haveno.common.config.Config;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.btc.wallet.Restrictions;
import haveno.core.trade.Trade;
import haveno.core.xmr.wallet.Restrictions;
import lombok.extern.slf4j.Slf4j;
@Slf4j

2
core/src/main/java/haveno/core/trade/protocol/tasks/MaybeSendSignContractRequest.java
View file

@ -26,12 +26,12 @@ import com.google.common.base.Charsets;
import haveno.common.app.Version;
import haveno.common.crypto.Sig;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.trade.ArbitratorTrade;
import haveno.core.trade.MakerTrade;
import haveno.core.trade.Trade;
import haveno.core.trade.Trade.State;
import haveno.core.trade.messages.SignContractRequest;
import haveno.core.xmr.model.XmrAddressEntry;
import haveno.network.p2p.SendDirectMessageListener;
import lombok.extern.slf4j.Slf4j;
import monero.daemon.model.MoneroOutput;

2
core/src/main/java/haveno/core/trade/protocol/tasks/ProcessInitMultisigRequest.java
View file

@ -20,13 +20,13 @@ package haveno.core.trade.protocol.tasks;
import haveno.common.app.Version;
import haveno.common.crypto.PubKeyRing;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.trade.ArbitratorTrade;
import haveno.core.trade.MakerTrade;
import haveno.core.trade.TakerTrade;
import haveno.core.trade.Trade;
import haveno.core.trade.messages.InitMultisigRequest;
import haveno.core.trade.protocol.TradePeer;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.SendDirectMessageListener;
import java.util.Arrays;

2
core/src/main/java/haveno/core/trade/protocol/tasks/TakerReserveTradeFunds.java
View file

@ -18,9 +18,9 @@
package haveno.core.trade.protocol.tasks;
import haveno.common.taskrunner.TaskRunner;
import haveno.core.btc.model.XmrAddressEntry;
import haveno.core.offer.OfferDirection;
import haveno.core.trade.Trade;
import haveno.core.xmr.model.XmrAddressEntry;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;