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

rename all packages and other names from bisq to haveno

Browse source
This commit is contained in:
woodser 2023-03-06 19:14:00 -05:00
parent ab0b9e3b77
commit 1a1fb130c0
1775 changed files with 14575 additions and 16767 deletions
Download patch file Download diff file Expand all files Collapse all files

32
core/src/test/java/bisq/core/account/sign/SignedWitnessServiceTest.java → core/src/test/java/haveno/core/account/sign/SignedWitnessServiceTest.java
View file

@ -15,26 +15,24 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.account.sign;
package haveno.core.account.sign;
import bisq.core.account.witness.AccountAgeWitness;
import bisq.core.filter.FilterManager;
import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import bisq.network.p2p.P2PService;
import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService;
import bisq.common.crypto.CryptoException;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.Sig;
import bisq.common.util.Utilities;
import org.bitcoinj.core.ECKey;
import com.google.common.base.Charsets;
import haveno.common.crypto.CryptoException;
import haveno.common.crypto.KeyRing;
import haveno.common.crypto.Sig;
import haveno.common.util.Utilities;
import haveno.core.account.sign.SignedWitness;
import haveno.core.account.sign.SignedWitnessService;
import haveno.core.account.witness.AccountAgeWitness;
import haveno.core.filter.FilterManager;
import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import haveno.network.p2p.P2PService;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService;
import java.math.BigInteger;
import java.security.KeyPair;
@ -46,8 +44,8 @@ import java.util.Date;
import org.junit.Before;
import org.junit.Test;
import static bisq.core.account.sign.SignedWitness.VerificationMethod.ARBITRATOR;
import static bisq.core.account.sign.SignedWitness.VerificationMethod.TRADE;
import static haveno.core.account.sign.SignedWitness.VerificationMethod.ARBITRATOR;
import static haveno.core.account.sign.SignedWitness.VerificationMethod.TRADE;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.*;

13
core/src/test/java/bisq/core/account/sign/SignedWitnessTest.java → core/src/test/java/haveno/core/account/sign/SignedWitnessTest.java
View file

@ -1,20 +1,19 @@
package bisq.core.account.sign;
import bisq.common.crypto.Sig;
import bisq.common.util.Utilities;
package haveno.core.account.sign;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.Utils;
import com.google.common.base.Charsets;
import haveno.common.crypto.Sig;
import haveno.common.util.Utilities;
import haveno.core.account.sign.SignedWitness;
import java.time.Instant;
import org.junit.Before;
import org.junit.Test;
import static bisq.core.account.sign.SignedWitness.VerificationMethod.ARBITRATOR;
import static bisq.core.account.sign.SignedWitness.VerificationMethod.TRADE;
import static haveno.core.account.sign.SignedWitness.VerificationMethod.ARBITRATOR;
import static haveno.core.account.sign.SignedWitness.VerificationMethod.TRADE;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;

58
core/src/test/java/bisq/core/account/witness/AccountAgeWitnessServiceTest.java → core/src/test/java/haveno/core/account/witness/AccountAgeWitnessServiceTest.java
View file

@ -15,35 +15,35 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.account.witness;
import bisq.core.account.sign.SignedWitness;
import bisq.core.account.sign.SignedWitnessService;
import bisq.core.filter.FilterManager;
import bisq.core.locale.CountryUtil;
import bisq.core.offer.OfferPayload;
import bisq.core.payment.ChargeBackRisk;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.payment.payload.SepaAccountPayload;
import bisq.core.support.SupportType;
import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.DisputeResult;
import bisq.core.support.dispute.arbitration.TraderDataItem;
import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import bisq.core.trade.Contract;
import bisq.core.trade.HavenoUtils;
import bisq.network.p2p.P2PService;
import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService;
import bisq.common.crypto.CryptoException;
import bisq.common.crypto.Hash;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.KeyStorage;
import bisq.common.crypto.PubKeyRing;
import bisq.common.crypto.Sig;
import bisq.common.util.Utilities;
package haveno.core.account.witness;
import haveno.common.crypto.CryptoException;
import haveno.common.crypto.Hash;
import haveno.common.crypto.KeyRing;
import haveno.common.crypto.KeyStorage;
import haveno.common.crypto.PubKeyRing;
import haveno.common.crypto.Sig;
import haveno.common.util.Utilities;
import haveno.core.account.sign.SignedWitness;
import haveno.core.account.sign.SignedWitnessService;
import haveno.core.account.witness.AccountAgeWitness;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.filter.FilterManager;
import haveno.core.locale.CountryUtil;
import haveno.core.offer.OfferPayload;
import haveno.core.payment.ChargeBackRisk;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.payload.PaymentMethod;
import haveno.core.payment.payload.SepaAccountPayload;
import haveno.core.support.SupportType;
import haveno.core.support.dispute.Dispute;
import haveno.core.support.dispute.DisputeResult;
import haveno.core.support.dispute.arbitration.TraderDataItem;
import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import haveno.core.trade.Contract;
import haveno.core.trade.HavenoUtils;
import haveno.network.p2p.P2PService;
import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService;
import org.bitcoinj.core.ECKey;
import java.security.KeyPair;
@ -63,7 +63,7 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import static bisq.core.payment.payload.PaymentMethod.getPaymentMethod;
import static haveno.core.payment.payload.PaymentMethod.getPaymentMethod;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

14
core/src/test/java/bisq/core/app/HavenoHelpFormatterTest.java → core/src/test/java/haveno/core/app/HavenoHelpFormatterTest.java
View file

@ -15,9 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app;
import bisq.common.config.HavenoHelpFormatter;
package haveno.core.app;
import joptsimple.OptionParser;
@ -36,6 +34,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import haveno.common.config.HavenoHelpFormatter;
public class HavenoHelpFormatterTest {
@Test
@ -43,13 +43,13 @@ public class HavenoHelpFormatterTest {
OptionParser parser = new OptionParser();
parser.formatHelpWith(new HavenoHelpFormatter("Bisq Test", "bisq-test", "0.1.0"));
parser.formatHelpWith(new HavenoHelpFormatter("Haveno Test", "haveno-test", "0.1.0"));
parser.accepts("name",
"The name of the Bisq node")
"The name of the Haveno node")
.withRequiredArg()
.ofType(String.class)
.defaultsTo("Bisq");
.defaultsTo("Haveno");
parser.accepts("another-option",
"This is a long description which will need to break over multiple linessssssssssss such " +
@ -116,7 +116,7 @@ public class HavenoHelpFormatterTest {
"Application data directory")
.withRequiredArg()
.ofType(File.class)
.defaultsTo(new File("/Users/cbeams/Library/Application Support/Bisq"));
.defaultsTo(new File("/Users/cbeams/Library/Application Support/Haveno"));
parser.accepts("enum-opt",
"Some option that accepts an enum value as an argument")

14
core/src/test/java/bisq/core/arbitration/ArbitratorManagerTest.java → core/src/test/java/haveno/core/arbitration/ArbitratorManagerTest.java
View file

@ -15,15 +15,13 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.arbitration;
import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator;
import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorService;
import bisq.core.user.User;
import bisq.network.p2p.NodeAddress;
package haveno.core.arbitration;
import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator;
import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorService;
import haveno.core.user.User;
import haveno.network.p2p.NodeAddress;
import java.util.ArrayList;
import org.junit.Test;

14
core/src/test/java/bisq/core/arbitration/ArbitratorTest.java → core/src/test/java/haveno/core/arbitration/ArbitratorTest.java
View file

@ -15,16 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.arbitration;
import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator;
import bisq.network.p2p.NodeAddress;
import bisq.common.crypto.PubKeyRing;
package haveno.core.arbitration;
import com.google.common.collect.Lists;
import haveno.common.crypto.PubKeyRing;
import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator;
import haveno.network.p2p.NodeAddress;
import org.apache.commons.lang3.RandomUtils;
import java.util.Date;
@ -34,7 +30,7 @@ import org.junit.Ignore;
@SuppressWarnings({"SameParameterValue", "UnusedAssignment"})
public class ArbitratorTest {
@Ignore("TODO InvalidKeySpecException at bisq.common.crypto.Sig.getPublicKeyFromBytes(Sig.java:135)")
@Ignore("TODO InvalidKeySpecException at haveno.common.crypto.Sig.getPublicKeyFromBytes(Sig.java:135)")
public void testRoundtrip() {
Arbitrator arbitrator = getArbitratorMock();

16
core/src/test/java/bisq/core/arbitration/MediatorTest.java → core/src/test/java/haveno/core/arbitration/MediatorTest.java
View file

@ -15,25 +15,21 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.arbitration;
package haveno.core.arbitration;
import bisq.core.support.dispute.mediation.mediator.Mediator;
import bisq.network.p2p.NodeAddress;
import bisq.common.crypto.PubKeyRing;
import static haveno.core.arbitration.ArbitratorTest.getBytes;
import com.google.common.collect.Lists;
import haveno.common.crypto.PubKeyRing;
import haveno.core.support.dispute.mediation.mediator.Mediator;
import haveno.network.p2p.NodeAddress;
import java.util.Date;
import org.junit.Ignore;
import static bisq.core.arbitration.ArbitratorTest.getBytes;
public class MediatorTest {
@Ignore("TODO InvalidKeySpecException at bisq.common.crypto.Sig.getPublicKeyFromBytes(Sig.java:135)")
@Ignore("TODO InvalidKeySpecException at haveno.common.crypto.Sig.getPublicKeyFromBytes(Sig.java:135)")
public void testRoundtrip() {
Mediator Mediator = getMediatorMock();

10
core/src/test/java/bisq/core/arbitration/TraderDataItemTest.java → core/src/test/java/haveno/core/arbitration/TraderDataItemTest.java
View file

@ -1,8 +1,4 @@
package bisq.core.arbitration;
import bisq.core.account.witness.AccountAgeWitness;
import bisq.core.support.dispute.arbitration.TraderDataItem;
import bisq.core.payment.payload.PaymentAccountPayload;
package haveno.core.arbitration;
import java.math.BigInteger;
import java.security.PublicKey;
@ -14,6 +10,10 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.mockito.Mockito.mock;
import haveno.core.account.witness.AccountAgeWitness;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.support.dispute.arbitration.TraderDataItem;
/*
* This file is part of Haveno.
*

10
core/src/test/java/bisq/core/btc/nodes/BtcNetworkConfigTest.java → core/src/test/java/haveno/core/btc/nodes/BtcNetworkConfigTest.java
View file

@ -15,17 +15,15 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.nodes;
import bisq.core.btc.setup.WalletConfig;
import bisq.network.Socks5MultiDiscovery;
package haveno.core.btc.nodes;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.PeerAddress;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import haveno.core.btc.nodes.BtcNetworkConfig;
import haveno.core.btc.setup.WalletConfig;
import haveno.network.Socks5MultiDiscovery;
import java.util.Collections;
import org.junit.Before;

12
core/src/test/java/bisq/core/btc/nodes/BtcNodeConverterTest.java → core/src/test/java/haveno/core/btc/nodes/BtcNodeConverterTest.java
View file

@ -15,17 +15,15 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.nodes;
import bisq.core.btc.nodes.BtcNodeConverter.Facade;
import bisq.core.btc.nodes.BtcNodes.BtcNode;
import bisq.network.DnsLookupException;
package haveno.core.btc.nodes;
import org.bitcoinj.core.PeerAddress;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import haveno.core.btc.nodes.BtcNodeConverter;
import haveno.core.btc.nodes.BtcNodeConverter.Facade;
import haveno.core.btc.nodes.BtcNodes.BtcNode;
import haveno.network.DnsLookupException;
import java.net.InetAddress;
import org.junit.Test;

8
core/src/test/java/bisq/core/btc/nodes/BtcNodesRepositoryTest.java → core/src/test/java/haveno/core/btc/nodes/BtcNodesRepositoryTest.java
View file

@ -15,14 +15,14 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.nodes;
import bisq.core.btc.nodes.BtcNodes.BtcNode;
package haveno.core.btc.nodes;
import org.bitcoinj.core.PeerAddress;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import haveno.core.btc.nodes.BtcNodeConverter;
import haveno.core.btc.nodes.BtcNodesRepository;
import haveno.core.btc.nodes.BtcNodes.BtcNode;
import com.google.common.collect.Lists;
import java.util.Collections;

14
core/src/test/java/bisq/core/btc/nodes/BtcNodesSetupPreferencesTest.java → core/src/test/java/haveno/core/btc/nodes/BtcNodesSetupPreferencesTest.java
View file

@ -15,22 +15,24 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.nodes;
import bisq.core.btc.nodes.BtcNodes.BtcNode;
import bisq.core.user.Preferences;
package haveno.core.btc.nodes;
import java.util.List;
import org.junit.Test;
import static bisq.core.btc.nodes.BtcNodes.BitcoinNodesOption.CUSTOM;
import static bisq.core.btc.nodes.BtcNodes.BitcoinNodesOption.PUBLIC;
import static haveno.core.btc.nodes.BtcNodes.BitcoinNodesOption.CUSTOM;
import static haveno.core.btc.nodes.BtcNodes.BitcoinNodesOption.PUBLIC;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import haveno.core.btc.nodes.BtcNodes;
import haveno.core.btc.nodes.BtcNodesSetupPreferences;
import haveno.core.btc.nodes.BtcNodes.BtcNode;
import haveno.core.user.Preferences;
public class BtcNodesSetupPreferencesTest {
@Test
public void testSelectPreferredNodesWhenPublicOption() {

4
core/src/test/java/bisq/core/btc/wallet/RestrictionsTest.java → core/src/test/java/haveno/core/btc/wallet/RestrictionsTest.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.wallet;
package haveno.core.btc.wallet;
import org.bitcoinj.core.Coin;
@ -24,6 +24,8 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import haveno.core.btc.wallet.Restrictions;
@SuppressWarnings("ConstantConditions")
public class RestrictionsTest {
@Test

12
core/src/test/java/bisq/core/crypto/EncryptionTest.java → core/src/test/java/haveno/core/crypto/EncryptionTest.java
View file

@ -15,17 +15,15 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.crypto;
import bisq.common.crypto.CryptoException;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.KeyStorage;
import bisq.common.file.FileUtil;
package haveno.core.crypto;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
import haveno.common.crypto.CryptoException;
import haveno.common.crypto.KeyRing;
import haveno.common.crypto.KeyStorage;
import haveno.common.file.FileUtil;
import java.io.File;
import java.io.IOException;

14
core/src/test/java/bisq/core/crypto/SigTest.java → core/src/test/java/haveno/core/crypto/SigTest.java
View file

@ -15,13 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.crypto;
import bisq.common.crypto.CryptoException;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.KeyStorage;
import bisq.common.crypto.Sig;
import bisq.common.file.FileUtil;
package haveno.core.crypto;
import java.io.File;
import java.io.IOException;
@ -37,6 +31,12 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
import haveno.common.crypto.CryptoException;
import haveno.common.crypto.KeyRing;
import haveno.common.crypto.KeyStorage;
import haveno.common.crypto.Sig;
import haveno.common.file.FileUtil;
public class SigTest {
private static final Logger log = LoggerFactory.getLogger(SigTest.class);
private KeyRing keyRing;

6
core/src/test/java/bisq/core/locale/BankUtilTest.java → core/src/test/java/haveno/core/locale/BankUtilTest.java
View file

@ -1,4 +1,4 @@
package bisq.core.locale;
package haveno.core.locale;
import java.util.Locale;
@ -9,6 +9,10 @@ import static junit.framework.TestCase.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import haveno.core.locale.BankUtil;
import haveno.core.locale.GlobalSettings;
import haveno.core.locale.Res;
public class BankUtilTest {
@Before

17
core/src/test/java/bisq/core/locale/CurrencyUtilTest.java → core/src/test/java/haveno/core/locale/CurrencyUtilTest.java
View file

@ -15,15 +15,16 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.locale;
import bisq.common.config.BaseCurrencyNetwork;
import bisq.asset.Asset;
import bisq.asset.AssetRegistry;
import bisq.asset.Coin;
import bisq.asset.coins.Ether;
package haveno.core.locale;
import haveno.asset.Asset;
import haveno.asset.AssetRegistry;
import haveno.asset.Coin;
import haveno.asset.coins.Ether;
import haveno.common.config.BaseCurrencyNetwork;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;

11
core/src/test/java/bisq/core/locale/MockTestnetCoin.java → core/src/test/java/haveno/core/locale/MockTestnetCoin.java
View file

@ -15,19 +15,16 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.locale;
package haveno.core.locale;
import haveno.asset.AddressValidationResult;
import haveno.asset.Base58AddressValidator;
import haveno.asset.Coin;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.params.MainNetParams;
import org.bitcoinj.params.RegTestParams;
import org.bitcoinj.params.TestNet3Params;
import bisq.asset.AddressValidationResult;
import bisq.asset.Base58AddressValidator;
import bisq.asset.Coin;
public class MockTestnetCoin extends Coin {
public MockTestnetCoin(Network network, NetworkParameters networkParameters) {

2
core/src/test/java/bisq/core/message/MarshallerTest.java → core/src/test/java/haveno/core/message/MarshallerTest.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.message;
package haveno.core.message;
import java.io.ByteArrayInputStream;

3
core/src/test/java/bisq/core/monetary/PriceTest.java → core/src/test/java/haveno/core/monetary/PriceTest.java
View file

@ -15,8 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.monetary;
package haveno.core.monetary;
import haveno.core.monetary.Price;
import org.junit.Assert;
import org.junit.Test;

9
core/src/test/java/bisq/core/network/p2p/seed/DefaultSeedNodeRepositoryTest.java → core/src/test/java/haveno/core/network/p2p/seed/DefaultSeedNodeRepositoryTest.java
View file

@ -15,12 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.network.p2p.seed;
import bisq.network.p2p.NodeAddress;
import bisq.common.config.Config;
package haveno.core.network.p2p.seed;
import haveno.common.config.Config;
import haveno.core.network.p2p.seed.DefaultSeedNodeRepository;
import haveno.network.p2p.NodeAddress;
import org.junit.Assert;
import org.junit.Test;

7
core/src/test/java/bisq/core/notifications/MobileModelTest.java → core/src/test/java/haveno/core/notifications/MobileModelTest.java
View file

@ -15,9 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.notifications;
import bisq.common.util.Tuple2;
package haveno.core.notifications;
import java.util.Arrays;
import java.util.List;
@ -28,6 +26,9 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import haveno.common.util.Tuple2;
import haveno.core.notifications.MobileModel;
@Slf4j
public class MobileModelTest {

5
core/src/test/java/bisq/core/offer/OfferMaker.java → core/src/test/java/haveno/core/offer/OfferMaker.java
View file

@ -15,11 +15,14 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.offer;
package haveno.core.offer;
import com.natpryce.makeiteasy.Instantiator;
import com.natpryce.makeiteasy.Maker;
import com.natpryce.makeiteasy.Property;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferDirection;
import haveno.core.offer.OfferPayload;
import static com.natpryce.makeiteasy.MakeItEasy.a;

5
core/src/test/java/bisq/core/offer/OfferTest.java → core/src/test/java/haveno/core/offer/OfferTest.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.offer;
package haveno.core.offer;
import org.junit.Test;
@ -24,6 +24,9 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferPayload;
public class OfferTest {
@Test

34
core/src/test/java/bisq/core/offer/OpenOfferManagerTest.java → core/src/test/java/haveno/core/offer/OpenOfferManagerTest.java
View file

@ -1,19 +1,21 @@
package bisq.core.offer;
import bisq.core.api.CoreContext;
import bisq.core.api.CoreMoneroConnectionsService;
import bisq.core.trade.TradableList;
import bisq.network.p2p.P2PService;
import bisq.network.p2p.peers.PeerManager;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.KeyStorage;
import bisq.common.file.CorruptedStorageFileHandler;
import bisq.common.handlers.ErrorMessageHandler;
import bisq.common.handlers.ResultHandler;
import bisq.common.persistence.PersistenceManager;
package haveno.core.offer;
import haveno.common.crypto.KeyRing;
import haveno.common.crypto.KeyStorage;
import haveno.common.file.CorruptedStorageFileHandler;
import haveno.common.handlers.ErrorMessageHandler;
import haveno.common.handlers.ResultHandler;
import haveno.common.persistence.PersistenceManager;
import haveno.core.api.CoreContext;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.offer.OfferBookService;
import haveno.core.offer.OfferPayload;
import haveno.core.offer.OpenOffer;
import haveno.core.offer.OpenOfferManager;
import haveno.core.offer.SignedOfferList;
import haveno.core.trade.TradableList;
import haveno.network.p2p.P2PService;
import haveno.network.p2p.peers.PeerManager;
import java.nio.file.Files;
import java.util.concurrent.atomic.AtomicBoolean;
@ -22,8 +24,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static bisq.core.offer.OfferMaker.btcUsdOffer;
import static com.natpryce.makeiteasy.MakeItEasy.make;
import static haveno.core.offer.OfferMaker.btcUsdOffer;
import static junit.framework.TestCase.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;

4
core/src/test/java/bisq/core/offer/availability/ArbitratorSelectionTest.java → core/src/test/java/haveno/core/offer/availability/ArbitratorSelectionTest.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.offer.availability;
package haveno.core.offer.availability;
import java.util.Arrays;
import java.util.HashSet;
@ -26,6 +26,8 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import haveno.core.offer.availability.DisputeAgentSelection;
public class ArbitratorSelectionTest {
@Test
public void testGetLeastUsedArbitrator() {

14
core/src/test/java/bisq/core/payment/PaymentAccountsTest.java → core/src/test/java/haveno/core/payment/PaymentAccountsTest.java
View file

@ -15,12 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.payment;
import bisq.core.account.witness.AccountAgeWitness;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.offer.Offer;
import bisq.core.payment.payload.PaymentAccountPayload;
package haveno.core.payment;
import java.util.Collections;
@ -32,6 +27,13 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import haveno.core.account.witness.AccountAgeWitness;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.offer.Offer;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.PaymentAccounts;
import haveno.core.payment.payload.PaymentAccountPayload;
public class PaymentAccountsTest {
@Test
public void testGetOldestPaymentAccountForOfferWhenNoValidAccounts() {

16
core/src/test/java/bisq/core/payment/ReceiptPredicatesTest.java → core/src/test/java/haveno/core/payment/ReceiptPredicatesTest.java
View file

@ -15,14 +15,18 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.payment;
import bisq.core.locale.CryptoCurrency;
import bisq.core.offer.Offer;
import bisq.core.payment.payload.PaymentMethod;
package haveno.core.payment;
import com.google.common.collect.Lists;
import haveno.core.locale.CryptoCurrency;
import haveno.core.offer.Offer;
import haveno.core.payment.CountryBasedPaymentAccount;
import haveno.core.payment.NationalBankAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.ReceiptPredicates;
import haveno.core.payment.SepaAccount;
import haveno.core.payment.SepaInstantAccount;
import haveno.core.payment.payload.PaymentMethod;
import org.junit.Test;
import static org.junit.Assert.assertFalse;

15
core/src/test/java/bisq/core/payment/ReceiptValidatorTest.java → core/src/test/java/haveno/core/payment/ReceiptValidatorTest.java
View file

@ -15,9 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.payment;
import bisq.core.offer.Offer;
package haveno.core.payment;
import org.junit.After;
import org.junit.Before;
@ -29,6 +27,17 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.*;
import haveno.core.offer.Offer;
import haveno.core.payment.CountryBasedPaymentAccount;
import haveno.core.payment.MoneyGramAccount;
import haveno.core.payment.NationalBankAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.ReceiptPredicates;
import haveno.core.payment.ReceiptValidator;
import haveno.core.payment.SameBankAccount;
import haveno.core.payment.SpecificBanksAccount;
import haveno.core.payment.WesternUnionAccount;
@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class ReceiptValidatorTest {
private ReceiptValidator validator;

2
core/src/test/java/bisq/core/payment/TradeLimitsTest.java → core/src/test/java/haveno/core/payment/TradeLimitsTest.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.payment;
package haveno.core.payment;
import org.junit.Test;

16
core/src/test/java/bisq/core/payment/validation/AltCoinAddressValidatorTest.java → core/src/test/java/haveno/core/payment/validation/AltCoinAddressValidatorTest.java
View file

@ -15,16 +15,14 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.payment.validation;
import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.Res;
import bisq.asset.AssetRegistry;
import bisq.common.config.BaseCurrencyNetwork;
import bisq.common.config.Config;
package haveno.core.payment.validation;
import haveno.asset.AssetRegistry;
import haveno.common.config.BaseCurrencyNetwork;
import haveno.common.config.Config;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.Res;
import haveno.core.payment.validation.AltCoinAddressValidator;
import org.junit.Test;
import static org.junit.Assert.assertFalse;

6
core/src/test/java/bisq/core/provider/mempool/TxValidatorTest.java → core/src/test/java/haveno/core/provider/mempool/TxValidatorTest.java
View file

@ -15,11 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.provider.mempool;
package haveno.core.provider.mempool;
import bisq.core.util.ParsingUtils;
import com.google.gson.Gson;
import haveno.core.provider.mempool.TxValidator;
import haveno.core.util.ParsingUtils;
import org.apache.commons.io.IOUtils;
import org.bitcoinj.core.Coin;

4
core/src/test/java/bisq/core/provider/price/MarketPriceFeedServiceTest.java → core/src/test/java/haveno/core/provider/price/MarketPriceFeedServiceTest.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.provider.price;
package haveno.core.provider.price;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -25,6 +25,8 @@ import org.junit.Test;
import static junit.framework.TestCase.assertTrue;
import haveno.core.provider.price.PriceFeedService;
@Ignore
public class MarketPriceFeedServiceTest {
private static final Logger log = LoggerFactory.getLogger(MarketPriceFeedServiceTest.class);

11
core/src/test/java/bisq/core/trade/TradableListTest.java → core/src/test/java/haveno/core/trade/TradableListTest.java
View file

@ -15,11 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade;
import bisq.core.offer.Offer;
import bisq.core.offer.OfferPayload;
import bisq.core.offer.OpenOffer;
package haveno.core.trade;
import org.junit.Test;
@ -28,6 +24,11 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static protobuf.PersistableEnvelope.MessageCase.TRADABLE_LIST;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferPayload;
import haveno.core.offer.OpenOffer;
import haveno.core.trade.TradableList;
public class TradableListTest {
@Test

11
core/src/test/java/bisq/core/trade/txproof/xmr/XmrTxProofParserTest.java → core/src/test/java/haveno/core/trade/txproof/xmr/XmrTxProofParserTest.java
View file

@ -1,6 +1,4 @@
package bisq.core.trade.txproof.xmr;
import bisq.core.user.AutoConfirmSettings;
package haveno.core.trade.txproof.xmr;
import java.time.Instant;
@ -10,10 +8,15 @@ import java.util.Date;
import org.junit.Before;
import org.junit.Test;
import static bisq.core.trade.txproof.xmr.XmrTxProofParser.MAX_DATE_TOLERANCE;
import static haveno.core.trade.txproof.xmr.XmrTxProofParser.MAX_DATE_TOLERANCE;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import haveno.core.trade.txproof.xmr.XmrTxProofModel;
import haveno.core.trade.txproof.xmr.XmrTxProofParser;
import haveno.core.trade.txproof.xmr.XmrTxProofRequest;
import haveno.core.user.AutoConfirmSettings;
public class XmrTxProofParserTest {
private XmrTxProofModel xmrTxProofModel;
private String recipientAddressHex = "e957dac72bcec80d59b2fecacfa7522223b6a5df895b7e388e60297e85f3f867b42f43e8d9f086a99a997704ceb92bd9cd99d33952de90c9f5f93c82c62360ae";

24
core/src/test/java/bisq/core/user/PreferencesTest.java → core/src/test/java/haveno/core/user/PreferencesTest.java
View file

@ -15,19 +15,19 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.user;
import bisq.core.btc.nodes.LocalBitcoinNode;
import bisq.core.locale.CountryUtil;
import bisq.core.locale.CryptoCurrency;
import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.FiatCurrency;
import bisq.core.locale.GlobalSettings;
import bisq.core.locale.Res;
import bisq.common.config.Config;
import bisq.common.persistence.PersistenceManager;
package haveno.core.user;
import haveno.common.config.Config;
import haveno.common.persistence.PersistenceManager;
import haveno.core.btc.nodes.LocalBitcoinNode;
import haveno.core.locale.CountryUtil;
import haveno.core.locale.CryptoCurrency;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.FiatCurrency;
import haveno.core.locale.GlobalSettings;
import haveno.core.locale.Res;
import haveno.core.user.Preferences;
import haveno.core.user.PreferencesPayload;
import javafx.collections.ObservableList;
import java.util.ArrayList;

19
core/src/test/java/bisq/core/user/UserPayloadModelVOTest.java → core/src/test/java/haveno/core/user/UserPayloadModelVOTest.java
View file

@ -15,29 +15,28 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.user;
import bisq.core.alert.Alert;
import bisq.core.arbitration.ArbitratorTest;
import bisq.core.arbitration.MediatorTest;
import bisq.core.filter.Filter;
import bisq.core.proto.CoreProtoResolver;
package haveno.core.user;
import com.google.common.collect.Lists;
import haveno.core.alert.Alert;
import haveno.core.arbitration.ArbitratorTest;
import haveno.core.arbitration.MediatorTest;
import haveno.core.filter.Filter;
import haveno.core.proto.CoreProtoResolver;
import haveno.core.user.UserPayload;
import java.util.HashSet;
import org.junit.Ignore;
public class UserPayloadModelVOTest {
@Ignore("TODO InvalidKeySpecException at bisq.common.crypto.Sig.getPublicKeyFromBytes(Sig.java:135)")
@Ignore("TODO InvalidKeySpecException at haveno.common.crypto.Sig.getPublicKeyFromBytes(Sig.java:135)")
public void testRoundtrip() {
UserPayload vo = new UserPayload();
vo.setAccountId("accountId");
UserPayload newVo = UserPayload.fromProto(vo.toProtoMessage().getUserPayload(), new CoreProtoResolver());
}
@Ignore("TODO InvalidKeySpecException at bisq.common.crypto.Sig.getPublicKeyFromBytes(Sig.java:135)")
@Ignore("TODO InvalidKeySpecException at haveno.common.crypto.Sig.getPublicKeyFromBytes(Sig.java:135)")
public void testRoundtripFull() {
UserPayload vo = new UserPayload();
vo.setAccountId("accountId");

13
core/src/test/java/bisq/core/util/FormattingUtilsTest.java → core/src/test/java/haveno/core/util/FormattingUtilsTest.java
View file

@ -1,9 +1,4 @@
package bisq.core.util;
import bisq.core.locale.GlobalSettings;
import bisq.core.locale.Res;
import bisq.core.monetary.Altcoin;
import bisq.core.monetary.Price;
package haveno.core.util;
import org.bitcoinj.utils.Fiat;
@ -13,7 +8,11 @@ import java.util.concurrent.TimeUnit;
import com.natpryce.makeiteasy.Instantiator;
import com.natpryce.makeiteasy.Maker;
import com.natpryce.makeiteasy.Property;
import haveno.core.locale.GlobalSettings;
import haveno.core.locale.Res;
import haveno.core.monetary.Altcoin;
import haveno.core.monetary.Price;
import haveno.core.util.FormattingUtils;
import org.junit.Before;
import org.junit.Test;

12
core/src/test/java/bisq/core/util/ProtoUtilTest.java → core/src/test/java/haveno/core/util/ProtoUtilTest.java
View file

@ -15,13 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.util;
import bisq.core.offer.OfferDirection;
import bisq.core.offer.OpenOffer;
import bisq.common.proto.ProtoUtil;
package haveno.core.util;
import haveno.common.proto.ProtoUtil;
import haveno.core.offer.OfferDirection;
import haveno.core.offer.OpenOffer;
import protobuf.OfferPayload;
import org.junit.Test;
@ -32,7 +30,7 @@ import static org.junit.Assert.fail;
@SuppressWarnings("UnusedAssignment")
public class ProtoUtilTest {
//TODO Use NetworkProtoResolver, PersistenceProtoResolver or ProtoResolver which are all in bisq.common.
//TODO Use NetworkProtoResolver, PersistenceProtoResolver or ProtoResolver which are all in haveno.common.
@Test
public void testEnum() {
OfferDirection direction = OfferDirection.SELL;

12
core/src/test/java/bisq/core/util/RegexValidatorTest.java → core/src/test/java/haveno/core/util/RegexValidatorTest.java
View file

@ -15,12 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.util;
import bisq.core.locale.GlobalSettings;
import bisq.core.locale.Res;
import bisq.core.util.validation.RegexValidator;
import bisq.core.util.validation.RegexValidatorFactory;
package haveno.core.util;
import java.util.Locale;
@ -30,6 +25,11 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import haveno.core.locale.GlobalSettings;
import haveno.core.locale.Res;
import haveno.core.util.validation.RegexValidator;
import haveno.core.util.validation.RegexValidatorFactory;
public class RegexValidatorTest {

10
core/src/test/java/bisq/core/util/coin/CoinUtilTest.java → core/src/test/java/haveno/core/util/coin/CoinUtilTest.java
View file

@ -15,11 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.util.coin;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.monetary.Price;
import bisq.core.trade.HavenoUtils;
package haveno.core.util.coin;
import org.bitcoinj.core.Coin;
@ -28,6 +24,10 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import haveno.core.btc.wallet.Restrictions;
import haveno.core.monetary.Price;
import haveno.core.trade.HavenoUtils;
import haveno.core.util.coin.CoinUtil;
import java.math.BigInteger;
public class CoinUtilTest {

10
core/src/test/resources/bisq/core/app/cli-output.txt → core/src/test/resources/haveno/core/app/cli-output.txt
View file

@ -1,11 +1,11 @@
Bisq Test version 0.1.0
Haveno Test version 0.1.0
Usage: bisq-test [options]
Usage: haveno-test [options]
Options:
--name=<String> (default: Bisq)
The name of the Bisq node
--name=<String> (default: Haveno)
The name of the Haveno node
--another-option=<String> (default: WAT)
This is a long description which will need to break over multiple
@ -49,7 +49,7 @@ Options:
--with-default-value=<String> (default: Wat)
Some option with a default value
--data-dir=<File> (default: /Users/cbeams/Library/Application Support/Bisq)
--data-dir=<File> (default: /Users/cbeams/Library/Application Support/Haveno)
Application data directory
--enum-opt=<foo|bar|baz> (default: foo)

10
core/src/test/resources/bisq/core/app/cli-output_windows.txt → core/src/test/resources/haveno/core/app/cli-output_windows.txt
View file

@ -1,11 +1,11 @@
Bisq Test version 0.1.0
Haveno Test version 0.1.0
Usage: bisq-test [options]
Usage: haveno-test [options]
Options:
--name=<String> (default: Bisq)
The name of the Bisq node
--name=<String> (default: Haveno)
The name of the Haveno node
--another-option=<String> (default: WAT)
This is a long description which will need to break over multiple
@ -49,7 +49,7 @@ Options:
--with-default-value=<String> (default: Wat)
Some option with a default value
--data-dir=<File> (default: \Users\cbeams\Library\Application Support\Bisq)
--data-dir=<File> (default: \Users\cbeams\Library\Application Support\Haveno)
Application data directory
--enum-opt=<foo|bar|baz> (default: foo)

0
core/src/test/resources/bisq/core/dao/node/full/rpc/getblock-result-verbosity-0.txt → core/src/test/resources/haveno/core/dao/node/full/rpc/getblock-result-verbosity-0.txt
View file

0
core/src/test/resources/bisq/core/dao/node/full/rpc/getblock-result-verbosity-1.json → core/src/test/resources/haveno/core/dao/node/full/rpc/getblock-result-verbosity-1.json
View file

0
core/src/test/resources/bisq/core/dao/node/full/rpc/getblock-result-verbosity-2.json → core/src/test/resources/haveno/core/dao/node/full/rpc/getblock-result-verbosity-2.json
View file

0
core/src/test/resources/bisq/core/dao/node/full/rpc/getnetworkinfo-result.json → core/src/test/resources/haveno/core/dao/node/full/rpc/getnetworkinfo-result.json
View file

0
core/src/test/resources/bisq/core/provider/mempool/badOfferTestData.json → core/src/test/resources/haveno/core/provider/mempool/badOfferTestData.json
View file

0
core/src/test/resources/bisq/core/provider/mempool/offerTestData.json → core/src/test/resources/haveno/core/provider/mempool/offerTestData.json
View file

0
core/src/test/resources/bisq/core/provider/mempool/txInfo.json → core/src/test/resources/haveno/core/provider/mempool/txInfo.json
View file

4
core/src/test/resources/regtest.seednodes
View file

@ -1,6 +1,6 @@
# For development you need to change that to your local onion addresses
# 1. Run a seed node with prog args: --bitcoinNetwork=regtest --nodePort=8002 --appName=bisq_seed_node_rxdkppp3vicnbgqt.onion_8002
# 2. Find your local onion address in bisq_seed_node_rxdkppp3vicnbgqt.onion_8002/regtest/tor/hiddenservice/hostname
# 1. Run a seed node with prog args: --bitcoinNetwork=regtest --nodePort=8002 --appName=haveno_seed_node_rxdkppp3vicnbgqt.onion_8002
# 2. Find your local onion address in haveno_seed_node_rxdkppp3vicnbgqt.onion_8002/regtest/tor/hiddenservice/hostname
# 3. Shut down the seed node
# 4. Rename the directory with your local onion address
# 5. Edit here your found onion address (new NodeAddress("YOUR_ONION.onion:8002")