diff --git a/apitest/src/test/java/haveno/apitest/JUnitHelper.java b/apitest/src/test/java/haveno/apitest/JUnitHelper.java
index eb11607d..1936ce30 100644
--- a/apitest/src/test/java/haveno/apitest/JUnitHelper.java
+++ b/apitest/src/test/java/haveno/apitest/JUnitHelper.java
@@ -1,7 +1,6 @@
package haveno.apitest;
import lombok.extern.slf4j.Slf4j;
-
import org.junit.runner.Description;
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
diff --git a/apitest/src/test/java/haveno/apitest/method/BitcoinCliHelper.java b/apitest/src/test/java/haveno/apitest/method/BitcoinCliHelper.java
index 03b247fd..cebaec98 100644
--- a/apitest/src/test/java/haveno/apitest/method/BitcoinCliHelper.java
+++ b/apitest/src/test/java/haveno/apitest/method/BitcoinCliHelper.java
@@ -17,14 +17,14 @@
package haveno.apitest.method;
+import haveno.apitest.config.ApiTestConfig;
+import haveno.apitest.linux.BitcoinCli;
+
import java.io.IOException;
import static java.lang.String.format;
import static org.junit.jupiter.api.Assertions.fail;
-import haveno.apitest.config.ApiTestConfig;
-import haveno.apitest.linux.BitcoinCli;
-
public final class BitcoinCliHelper {
private final ApiTestConfig config;
diff --git a/apitest/src/test/java/haveno/apitest/method/CallRateMeteringInterceptorTest.java b/apitest/src/test/java/haveno/apitest/method/CallRateMeteringInterceptorTest.java
index d701486a..2613212f 100644
--- a/apitest/src/test/java/haveno/apitest/method/CallRateMeteringInterceptorTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/CallRateMeteringInterceptorTest.java
@@ -18,9 +18,7 @@
package haveno.apitest.method;
import io.grpc.StatusRuntimeException;
-
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
diff --git a/apitest/src/test/java/haveno/apitest/method/GetMethodHelpTest.java b/apitest/src/test/java/haveno/apitest/method/GetMethodHelpTest.java
index 51b6bb7c..d40466f1 100644
--- a/apitest/src/test/java/haveno/apitest/method/GetMethodHelpTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/GetMethodHelpTest.java
@@ -18,7 +18,6 @@
package haveno.apitest.method;
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
diff --git a/apitest/src/test/java/haveno/apitest/method/GetVersionTest.java b/apitest/src/test/java/haveno/apitest/method/GetVersionTest.java
index 5c66fb9c..7431c818 100644
--- a/apitest/src/test/java/haveno/apitest/method/GetVersionTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/GetVersionTest.java
@@ -18,7 +18,6 @@
package haveno.apitest.method;
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
diff --git a/apitest/src/test/java/haveno/apitest/method/MethodTest.java b/apitest/src/test/java/haveno/apitest/method/MethodTest.java
index 8f815e91..2dbd8986 100644
--- a/apitest/src/test/java/haveno/apitest/method/MethodTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/MethodTest.java
@@ -17,7 +17,6 @@
package haveno.apitest.method;
-import haveno.proto.grpc.BalancesInfo;
import haveno.apitest.ApiTestCase;
import haveno.apitest.linux.BashCommand;
import haveno.cli.GrpcClient;
@@ -27,22 +26,19 @@ import haveno.core.api.model.PaymentAccountForm;
import haveno.core.payment.F2FAccount;
import haveno.core.payment.NationalBankAccount;
import haveno.core.proto.CoreProtoResolver;
+import haveno.proto.grpc.BalancesInfo;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import java.math.BigDecimal;
-
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
import org.slf4j.Logger;
import javax.annotation.Nullable;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.math.BigDecimal;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
import static haveno.apitest.config.ApiTestConfig.BTC;
import static haveno.apitest.config.ApiTestRateMeterInterceptorConfig.getTestRateMeterInterceptorConfig;
diff --git a/apitest/src/test/java/haveno/apitest/method/RegisterDisputeAgentsTest.java b/apitest/src/test/java/haveno/apitest/method/RegisterDisputeAgentsTest.java
index 8d63d995..5717830d 100644
--- a/apitest/src/test/java/haveno/apitest/method/RegisterDisputeAgentsTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/RegisterDisputeAgentsTest.java
@@ -18,9 +18,7 @@
package haveno.apitest.method;
import io.grpc.StatusRuntimeException;
-
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
diff --git a/apitest/src/test/java/haveno/apitest/method/offer/AbstractOfferTest.java b/apitest/src/test/java/haveno/apitest/method/offer/AbstractOfferTest.java
index 70f6f302..438a4187 100644
--- a/apitest/src/test/java/haveno/apitest/method/offer/AbstractOfferTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/offer/AbstractOfferTest.java
@@ -17,24 +17,21 @@
package haveno.apitest.method.offer;
-import haveno.proto.grpc.OfferInfo;
import haveno.apitest.method.MethodTest;
import haveno.cli.CliMain;
import haveno.cli.table.builder.TableBuilder;
+import haveno.proto.grpc.OfferInfo;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
import protobuf.PaymentAccount;
import java.math.BigDecimal;
import java.math.MathContext;
-
import java.util.List;
import java.util.function.Function;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-
import static haveno.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static haveno.apitest.config.ApiTestConfig.XMR;
import static haveno.apitest.config.HavenoAppConfig.alicedaemon;
diff --git a/apitest/src/test/java/haveno/apitest/method/offer/CancelOfferTest.java b/apitest/src/test/java/haveno/apitest/method/offer/CancelOfferTest.java
index aa33a126..3e9bcdff 100644
--- a/apitest/src/test/java/haveno/apitest/method/offer/CancelOfferTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/offer/CancelOfferTest.java
@@ -17,19 +17,18 @@
package haveno.apitest.method.offer;
-import haveno.proto.grpc.OfferInfo;
import haveno.core.payment.PaymentAccount;
-import java.util.List;
-import java.util.function.Consumer;
-
+import haveno.proto.grpc.OfferInfo;
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+import java.util.List;
+import java.util.function.Consumer;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static protobuf.OfferDirection.BUY;
diff --git a/apitest/src/test/java/haveno/apitest/method/offer/CreateOfferUsingFixedPriceTest.java b/apitest/src/test/java/haveno/apitest/method/offer/CreateOfferUsingFixedPriceTest.java
index 604aa82b..2f066acf 100644
--- a/apitest/src/test/java/haveno/apitest/method/offer/CreateOfferUsingFixedPriceTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/offer/CreateOfferUsingFixedPriceTest.java
@@ -17,8 +17,8 @@
package haveno.apitest.method.offer;
+import haveno.core.payment.PaymentAccount;
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
@@ -35,8 +35,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static protobuf.OfferDirection.BUY;
import static protobuf.OfferDirection.SELL;
-import haveno.core.payment.PaymentAccount;
-
@Disabled
@Slf4j
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git a/apitest/src/test/java/haveno/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java b/apitest/src/test/java/haveno/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java
index 1c95cd9d..84068bca 100644
--- a/apitest/src/test/java/haveno/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java
@@ -17,20 +17,18 @@
package haveno.apitest.method.offer;
-import haveno.proto.grpc.OfferInfo;
import haveno.core.payment.PaymentAccount;
-import java.text.DecimalFormat;
-
-import java.math.BigDecimal;
-
+import haveno.proto.grpc.OfferInfo;
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+
import static haveno.apitest.config.ApiTestConfig.BTC;
import static haveno.apitest.config.ApiTestConfig.USD;
import static haveno.common.util.MathUtils.roundDouble;
diff --git a/apitest/src/test/java/haveno/apitest/method/offer/CreateXMROffersTest.java b/apitest/src/test/java/haveno/apitest/method/offer/CreateXMROffersTest.java
index 49769692..4226f8c9 100644
--- a/apitest/src/test/java/haveno/apitest/method/offer/CreateXMROffersTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/offer/CreateXMROffersTest.java
@@ -18,11 +18,7 @@
package haveno.apitest.method.offer;
import haveno.proto.grpc.OfferInfo;
-
-import java.util.List;
-
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
@@ -30,6 +26,8 @@ import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+import java.util.List;
+
import static haveno.apitest.config.ApiTestConfig.BTC;
import static haveno.apitest.config.ApiTestConfig.XMR;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/apitest/src/test/java/haveno/apitest/method/offer/ValidateCreateOfferTest.java b/apitest/src/test/java/haveno/apitest/method/offer/ValidateCreateOfferTest.java
index 513aa957..3fcf7038 100644
--- a/apitest/src/test/java/haveno/apitest/method/offer/ValidateCreateOfferTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/offer/ValidateCreateOfferTest.java
@@ -17,24 +17,20 @@
package haveno.apitest.method.offer;
+import haveno.core.payment.PaymentAccount;
import io.grpc.StatusRuntimeException;
-
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
-import static haveno.apitest.config.ApiTestConfig.BTC;
import static java.lang.String.format;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static protobuf.OfferDirection.BUY;
-import haveno.core.payment.PaymentAccount;
-
@Disabled
@Slf4j
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git a/apitest/src/test/java/haveno/apitest/method/payment/AbstractPaymentAccountTest.java b/apitest/src/test/java/haveno/apitest/method/payment/AbstractPaymentAccountTest.java
index 80fff914..57b26cf7 100644
--- a/apitest/src/test/java/haveno/apitest/method/payment/AbstractPaymentAccountTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/payment/AbstractPaymentAccountTest.java
@@ -10,13 +10,15 @@ import haveno.core.locale.FiatCurrency;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
import haveno.core.payment.PaymentAccount;
-import java.nio.file.Paths;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
-
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
@@ -26,15 +28,14 @@ import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.TestInfo;
-
import static java.lang.String.format;
import static java.lang.System.getProperty;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
@Slf4j
public class AbstractPaymentAccountTest extends MethodTest {
diff --git a/apitest/src/test/java/haveno/apitest/method/payment/CreatePaymentAccountTest.java b/apitest/src/test/java/haveno/apitest/method/payment/CreatePaymentAccountTest.java
index 3e7afe9c..b67489d8 100644
--- a/apitest/src/test/java/haveno/apitest/method/payment/CreatePaymentAccountTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/payment/CreatePaymentAccountTest.java
@@ -58,17 +58,7 @@ import haveno.core.payment.payload.SameBankAccountPayload;
import haveno.core.payment.payload.SpecificBanksAccountPayload;
import haveno.core.payment.payload.SwiftAccountPayload;
import io.grpc.StatusRuntimeException;
-
-import java.io.File;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
@@ -76,6 +66,13 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.TestMethodOrder;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
import static haveno.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static haveno.apitest.config.ApiTestConfig.EUR;
import static haveno.apitest.config.ApiTestConfig.USD;
@@ -83,7 +80,37 @@ import static haveno.apitest.config.HavenoAppConfig.alicedaemon;
import static haveno.cli.table.builder.TableType.PAYMENT_ACCOUNT_TBL;
import static haveno.core.locale.CurrencyUtil.getAllSortedFiatCurrencies;
import static haveno.core.locale.CurrencyUtil.getTradeCurrency;
-import static haveno.core.payment.payload.PaymentMethod.*;
+import static haveno.core.payment.payload.PaymentMethod.ADVANCED_CASH_ID;
+import static haveno.core.payment.payload.PaymentMethod.ALI_PAY_ID;
+import static haveno.core.payment.payload.PaymentMethod.AUSTRALIA_PAYID_ID;
+import static haveno.core.payment.payload.PaymentMethod.CAPITUAL_ID;
+import static haveno.core.payment.payload.PaymentMethod.CASH_DEPOSIT_ID;
+import static haveno.core.payment.payload.PaymentMethod.CLEAR_X_CHANGE_ID;
+import static haveno.core.payment.payload.PaymentMethod.F2F_ID;
+import static haveno.core.payment.payload.PaymentMethod.FASTER_PAYMENTS_ID;
+import static haveno.core.payment.payload.PaymentMethod.HAL_CASH_ID;
+import static haveno.core.payment.payload.PaymentMethod.INTERAC_E_TRANSFER_ID;
+import static haveno.core.payment.payload.PaymentMethod.JAPAN_BANK_ID;
+import static haveno.core.payment.payload.PaymentMethod.MONEY_BEAM_ID;
+import static haveno.core.payment.payload.PaymentMethod.MONEY_GRAM_ID;
+import static haveno.core.payment.payload.PaymentMethod.NATIONAL_BANK_ID;
+import static haveno.core.payment.payload.PaymentMethod.PAXUM_ID;
+import static haveno.core.payment.payload.PaymentMethod.PAYSERA_ID;
+import static haveno.core.payment.payload.PaymentMethod.PERFECT_MONEY_ID;
+import static haveno.core.payment.payload.PaymentMethod.POPMONEY_ID;
+import static haveno.core.payment.payload.PaymentMethod.PROMPT_PAY_ID;
+import static haveno.core.payment.payload.PaymentMethod.REVOLUT_ID;
+import static haveno.core.payment.payload.PaymentMethod.SAME_BANK_ID;
+import static haveno.core.payment.payload.PaymentMethod.SEPA_ID;
+import static haveno.core.payment.payload.PaymentMethod.SEPA_INSTANT_ID;
+import static haveno.core.payment.payload.PaymentMethod.SPECIFIC_BANKS_ID;
+import static haveno.core.payment.payload.PaymentMethod.SWIFT_ID;
+import static haveno.core.payment.payload.PaymentMethod.SWISH_ID;
+import static haveno.core.payment.payload.PaymentMethod.TRANSFERWISE_ID;
+import static haveno.core.payment.payload.PaymentMethod.UPHOLD_ID;
+import static haveno.core.payment.payload.PaymentMethod.US_POSTAL_MONEY_ORDER_ID;
+import static haveno.core.payment.payload.PaymentMethod.WECHAT_PAY_ID;
+import static haveno.core.payment.payload.PaymentMethod.WESTERN_UNION_ID;
import static java.util.Comparator.comparing;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/apitest/src/test/java/haveno/apitest/method/payment/GetPaymentMethodsTest.java b/apitest/src/test/java/haveno/apitest/method/payment/GetPaymentMethodsTest.java
index 77bb3373..6b2e5a80 100644
--- a/apitest/src/test/java/haveno/apitest/method/payment/GetPaymentMethodsTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/payment/GetPaymentMethodsTest.java
@@ -1,12 +1,7 @@
package haveno.apitest.method.payment;
-import protobuf.PaymentMethod;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
+import haveno.apitest.method.MethodTest;
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
@@ -14,14 +9,16 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+import protobuf.PaymentMethod;
+
+import java.util.List;
+import java.util.stream.Collectors;
import static haveno.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static haveno.apitest.config.HavenoAppConfig.alicedaemon;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
-import haveno.apitest.method.MethodTest;
-
@Disabled
@Slf4j
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git a/apitest/src/test/java/haveno/apitest/method/trade/AbstractTradeTest.java b/apitest/src/test/java/haveno/apitest/method/trade/AbstractTradeTest.java
index 720b6fc7..21a4145c 100644
--- a/apitest/src/test/java/haveno/apitest/method/trade/AbstractTradeTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/trade/AbstractTradeTest.java
@@ -1,31 +1,30 @@
package haveno.apitest.method.trade;
-import haveno.proto.grpc.TradeInfo;
import haveno.apitest.method.offer.AbstractOfferTest;
import haveno.cli.CliMain;
import haveno.cli.GrpcClient;
import haveno.cli.table.builder.TableBuilder;
+import haveno.proto.grpc.TradeInfo;
+import lombok.Getter;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInfo;
+import org.slf4j.Logger;
+
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.Supplier;
-import org.slf4j.Logger;
-
-import lombok.Getter;
-
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.TestInfo;
-
import static haveno.cli.table.builder.TableType.TRADE_DETAIL_TBL;
import static haveno.core.trade.Trade.Phase.DEPOSITS_UNLOCKED;
-import static haveno.core.trade.Trade.Phase.PAYMENT_RECEIVED;
import static haveno.core.trade.Trade.Phase.PAYMENT_SENT;
import static haveno.core.trade.Trade.State.BUYER_SAW_ARRIVED_PAYMENT_SENT_MSG;
import static haveno.core.trade.Trade.State.DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN;
import static haveno.core.trade.Trade.State.SELLER_RECEIVED_PAYMENT_SENT_MSG;
import static java.lang.String.format;
import static java.lang.System.out;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
public class AbstractTradeTest extends AbstractOfferTest {
diff --git a/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyBTCOfferTest.java b/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyBTCOfferTest.java
index f5e0c1d6..c7519a39 100644
--- a/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyBTCOfferTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyBTCOfferTest.java
@@ -17,10 +17,9 @@
package haveno.apitest.method.trade;
+import haveno.core.payment.PaymentAccount;
import io.grpc.StatusRuntimeException;
-
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
@@ -36,8 +35,6 @@ import static org.junit.jupiter.api.Assertions.fail;
import static protobuf.OfferDirection.BUY;
import static protobuf.OpenOffer.State.AVAILABLE;
-import haveno.core.payment.PaymentAccount;
-
@Disabled
@Slf4j
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git a/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java b/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java
index 50e5dd03..930ba348 100644
--- a/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java
@@ -34,10 +34,10 @@
package haveno.apitest.method.trade;
+import haveno.core.payment.PaymentAccount;
+import haveno.core.payment.payload.NationalBankAccountPayload;
import io.grpc.StatusRuntimeException;
-
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
@@ -46,17 +46,17 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.TestMethodOrder;
-import static haveno.apitest.config.ApiTestConfig.BTC;
import static haveno.core.trade.Trade.Phase.PAYMENT_RECEIVED;
import static haveno.core.trade.Trade.State.SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import static protobuf.Offer.State.OFFER_FEE_RESERVED;
import static protobuf.OfferDirection.BUY;
import static protobuf.OpenOffer.State.AVAILABLE;
-import haveno.core.payment.PaymentAccount;
-import haveno.core.payment.payload.NationalBankAccountPayload;
-
/**
* Test case verifies trade can be made with national bank payment method,
* and json contracts exclude bank acct details until deposit tx is confirmed.
diff --git a/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyXMROfferTest.java b/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyXMROfferTest.java
index f440691c..68c3f40c 100644
--- a/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyXMROfferTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyXMROfferTest.java
@@ -17,10 +17,10 @@
package haveno.apitest.method.trade;
+import haveno.apitest.method.offer.AbstractOfferTest;
+import haveno.cli.table.builder.TableBuilder;
import io.grpc.StatusRuntimeException;
-
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
@@ -38,9 +38,6 @@ import static org.junit.jupiter.api.Assertions.fail;
import static protobuf.Offer.State.OFFER_FEE_RESERVED;
import static protobuf.OfferDirection.SELL;
-import haveno.apitest.method.offer.AbstractOfferTest;
-import haveno.cli.table.builder.TableBuilder;
-
@Disabled
@Slf4j
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git a/apitest/src/test/java/haveno/apitest/method/trade/TakeSellBTCOfferTest.java b/apitest/src/test/java/haveno/apitest/method/trade/TakeSellBTCOfferTest.java
index 11bcaafe..95ef134b 100644
--- a/apitest/src/test/java/haveno/apitest/method/trade/TakeSellBTCOfferTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/trade/TakeSellBTCOfferTest.java
@@ -17,10 +17,9 @@
package haveno.apitest.method.trade;
+import haveno.core.payment.PaymentAccount;
import io.grpc.StatusRuntimeException;
-
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
@@ -30,18 +29,13 @@ import org.junit.jupiter.api.TestMethodOrder;
import static haveno.apitest.config.ApiTestConfig.BTC;
import static haveno.apitest.config.ApiTestConfig.USD;
-import static haveno.core.trade.Trade.Phase.COMPLETED;
import static haveno.core.trade.Trade.Phase.PAYMENT_RECEIVED;
import static haveno.core.trade.Trade.State.SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG;
-import static haveno.core.trade.Trade.State.TRADE_COMPLETED;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static protobuf.Offer.State.OFFER_FEE_RESERVED;
import static protobuf.OfferDirection.SELL;
-import haveno.core.payment.PaymentAccount;
-
@Disabled
@Slf4j
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git a/apitest/src/test/java/haveno/apitest/method/trade/TakeSellXMROfferTest.java b/apitest/src/test/java/haveno/apitest/method/trade/TakeSellXMROfferTest.java
index 2aa996fb..f1e98959 100644
--- a/apitest/src/test/java/haveno/apitest/method/trade/TakeSellXMROfferTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/trade/TakeSellXMROfferTest.java
@@ -17,10 +17,10 @@
package haveno.apitest.method.trade;
+import haveno.apitest.method.offer.AbstractOfferTest;
+import haveno.cli.table.builder.TableBuilder;
import io.grpc.StatusRuntimeException;
-
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
@@ -38,9 +38,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
import static protobuf.OfferDirection.BUY;
-import haveno.apitest.method.offer.AbstractOfferTest;
-import haveno.cli.table.builder.TableBuilder;
-
@Disabled
@Slf4j
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git a/apitest/src/test/java/haveno/apitest/method/wallet/BtcWalletTest.java b/apitest/src/test/java/haveno/apitest/method/wallet/BtcWalletTest.java
index 6de7fd3b..5f272afc 100644
--- a/apitest/src/test/java/haveno/apitest/method/wallet/BtcWalletTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/wallet/BtcWalletTest.java
@@ -1,10 +1,9 @@
package haveno.apitest.method.wallet;
-import haveno.proto.grpc.BtcBalanceInfo;
import haveno.apitest.method.MethodTest;
import haveno.cli.table.builder.TableBuilder;
+import haveno.proto.grpc.BtcBalanceInfo;
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
@@ -22,8 +21,6 @@ import static haveno.apitest.method.wallet.WalletTestUtil.verifyBtcBalances;
import static haveno.cli.table.builder.TableType.ADDRESS_BALANCE_TBL;
import static haveno.cli.table.builder.TableType.BTC_BALANCE_TBL;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
@Disabled
diff --git a/apitest/src/test/java/haveno/apitest/method/wallet/WalletProtectionTest.java b/apitest/src/test/java/haveno/apitest/method/wallet/WalletProtectionTest.java
index b86fde3c..91599488 100644
--- a/apitest/src/test/java/haveno/apitest/method/wallet/WalletProtectionTest.java
+++ b/apitest/src/test/java/haveno/apitest/method/wallet/WalletProtectionTest.java
@@ -1,9 +1,8 @@
package haveno.apitest.method.wallet;
+import haveno.apitest.method.MethodTest;
import io.grpc.StatusRuntimeException;
-
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
@@ -18,8 +17,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
-import haveno.apitest.method.MethodTest;
-
@SuppressWarnings("ResultOfMethodCallIgnored")
@Disabled
@Slf4j
diff --git a/apitest/src/test/java/haveno/apitest/method/wallet/WalletTestUtil.java b/apitest/src/test/java/haveno/apitest/method/wallet/WalletTestUtil.java
index 0ea924c1..a2e21205 100644
--- a/apitest/src/test/java/haveno/apitest/method/wallet/WalletTestUtil.java
+++ b/apitest/src/test/java/haveno/apitest/method/wallet/WalletTestUtil.java
@@ -1,7 +1,6 @@
package haveno.apitest.method.wallet;
import haveno.proto.grpc.BtcBalanceInfo;
-
import lombok.extern.slf4j.Slf4j;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/apitest/src/test/java/haveno/apitest/scenario/LongRunningOfferDeactivationTest.java b/apitest/src/test/java/haveno/apitest/scenario/LongRunningOfferDeactivationTest.java
index d8ebd1e9..c2d7b550 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/LongRunningOfferDeactivationTest.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/LongRunningOfferDeactivationTest.java
@@ -17,11 +17,10 @@
package haveno.apitest.scenario;
-import haveno.proto.grpc.OfferInfo;
import haveno.apitest.method.offer.AbstractOfferTest;
import haveno.core.payment.PaymentAccount;
+import haveno.proto.grpc.OfferInfo;
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
diff --git a/apitest/src/test/java/haveno/apitest/scenario/LongRunningTradesTest.java b/apitest/src/test/java/haveno/apitest/scenario/LongRunningTradesTest.java
index e715fc12..6f4c2996 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/LongRunningTradesTest.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/LongRunningTradesTest.java
@@ -17,8 +17,10 @@
package haveno.apitest.scenario;
+import haveno.apitest.method.trade.AbstractTradeTest;
+import haveno.apitest.method.trade.TakeBuyBTCOfferTest;
+import haveno.apitest.method.trade.TakeSellBTCOfferTest;
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -28,10 +30,6 @@ import org.junit.jupiter.api.condition.EnabledIf;
import static java.lang.System.getenv;
-import haveno.apitest.method.trade.AbstractTradeTest;
-import haveno.apitest.method.trade.TakeBuyBTCOfferTest;
-import haveno.apitest.method.trade.TakeSellBTCOfferTest;
-
@EnabledIf("envLongRunningTestEnabled")
@Slf4j
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git a/apitest/src/test/java/haveno/apitest/scenario/OfferTest.java b/apitest/src/test/java/haveno/apitest/scenario/OfferTest.java
index 3b13bca4..067679ef 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/OfferTest.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/OfferTest.java
@@ -25,7 +25,6 @@ import haveno.apitest.method.offer.CreateOfferUsingMarketPriceMarginTest;
import haveno.apitest.method.offer.CreateXMROffersTest;
import haveno.apitest.method.offer.ValidateCreateOfferTest;
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
diff --git a/apitest/src/test/java/haveno/apitest/scenario/PaymentAccountTest.java b/apitest/src/test/java/haveno/apitest/scenario/PaymentAccountTest.java
index 75973f1b..3067c6a1 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/PaymentAccountTest.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/PaymentAccountTest.java
@@ -1,7 +1,9 @@
package haveno.apitest.scenario;
+import haveno.apitest.method.payment.AbstractPaymentAccountTest;
+import haveno.apitest.method.payment.CreatePaymentAccountTest;
+import haveno.apitest.method.payment.GetPaymentMethodsTest;
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
@@ -15,10 +17,6 @@ import static haveno.apitest.config.HavenoAppConfig.alicedaemon;
import static haveno.apitest.config.HavenoAppConfig.seednode;
import static org.junit.jupiter.api.Assertions.fail;
-import haveno.apitest.method.payment.AbstractPaymentAccountTest;
-import haveno.apitest.method.payment.CreatePaymentAccountTest;
-import haveno.apitest.method.payment.GetPaymentMethodsTest;
-
@Slf4j
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class PaymentAccountTest extends AbstractPaymentAccountTest {
diff --git a/apitest/src/test/java/haveno/apitest/scenario/ScriptedBotTest.java b/apitest/src/test/java/haveno/apitest/scenario/ScriptedBotTest.java
index 6bd35463..630d6b78 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/ScriptedBotTest.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/ScriptedBotTest.java
@@ -17,8 +17,14 @@
package haveno.apitest.scenario;
+import haveno.apitest.config.ApiTestConfig;
+import haveno.apitest.method.BitcoinCliHelper;
+import haveno.apitest.scenario.bot.AbstractBotTest;
+import haveno.apitest.scenario.bot.BotClient;
+import haveno.apitest.scenario.bot.RobotBob;
+import haveno.apitest.scenario.bot.script.BashScriptGenerator;
+import haveno.apitest.scenario.bot.shutdown.ManualBotShutdownException;
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -36,14 +42,6 @@ import static haveno.apitest.config.HavenoAppConfig.seednode;
import static haveno.apitest.scenario.bot.shutdown.ManualShutdown.startShutdownTimer;
import static org.junit.jupiter.api.Assertions.fail;
-import haveno.apitest.config.ApiTestConfig;
-import haveno.apitest.method.BitcoinCliHelper;
-import haveno.apitest.scenario.bot.AbstractBotTest;
-import haveno.apitest.scenario.bot.BotClient;
-import haveno.apitest.scenario.bot.RobotBob;
-import haveno.apitest.scenario.bot.script.BashScriptGenerator;
-import haveno.apitest.scenario.bot.shutdown.ManualBotShutdownException;
-
// The test case is enabled if AbstractBotTest#botScriptExists() returns true.
@EnabledIf("botScriptExists")
@Slf4j
diff --git a/apitest/src/test/java/haveno/apitest/scenario/StartupTest.java b/apitest/src/test/java/haveno/apitest/scenario/StartupTest.java
index 2e7664aa..05e6e131 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/StartupTest.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/StartupTest.java
@@ -17,11 +17,12 @@
package haveno.apitest.scenario;
-import java.io.File;
-import java.io.IOException;
-
+import haveno.apitest.method.CallRateMeteringInterceptorTest;
+import haveno.apitest.method.GetMethodHelpTest;
+import haveno.apitest.method.GetVersionTest;
+import haveno.apitest.method.MethodTest;
+import haveno.apitest.method.RegisterDisputeAgentsTest;
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
@@ -29,6 +30,9 @@ import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+import java.io.File;
+import java.io.IOException;
+
import static haveno.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static haveno.apitest.config.ApiTestRateMeterInterceptorConfig.getTestRateMeterInterceptorConfig;
import static haveno.apitest.config.HavenoAppConfig.alicedaemon;
@@ -37,12 +41,6 @@ import static haveno.apitest.config.HavenoAppConfig.seednode;
import static haveno.common.file.FileUtil.deleteFileIfExists;
import static org.junit.jupiter.api.Assertions.fail;
-import haveno.apitest.method.CallRateMeteringInterceptorTest;
-import haveno.apitest.method.GetMethodHelpTest;
-import haveno.apitest.method.GetVersionTest;
-import haveno.apitest.method.MethodTest;
-import haveno.apitest.method.RegisterDisputeAgentsTest;
-
@Slf4j
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git a/apitest/src/test/java/haveno/apitest/scenario/TradeTest.java b/apitest/src/test/java/haveno/apitest/scenario/TradeTest.java
index c4eaa440..b1c97cce 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/TradeTest.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/TradeTest.java
@@ -24,7 +24,6 @@ import haveno.apitest.method.trade.TakeBuyXMROfferTest;
import haveno.apitest.method.trade.TakeSellBTCOfferTest;
import haveno.apitest.method.trade.TakeSellXMROfferTest;
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
diff --git a/apitest/src/test/java/haveno/apitest/scenario/WalletTest.java b/apitest/src/test/java/haveno/apitest/scenario/WalletTest.java
index 3dccec77..17e065b2 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/WalletTest.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/WalletTest.java
@@ -17,8 +17,10 @@
package haveno.apitest.scenario;
+import haveno.apitest.method.MethodTest;
+import haveno.apitest.method.wallet.BtcWalletTest;
+import haveno.apitest.method.wallet.WalletProtectionTest;
import lombok.extern.slf4j.Slf4j;
-
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
@@ -33,10 +35,6 @@ import static haveno.apitest.config.HavenoAppConfig.arbdaemon;
import static haveno.apitest.config.HavenoAppConfig.bobdaemon;
import static haveno.apitest.config.HavenoAppConfig.seednode;
-import haveno.apitest.method.MethodTest;
-import haveno.apitest.method.wallet.BtcWalletTest;
-import haveno.apitest.method.wallet.WalletProtectionTest;
-
@Slf4j
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class WalletTest extends MethodTest {
diff --git a/apitest/src/test/java/haveno/apitest/scenario/bot/AbstractBotTest.java b/apitest/src/test/java/haveno/apitest/scenario/bot/AbstractBotTest.java
index f03cdc44..16c3abd1 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/bot/AbstractBotTest.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/bot/AbstractBotTest.java
@@ -17,19 +17,17 @@
package haveno.apitest.scenario.bot;
-import protobuf.PaymentAccount;
-
import com.google.gson.GsonBuilder;
import haveno.apitest.method.MethodTest;
import haveno.apitest.scenario.bot.script.BashScriptGenerator;
import haveno.apitest.scenario.bot.script.BotScript;
import haveno.core.locale.Country;
-import java.nio.file.Paths;
+import lombok.extern.slf4j.Slf4j;
+import protobuf.PaymentAccount;
import java.io.File;
import java.io.IOException;
-
-import lombok.extern.slf4j.Slf4j;
+import java.nio.file.Paths;
import static haveno.core.locale.CountryUtil.findCountryByCode;
import static haveno.core.payment.payload.PaymentMethod.CLEAR_X_CHANGE_ID;
diff --git a/apitest/src/test/java/haveno/apitest/scenario/bot/Bot.java b/apitest/src/test/java/haveno/apitest/scenario/bot/Bot.java
index 9d86a30a..7fe539a1 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/bot/Bot.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/bot/Bot.java
@@ -4,9 +4,8 @@ import haveno.apitest.method.BitcoinCliHelper;
import haveno.apitest.scenario.bot.script.BashScriptGenerator;
import haveno.apitest.scenario.bot.script.BotScript;
import haveno.core.locale.Country;
-import protobuf.PaymentAccount;
-
import lombok.extern.slf4j.Slf4j;
+import protobuf.PaymentAccount;
import static haveno.core.locale.CountryUtil.findCountryByCode;
import static haveno.core.payment.payload.PaymentMethod.CLEAR_X_CHANGE_ID;
diff --git a/apitest/src/test/java/haveno/apitest/scenario/bot/BotClient.java b/apitest/src/test/java/haveno/apitest/scenario/bot/BotClient.java
index bc5aed8b..e6b1b6d0 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/bot/BotClient.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/bot/BotClient.java
@@ -17,21 +17,18 @@
package haveno.apitest.scenario.bot;
+import haveno.cli.GrpcClient;
import haveno.proto.grpc.BalancesInfo;
import haveno.proto.grpc.GetPaymentAccountsRequest;
import haveno.proto.grpc.OfferInfo;
import haveno.proto.grpc.TradeInfo;
-import haveno.cli.GrpcClient;
-import haveno.core.api.model.PaymentAccountForm;
+import lombok.extern.slf4j.Slf4j;
import protobuf.PaymentAccount;
import java.text.DecimalFormat;
-
import java.util.List;
import java.util.function.BiPredicate;
-import lombok.extern.slf4j.Slf4j;
-
import static org.apache.commons.lang3.StringUtils.capitalize;
/**
diff --git a/apitest/src/test/java/haveno/apitest/scenario/bot/BotPaymentAccountGenerator.java b/apitest/src/test/java/haveno/apitest/scenario/bot/BotPaymentAccountGenerator.java
index e6a7af30..565101f3 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/bot/BotPaymentAccountGenerator.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/bot/BotPaymentAccountGenerator.java
@@ -1,19 +1,17 @@
package haveno.apitest.scenario.bot;
-import protobuf.PaymentAccount;
-
-import static haveno.core.payment.payload.PaymentMethod.CLEAR_X_CHANGE_ID;
-import static haveno.core.payment.payload.PaymentMethod.F2F_ID;
-
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import haveno.core.api.model.PaymentAccountForm;
import haveno.core.locale.Country;
-import java.io.File;
+import lombok.extern.slf4j.Slf4j;
+import protobuf.PaymentAccount;
+import java.io.File;
import java.util.Map;
-import lombok.extern.slf4j.Slf4j;
+import static haveno.core.payment.payload.PaymentMethod.CLEAR_X_CHANGE_ID;
+import static haveno.core.payment.payload.PaymentMethod.F2F_ID;
@Slf4j
public class BotPaymentAccountGenerator {
diff --git a/apitest/src/test/java/haveno/apitest/scenario/bot/RandomOffer.java b/apitest/src/test/java/haveno/apitest/scenario/bot/RandomOffer.java
index a31d49ed..e295cd03 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/bot/RandomOffer.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/bot/RandomOffer.java
@@ -18,20 +18,15 @@
package haveno.apitest.scenario.bot;
import haveno.proto.grpc.OfferInfo;
-
-import protobuf.PaymentAccount;
-
-import java.security.SecureRandom;
-
-import java.text.DecimalFormat;
-
-import java.math.BigDecimal;
-
-import java.util.Objects;
-import java.util.function.Supplier;
-
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
+import protobuf.PaymentAccount;
+
+import java.math.BigDecimal;
+import java.security.SecureRandom;
+import java.text.DecimalFormat;
+import java.util.Objects;
+import java.util.function.Supplier;
import static haveno.apitest.method.offer.AbstractOfferTest.defaultBuyerSecurityDepositPct;
import static haveno.cli.CurrencyFormat.formatInternalFiatPrice;
diff --git a/apitest/src/test/java/haveno/apitest/scenario/bot/RobotBob.java b/apitest/src/test/java/haveno/apitest/scenario/bot/RobotBob.java
index 30375c9f..7787419c 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/bot/RobotBob.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/bot/RobotBob.java
@@ -17,14 +17,6 @@
package haveno.apitest.scenario.bot;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-
-import static haveno.apitest.scenario.bot.protocol.ProtocolStep.DONE;
-import static haveno.apitest.scenario.bot.shutdown.ManualShutdown.isShutdownCalled;
-import static haveno.cli.table.builder.TableType.BTC_BALANCE_TBL;
-import static java.util.concurrent.TimeUnit.SECONDS;
-
import haveno.apitest.method.BitcoinCliHelper;
import haveno.apitest.scenario.bot.protocol.BotProtocol;
import haveno.apitest.scenario.bot.protocol.MakerBotProtocol;
@@ -33,6 +25,13 @@ import haveno.apitest.scenario.bot.script.BashScriptGenerator;
import haveno.apitest.scenario.bot.script.BotScript;
import haveno.apitest.scenario.bot.shutdown.ManualBotShutdownException;
import haveno.cli.table.builder.TableBuilder;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+import static haveno.apitest.scenario.bot.protocol.ProtocolStep.DONE;
+import static haveno.apitest.scenario.bot.shutdown.ManualShutdown.isShutdownCalled;
+import static haveno.cli.table.builder.TableType.BTC_BALANCE_TBL;
+import static java.util.concurrent.TimeUnit.SECONDS;
@Slf4j
public
diff --git a/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/BotProtocol.java b/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/BotProtocol.java
index 5f5875fe..6c831d41 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/BotProtocol.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/BotProtocol.java
@@ -18,18 +18,18 @@
package haveno.apitest.scenario.bot.protocol;
-import haveno.proto.grpc.TradeInfo;
import haveno.apitest.method.BitcoinCliHelper;
import haveno.apitest.scenario.bot.BotClient;
import haveno.apitest.scenario.bot.script.BashScriptGenerator;
import haveno.apitest.scenario.bot.shutdown.ManualBotShutdownException;
import haveno.cli.table.builder.TableBuilder;
+import haveno.proto.grpc.TradeInfo;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
import protobuf.PaymentAccount;
-import java.security.SecureRandom;
-
import java.io.File;
-
+import java.security.SecureRandom;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Consumer;
@@ -38,10 +38,14 @@ import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Collectors;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-
-import static haveno.apitest.scenario.bot.protocol.ProtocolStep.*;
+import static haveno.apitest.scenario.bot.protocol.ProtocolStep.SEND_PAYMENT_RECEIVED_CONFIRMATION_MESSAGE;
+import static haveno.apitest.scenario.bot.protocol.ProtocolStep.SEND_PAYMENT_SENT_MESSAGE;
+import static haveno.apitest.scenario.bot.protocol.ProtocolStep.START;
+import static haveno.apitest.scenario.bot.protocol.ProtocolStep.WAIT_FOR_PAYMENT_RECEIVED_CONFIRMATION_MESSAGE;
+import static haveno.apitest.scenario.bot.protocol.ProtocolStep.WAIT_FOR_PAYMENT_SENT_MESSAGE;
+import static haveno.apitest.scenario.bot.protocol.ProtocolStep.WAIT_FOR_PAYOUT_TX;
+import static haveno.apitest.scenario.bot.protocol.ProtocolStep.WAIT_FOR_TAKER_DEPOSIT_TX_CONFIRMED;
+import static haveno.apitest.scenario.bot.protocol.ProtocolStep.WAIT_FOR_TAKER_DEPOSIT_TX_PUBLISHED;
import static haveno.apitest.scenario.bot.shutdown.ManualShutdown.checkIfShutdownCalled;
import static haveno.cli.table.builder.TableType.TRADE_DETAIL_TBL;
import static java.lang.String.format;
diff --git a/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/MakerBotProtocol.java b/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/MakerBotProtocol.java
index f5d706e6..29d50583 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/MakerBotProtocol.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/MakerBotProtocol.java
@@ -1,23 +1,21 @@
package haveno.apitest.scenario.bot.protocol;
-import haveno.proto.grpc.OfferInfo;
-import haveno.proto.grpc.TradeInfo;
import haveno.apitest.method.BitcoinCliHelper;
import haveno.apitest.scenario.bot.BotClient;
import haveno.apitest.scenario.bot.RandomOffer;
import haveno.apitest.scenario.bot.script.BashScriptGenerator;
import haveno.apitest.scenario.bot.shutdown.ManualBotShutdownException;
import haveno.cli.table.builder.TableBuilder;
+import haveno.proto.grpc.OfferInfo;
+import haveno.proto.grpc.TradeInfo;
+import lombok.extern.slf4j.Slf4j;
import protobuf.PaymentAccount;
import java.io.File;
-
import java.util.Optional;
import java.util.function.Function;
import java.util.function.Supplier;
-import lombok.extern.slf4j.Slf4j;
-
import static haveno.apitest.scenario.bot.protocol.ProtocolStep.DONE;
import static haveno.apitest.scenario.bot.protocol.ProtocolStep.WAIT_FOR_OFFER_TAKER;
import static haveno.apitest.scenario.bot.shutdown.ManualShutdown.checkIfShutdownCalled;
diff --git a/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/TakerBotProtocol.java b/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/TakerBotProtocol.java
index b774cc08..8a28b764 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/TakerBotProtocol.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/TakerBotProtocol.java
@@ -1,22 +1,20 @@
package haveno.apitest.scenario.bot.protocol;
-import haveno.proto.grpc.OfferInfo;
-import haveno.proto.grpc.TradeInfo;
import haveno.apitest.method.BitcoinCliHelper;
import haveno.apitest.scenario.bot.BotClient;
import haveno.apitest.scenario.bot.script.BashScriptGenerator;
import haveno.apitest.scenario.bot.shutdown.ManualBotShutdownException;
import haveno.cli.table.builder.TableBuilder;
+import haveno.proto.grpc.OfferInfo;
+import haveno.proto.grpc.TradeInfo;
+import lombok.extern.slf4j.Slf4j;
import protobuf.PaymentAccount;
import java.io.File;
-
import java.util.Optional;
import java.util.function.Function;
import java.util.function.Supplier;
-import lombok.extern.slf4j.Slf4j;
-
import static haveno.apitest.scenario.bot.protocol.ProtocolStep.DONE;
import static haveno.apitest.scenario.bot.protocol.ProtocolStep.FIND_OFFER;
import static haveno.apitest.scenario.bot.protocol.ProtocolStep.TAKE_OFFER;
diff --git a/apitest/src/test/java/haveno/apitest/scenario/bot/script/BashScriptGenerator.java b/apitest/src/test/java/haveno/apitest/scenario/bot/script/BashScriptGenerator.java
index 0c72058e..52af8735 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/bot/script/BashScriptGenerator.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/bot/script/BashScriptGenerator.java
@@ -17,23 +17,20 @@
package haveno.apitest.scenario.bot.script;
-import haveno.proto.grpc.OfferInfo;
-import haveno.proto.grpc.TradeInfo;
-
import com.google.common.io.Files;
import haveno.common.file.FileUtil;
-import java.nio.file.Paths;
+import haveno.proto.grpc.OfferInfo;
+import haveno.proto.grpc.TradeInfo;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
import java.io.File;
import java.io.IOException;
-
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-
import static com.google.common.io.FileWriteMode.APPEND;
import static java.lang.String.format;
import static java.lang.System.getProperty;
diff --git a/apitest/src/test/java/haveno/apitest/scenario/bot/script/BotScriptGenerator.java b/apitest/src/test/java/haveno/apitest/scenario/bot/script/BotScriptGenerator.java
index f6fee1c9..e39e7876 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/bot/script/BotScriptGenerator.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/bot/script/BotScriptGenerator.java
@@ -23,14 +23,12 @@ import joptsimple.BuiltinHelpFormatter;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import joptsimple.OptionSpec;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
import static java.lang.System.err;
import static java.lang.System.exit;
diff --git a/apitest/src/test/java/haveno/apitest/scenario/bot/shutdown/ManualShutdown.java b/apitest/src/test/java/haveno/apitest/scenario/bot/shutdown/ManualShutdown.java
index 833379d8..75416e51 100644
--- a/apitest/src/test/java/haveno/apitest/scenario/bot/shutdown/ManualShutdown.java
+++ b/apitest/src/test/java/haveno/apitest/scenario/bot/shutdown/ManualShutdown.java
@@ -1,17 +1,15 @@
package haveno.apitest.scenario.bot.shutdown;
+import haveno.common.UserThread;
+import lombok.extern.slf4j.Slf4j;
+
import java.io.File;
import java.io.IOException;
-
import java.util.concurrent.atomic.AtomicBoolean;
-import lombok.extern.slf4j.Slf4j;
-
import static haveno.common.file.FileUtil.deleteFileIfExists;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import haveno.common.UserThread;
-
@Slf4j
public class ManualShutdown {
diff --git a/assets/src/main/java/haveno/asset/CryptoNoteUtils.java b/assets/src/main/java/haveno/asset/CryptoNoteUtils.java
index 3b9bcb74..5169f04c 100644
--- a/assets/src/main/java/haveno/asset/CryptoNoteUtils.java
+++ b/assets/src/main/java/haveno/asset/CryptoNoteUtils.java
@@ -19,11 +19,9 @@ package haveno.asset;
import org.bitcoinj.core.Utils;
+import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-
-import java.math.BigInteger;
-
import java.util.Arrays;
import java.util.Map;
diff --git a/assets/src/test/java/haveno/asset/AbstractAssetTest.java b/assets/src/test/java/haveno/asset/AbstractAssetTest.java
index 3e89245e..a5cbf562 100644
--- a/assets/src/test/java/haveno/asset/AbstractAssetTest.java
+++ b/assets/src/test/java/haveno/asset/AbstractAssetTest.java
@@ -22,10 +22,6 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import haveno.asset.AddressValidationResult;
-import haveno.asset.Asset;
-import haveno.asset.AssetRegistry;
-
/**
* Abstract base class for all {@link Asset} unit tests. Subclasses must implement the
* {@link #testValidAddresses()} and {@link #testInvalidAddresses()} methods, and are
diff --git a/assets/src/test/java/haveno/asset/coins/BitcoinCashTest.java b/assets/src/test/java/haveno/asset/coins/BitcoinCashTest.java
index 02013748..90e8f2e2 100644
--- a/assets/src/test/java/haveno/asset/coins/BitcoinCashTest.java
+++ b/assets/src/test/java/haveno/asset/coins/BitcoinCashTest.java
@@ -18,7 +18,6 @@
package haveno.asset.coins;
import haveno.asset.AbstractAssetTest;
-import haveno.asset.coins.BitcoinCash;
import org.junit.Test;
public class BitcoinCashTest extends AbstractAssetTest {
diff --git a/assets/src/test/java/haveno/asset/coins/BitcoinTest.java b/assets/src/test/java/haveno/asset/coins/BitcoinTest.java
index dcff5eed..66264fe3 100644
--- a/assets/src/test/java/haveno/asset/coins/BitcoinTest.java
+++ b/assets/src/test/java/haveno/asset/coins/BitcoinTest.java
@@ -18,7 +18,6 @@
package haveno.asset.coins;
import haveno.asset.AbstractAssetTest;
-import haveno.asset.coins.Bitcoin;
import org.junit.Test;
public class BitcoinTest extends AbstractAssetTest {
diff --git a/assets/src/test/java/haveno/asset/coins/LitecoinTest.java b/assets/src/test/java/haveno/asset/coins/LitecoinTest.java
index 29a7cfd4..908022bf 100644
--- a/assets/src/test/java/haveno/asset/coins/LitecoinTest.java
+++ b/assets/src/test/java/haveno/asset/coins/LitecoinTest.java
@@ -18,7 +18,6 @@
package haveno.asset.coins;
import haveno.asset.AbstractAssetTest;
-import haveno.asset.coins.Litecoin;
import org.junit.Test;
public class LitecoinTest extends AbstractAssetTest {
diff --git a/assets/src/test/java/haveno/asset/coins/MoneroTest.java b/assets/src/test/java/haveno/asset/coins/MoneroTest.java
index ca165644..9af327fa 100644
--- a/assets/src/test/java/haveno/asset/coins/MoneroTest.java
+++ b/assets/src/test/java/haveno/asset/coins/MoneroTest.java
@@ -18,7 +18,6 @@
package haveno.asset.coins;
import haveno.asset.AbstractAssetTest;
-import haveno.asset.coins.Monero;
import org.junit.Test;
public class MoneroTest extends AbstractAssetTest {
diff --git a/build.gradle b/build.gradle
index d68d95e5..1bf1a756 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,6 +27,7 @@ configure(subprojects) {
apply plugin: 'com.google.osdetector'
// Apply the jacoco plugin to add support for test coverage
apply plugin: 'jacoco'
+ apply plugin: 'checkstyle'
sourceCompatibility = JavaVersion.VERSION_11
@@ -95,6 +96,12 @@ configure(subprojects) {
options.encoding = 'UTF-8'
}
+ checkstyle {
+ toolVersion = '10.8.1'
+ // https://raw.githubusercontent.com/checkstyle/checkstyle/checkstyle-10.8.1/src/main/resources/google_checks.xml
+ configFile = rootProject.file("${rootDir}/config/checkstyle.xml")
+ }
+
jacocoTestReport {
reports {
xml.enabled true
@@ -105,7 +112,6 @@ configure(subprojects) {
test.finalizedBy jacocoTestReport
}
-
configure([project(':cli'),
project(':daemon'),
project(':desktop'),
diff --git a/cli/src/main/java/haveno/cli/CliMain.java b/cli/src/main/java/haveno/cli/CliMain.java
index fe373bd9..6063227b 100644
--- a/cli/src/main/java/haveno/cli/CliMain.java
+++ b/cli/src/main/java/haveno/cli/CliMain.java
@@ -17,8 +17,6 @@
package haveno.cli;
-import haveno.proto.grpc.OfferInfo;
-import haveno.proto.grpc.TradeInfo;
import haveno.cli.opts.ArgumentList;
import haveno.cli.opts.CancelOfferOptionParser;
import haveno.cli.opts.CreateCryptoCurrencyPaymentAcctOptionParser;
@@ -31,45 +29,87 @@ import haveno.cli.opts.GetOffersOptionParser;
import haveno.cli.opts.GetPaymentAcctFormOptionParser;
import haveno.cli.opts.GetTradeOptionParser;
import haveno.cli.opts.GetTradesOptionParser;
-import haveno.cli.opts.GetTransactionOptionParser;
import haveno.cli.opts.OfferIdOptionParser;
import haveno.cli.opts.RegisterDisputeAgentOptionParser;
import haveno.cli.opts.RemoveWalletPasswordOptionParser;
import haveno.cli.opts.SendBtcOptionParser;
-import haveno.cli.opts.SetTxFeeRateOptionParser;
import haveno.cli.opts.SetWalletPasswordOptionParser;
import haveno.cli.opts.SimpleMethodOptionParser;
import haveno.cli.opts.TakeOfferOptionParser;
import haveno.cli.opts.UnlockWalletOptionParser;
import haveno.cli.opts.WithdrawFundsOptionParser;
import haveno.cli.table.builder.TableBuilder;
+import haveno.proto.grpc.OfferInfo;
import io.grpc.StatusRuntimeException;
-
import joptsimple.OptionParser;
import joptsimple.OptionSet;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import lombok.extern.slf4j.Slf4j;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.PrintStream;
import java.io.PrintWriter;
-
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.Date;
import java.util.List;
-import lombok.extern.slf4j.Slf4j;
-
-import static haveno.proto.grpc.GetTradesRequest.Category.CLOSED;
-import static haveno.proto.grpc.GetTradesRequest.Category.OPEN;
import static haveno.cli.CurrencyFormat.formatInternalFiatPrice;
import static haveno.cli.CurrencyFormat.toSatoshis;
-import static haveno.cli.Method.*;
-import static haveno.cli.opts.OptLabel.*;
-import static haveno.cli.table.builder.TableType.*;
+import static haveno.cli.Method.canceloffer;
+import static haveno.cli.Method.closetrade;
+import static haveno.cli.Method.confirmpaymentreceived;
+import static haveno.cli.Method.confirmpaymentsent;
+import static haveno.cli.Method.createcryptopaymentacct;
+import static haveno.cli.Method.createoffer;
+import static haveno.cli.Method.createpaymentacct;
+import static haveno.cli.Method.editoffer;
+import static haveno.cli.Method.failtrade;
+import static haveno.cli.Method.getaddressbalance;
+import static haveno.cli.Method.getbalance;
+import static haveno.cli.Method.getbtcprice;
+import static haveno.cli.Method.getfundingaddresses;
+import static haveno.cli.Method.getmyoffer;
+import static haveno.cli.Method.getmyoffers;
+import static haveno.cli.Method.getoffer;
+import static haveno.cli.Method.getoffers;
+import static haveno.cli.Method.getpaymentacctform;
+import static haveno.cli.Method.getpaymentaccts;
+import static haveno.cli.Method.getpaymentmethods;
+import static haveno.cli.Method.gettrade;
+import static haveno.cli.Method.gettrades;
+import static haveno.cli.Method.gettransaction;
+import static haveno.cli.Method.gettxfeerate;
+import static haveno.cli.Method.getunusedbsqaddress;
+import static haveno.cli.Method.getversion;
+import static haveno.cli.Method.lockwallet;
+import static haveno.cli.Method.sendbtc;
+import static haveno.cli.Method.settxfeerate;
+import static haveno.cli.Method.setwalletpassword;
+import static haveno.cli.Method.stop;
+import static haveno.cli.Method.takeoffer;
+import static haveno.cli.Method.unfailtrade;
+import static haveno.cli.Method.unlockwallet;
+import static haveno.cli.Method.unsettxfeerate;
+import static haveno.cli.Method.withdrawfunds;
+import static haveno.cli.opts.OptLabel.OPT_AMOUNT;
+import static haveno.cli.opts.OptLabel.OPT_HELP;
+import static haveno.cli.opts.OptLabel.OPT_HOST;
+import static haveno.cli.opts.OptLabel.OPT_PASSWORD;
+import static haveno.cli.opts.OptLabel.OPT_PORT;
+import static haveno.cli.opts.OptLabel.OPT_TX_FEE_RATE;
+import static haveno.cli.table.builder.TableType.ADDRESS_BALANCE_TBL;
+import static haveno.cli.table.builder.TableType.BTC_BALANCE_TBL;
+import static haveno.cli.table.builder.TableType.CLOSED_TRADES_TBL;
+import static haveno.cli.table.builder.TableType.FAILED_TRADES_TBL;
+import static haveno.cli.table.builder.TableType.OFFER_TBL;
+import static haveno.cli.table.builder.TableType.OPEN_TRADES_TBL;
+import static haveno.cli.table.builder.TableType.PAYMENT_ACCOUNT_TBL;
+import static haveno.cli.table.builder.TableType.TRADE_DETAIL_TBL;
+import static haveno.proto.grpc.GetTradesRequest.Category.CLOSED;
+import static haveno.proto.grpc.GetTradesRequest.Category.OPEN;
import static java.lang.String.format;
import static java.lang.System.err;
import static java.lang.System.exit;
diff --git a/cli/src/main/java/haveno/cli/CurrencyFormat.java b/cli/src/main/java/haveno/cli/CurrencyFormat.java
index b5a9e2d2..4686dee1 100644
--- a/cli/src/main/java/haveno/cli/CurrencyFormat.java
+++ b/cli/src/main/java/haveno/cli/CurrencyFormat.java
@@ -19,12 +19,10 @@ package haveno.cli;
import com.google.common.annotations.VisibleForTesting;
+import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
-
-import java.math.BigDecimal;
-
import java.util.Locale;
import static java.lang.String.format;
diff --git a/cli/src/main/java/haveno/cli/GrpcClient.java b/cli/src/main/java/haveno/cli/GrpcClient.java
index ec59b4a6..f08a16df 100644
--- a/cli/src/main/java/haveno/cli/GrpcClient.java
+++ b/cli/src/main/java/haveno/cli/GrpcClient.java
@@ -17,6 +17,10 @@
package haveno.cli;
+import haveno.cli.request.OffersServiceRequest;
+import haveno.cli.request.PaymentAccountsServiceRequest;
+import haveno.cli.request.TradesServiceRequest;
+import haveno.cli.request.WalletsServiceRequest;
import haveno.proto.grpc.AddressBalanceInfo;
import haveno.proto.grpc.BalancesInfo;
import haveno.proto.grpc.BtcBalanceInfo;
@@ -27,18 +31,12 @@ import haveno.proto.grpc.OfferInfo;
import haveno.proto.grpc.RegisterDisputeAgentRequest;
import haveno.proto.grpc.StopRequest;
import haveno.proto.grpc.TradeInfo;
-import haveno.cli.request.OffersServiceRequest;
-import haveno.cli.request.PaymentAccountsServiceRequest;
-import haveno.cli.request.TradesServiceRequest;
-import haveno.cli.request.WalletsServiceRequest;
+import lombok.extern.slf4j.Slf4j;
import protobuf.PaymentAccount;
-import protobuf.PaymentAccountForm;
import protobuf.PaymentMethod;
import java.util.List;
-import lombok.extern.slf4j.Slf4j;
-
@SuppressWarnings("ResultOfMethodCallIgnored")
@Slf4j
diff --git a/cli/src/main/java/haveno/cli/GrpcStubs.java b/cli/src/main/java/haveno/cli/GrpcStubs.java
index 27e2f262..677372d8 100644
--- a/cli/src/main/java/haveno/cli/GrpcStubs.java
+++ b/cli/src/main/java/haveno/cli/GrpcStubs.java
@@ -26,7 +26,6 @@ import haveno.proto.grpc.PriceGrpc;
import haveno.proto.grpc.ShutdownServerGrpc;
import haveno.proto.grpc.TradesGrpc;
import haveno.proto.grpc.WalletsGrpc;
-
import io.grpc.CallCredentials;
import io.grpc.ManagedChannelBuilder;
diff --git a/cli/src/main/java/haveno/cli/opts/AbstractMethodOptionParser.java b/cli/src/main/java/haveno/cli/opts/AbstractMethodOptionParser.java
index abfa821e..d9c37297 100644
--- a/cli/src/main/java/haveno/cli/opts/AbstractMethodOptionParser.java
+++ b/cli/src/main/java/haveno/cli/opts/AbstractMethodOptionParser.java
@@ -21,13 +21,12 @@ import joptsimple.OptionException;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import joptsimple.OptionSpec;
+import lombok.Getter;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
-import lombok.Getter;
-
import static haveno.cli.opts.OptLabel.OPT_HELP;
import static java.lang.String.format;
diff --git a/cli/src/main/java/haveno/cli/opts/CreateOfferOptionParser.java b/cli/src/main/java/haveno/cli/opts/CreateOfferOptionParser.java
index 0b495db4..204e04c3 100644
--- a/cli/src/main/java/haveno/cli/opts/CreateOfferOptionParser.java
+++ b/cli/src/main/java/haveno/cli/opts/CreateOfferOptionParser.java
@@ -20,7 +20,14 @@ package haveno.cli.opts;
import joptsimple.OptionSpec;
-import static haveno.cli.opts.OptLabel.*;
+import static haveno.cli.opts.OptLabel.OPT_AMOUNT;
+import static haveno.cli.opts.OptLabel.OPT_CURRENCY_CODE;
+import static haveno.cli.opts.OptLabel.OPT_DIRECTION;
+import static haveno.cli.opts.OptLabel.OPT_FIXED_PRICE;
+import static haveno.cli.opts.OptLabel.OPT_MIN_AMOUNT;
+import static haveno.cli.opts.OptLabel.OPT_MKT_PRICE_MARGIN;
+import static haveno.cli.opts.OptLabel.OPT_PAYMENT_ACCOUNT_ID;
+import static haveno.cli.opts.OptLabel.OPT_SECURITY_DEPOSIT;
import static joptsimple.internal.Strings.EMPTY;
public class CreateOfferOptionParser extends AbstractMethodOptionParser implements MethodOpts {
diff --git a/cli/src/main/java/haveno/cli/opts/GetAddressBalanceOptionParser.java b/cli/src/main/java/haveno/cli/opts/GetAddressBalanceOptionParser.java
index 829e9042..c316b9a1 100644
--- a/cli/src/main/java/haveno/cli/opts/GetAddressBalanceOptionParser.java
+++ b/cli/src/main/java/haveno/cli/opts/GetAddressBalanceOptionParser.java
@@ -18,10 +18,10 @@
package haveno.cli.opts;
-import static haveno.cli.opts.OptLabel.OPT_ADDRESS;
-
import joptsimple.OptionSpec;
+import static haveno.cli.opts.OptLabel.OPT_ADDRESS;
+
public class GetAddressBalanceOptionParser extends AbstractMethodOptionParser implements MethodOpts {
final OptionSpec Supports peer discovery through DNS over Socks5 proxy with RESOLVE DNS extension.
diff --git a/p2p/src/main/java/haveno/network/Socks5MultiDiscovery.java b/p2p/src/main/java/haveno/network/Socks5MultiDiscovery.java
index 3561950e..e25911ea 100644
--- a/p2p/src/main/java/haveno/network/Socks5MultiDiscovery.java
+++ b/p2p/src/main/java/haveno/network/Socks5MultiDiscovery.java
@@ -17,22 +17,19 @@
package haveno.network;
+import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
+import lombok.extern.slf4j.Slf4j;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.net.discovery.PeerDiscovery;
import org.bitcoinj.net.discovery.PeerDiscoveryException;
import org.bitcoinj.net.discovery.SeedPeers;
import org.bitcoinj.params.MainNetParams;
-import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
-
import java.net.InetSocketAddress;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
-import lombok.extern.slf4j.Slf4j;
-
/**
* This class implements various types of discovery over Socks5,
* which can be enabled/disabled via constructor flag.
diff --git a/p2p/src/main/java/haveno/network/Socks5ProxyProvider.java b/p2p/src/main/java/haveno/network/Socks5ProxyProvider.java
index 37a64c27..8029e501 100644
--- a/p2p/src/main/java/haveno/network/Socks5ProxyProvider.java
+++ b/p2p/src/main/java/haveno/network/Socks5ProxyProvider.java
@@ -17,19 +17,16 @@
package haveno.network;
+import com.google.inject.Inject;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import haveno.common.config.Config;
import haveno.network.p2p.network.NetworkNode;
-import com.google.inject.Inject;
-
-import javax.inject.Named;
-
-import java.net.UnknownHostException;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Nullable;
+import javax.inject.Named;
+import java.net.UnknownHostException;
/**
* Provides Socks5Proxies for the bitcoin network and http requests
diff --git a/p2p/src/main/java/haveno/network/Socks5SeedOnionDiscovery.java b/p2p/src/main/java/haveno/network/Socks5SeedOnionDiscovery.java
index 50bff405..0f677cf9 100644
--- a/p2p/src/main/java/haveno/network/Socks5SeedOnionDiscovery.java
+++ b/p2p/src/main/java/haveno/network/Socks5SeedOnionDiscovery.java
@@ -17,14 +17,12 @@
package haveno.network;
+import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.net.discovery.PeerDiscovery;
import org.bitcoinj.net.discovery.PeerDiscoveryException;
-import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
-
import java.net.InetSocketAddress;
-
import java.util.concurrent.TimeUnit;
/**
diff --git a/p2p/src/main/java/haveno/network/crypto/DecryptedDataTuple.java b/p2p/src/main/java/haveno/network/crypto/DecryptedDataTuple.java
index 4c097a68..2a72afb9 100644
--- a/p2p/src/main/java/haveno/network/crypto/DecryptedDataTuple.java
+++ b/p2p/src/main/java/haveno/network/crypto/DecryptedDataTuple.java
@@ -18,11 +18,11 @@
package haveno.network.crypto;
import haveno.common.proto.network.NetworkEnvelope;
-import java.security.PublicKey;
-
import lombok.EqualsAndHashCode;
import lombok.Value;
+import java.security.PublicKey;
+
@EqualsAndHashCode
@Value
public final class DecryptedDataTuple {
diff --git a/p2p/src/main/java/haveno/network/crypto/EncryptionService.java b/p2p/src/main/java/haveno/network/crypto/EncryptionService.java
index 1b5c6f3a..b0e6fa7b 100644
--- a/p2p/src/main/java/haveno/network/crypto/EncryptionService.java
+++ b/p2p/src/main/java/haveno/network/crypto/EncryptionService.java
@@ -17,8 +17,6 @@
package haveno.network.crypto;
-import static haveno.common.crypto.Encryption.decryptSecretKey;
-
import com.google.protobuf.InvalidProtocolBufferException;
import haveno.common.crypto.CryptoException;
import haveno.common.crypto.Encryption;
@@ -31,15 +29,15 @@ import haveno.common.proto.ProtobufferException;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.network.p2p.DecryptedMessageWithPubKey;
-import javax.inject.Inject;
+import lombok.extern.slf4j.Slf4j;
import javax.crypto.SecretKey;
-
+import javax.inject.Inject;
import java.security.KeyPair;
import java.security.PrivateKey;
import java.security.PublicKey;
-import lombok.extern.slf4j.Slf4j;
+import static haveno.common.crypto.Encryption.decryptSecretKey;
@Slf4j
public class EncryptionService {
diff --git a/p2p/src/main/java/haveno/network/http/HttpClient.java b/p2p/src/main/java/haveno/network/http/HttpClient.java
index 1e0e6d3a..7027ddae 100644
--- a/p2p/src/main/java/haveno/network/http/HttpClient.java
+++ b/p2p/src/main/java/haveno/network/http/HttpClient.java
@@ -17,9 +17,8 @@
package haveno.network.http;
-import java.io.IOException;
-
import javax.annotation.Nullable;
+import java.io.IOException;
public interface HttpClient {
void setBaseUrl(String baseUrl);
diff --git a/p2p/src/main/java/haveno/network/http/HttpClientImpl.java b/p2p/src/main/java/haveno/network/http/HttpClientImpl.java
index c574b5ff..17185d60 100644
--- a/p2p/src/main/java/haveno/network/http/HttpClientImpl.java
+++ b/p2p/src/main/java/haveno/network/http/HttpClientImpl.java
@@ -17,6 +17,13 @@
package haveno.network.http;
+import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
+import haveno.common.app.Version;
+import haveno.common.util.Utilities;
+import haveno.network.Socks5ProxyProvider;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
@@ -32,33 +39,20 @@ import org.apache.http.impl.client.HttpClients;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.ssl.SSLContexts;
-import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
-import haveno.common.app.Version;
-import haveno.common.util.Utilities;
-import haveno.network.Socks5ProxyProvider;
+import javax.annotation.Nullable;
import javax.inject.Inject;
-
-import java.net.HttpURLConnection;
-import java.net.InetSocketAddress;
-import java.net.URL;
-
-import java.nio.charset.StandardCharsets;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
-
+import java.net.HttpURLConnection;
+import java.net.InetSocketAddress;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-
-import javax.annotation.Nullable;
-
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/p2p/src/main/java/haveno/network/http/SocksConnectionSocketFactory.java b/p2p/src/main/java/haveno/network/http/SocksConnectionSocketFactory.java
index 9a2c4b3a..a7f090e6 100644
--- a/p2p/src/main/java/haveno/network/http/SocksConnectionSocketFactory.java
+++ b/p2p/src/main/java/haveno/network/http/SocksConnectionSocketFactory.java
@@ -21,12 +21,11 @@ import org.apache.http.HttpHost;
import org.apache.http.conn.socket.PlainConnectionSocketFactory;
import org.apache.http.protocol.HttpContext;
+import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Proxy;
import java.net.Socket;
-import java.io.IOException;
-
// This class is adapted from
// http://stackoverflow.com/a/25203021/5616248
//
diff --git a/p2p/src/main/java/haveno/network/http/SocksSSLConnectionSocketFactory.java b/p2p/src/main/java/haveno/network/http/SocksSSLConnectionSocketFactory.java
index 1796cd78..a43b4c47 100644
--- a/p2p/src/main/java/haveno/network/http/SocksSSLConnectionSocketFactory.java
+++ b/p2p/src/main/java/haveno/network/http/SocksSSLConnectionSocketFactory.java
@@ -22,13 +22,11 @@ import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.protocol.HttpContext;
import javax.net.ssl.SSLContext;
-
+import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Proxy;
import java.net.Socket;
-import java.io.IOException;
-
// This class is adapted from
// http://stackoverflow.com/a/25203021/5616248
//
diff --git a/p2p/src/main/java/haveno/network/p2p/AckMessage.java b/p2p/src/main/java/haveno/network/p2p/AckMessage.java
index db3e9f04..48a1cf69 100644
--- a/p2p/src/main/java/haveno/network/p2p/AckMessage.java
+++ b/p2p/src/main/java/haveno/network/p2p/AckMessage.java
@@ -23,15 +23,14 @@ import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.proto.persistable.PersistablePayload;
import haveno.network.p2p.mailbox.MailboxMessage;
import haveno.network.p2p.storage.payload.ExpirablePayload;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
import lombok.EqualsAndHashCode;
import lombok.Value;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
// TODO ExpirablePayload has no effect here as it is either a direct msg or packed into MailboxStoragePayload
// We could extend the TTL by setting the TTL in MailboxStoragePayload from the type of msg which gets into the
diff --git a/p2p/src/main/java/haveno/network/p2p/BundleOfEnvelopes.java b/p2p/src/main/java/haveno/network/p2p/BundleOfEnvelopes.java
index 7d92f74d..573699db 100644
--- a/p2p/src/main/java/haveno/network/p2p/BundleOfEnvelopes.java
+++ b/p2p/src/main/java/haveno/network/p2p/BundleOfEnvelopes.java
@@ -25,14 +25,14 @@ import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.network.p2p.storage.messages.BroadcastMessage;
import haveno.network.p2p.storage.payload.CapabilityRequiringPayload;
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
-import lombok.EqualsAndHashCode;
-import lombok.Value;
-
@EqualsAndHashCode(callSuper = true)
@Value
public final class BundleOfEnvelopes extends BroadcastMessage implements ExtendedDataSizePermission, CapabilityRequiringPayload {
diff --git a/p2p/src/main/java/haveno/network/p2p/DecryptedMessageWithPubKey.java b/p2p/src/main/java/haveno/network/p2p/DecryptedMessageWithPubKey.java
index fb2bec76..91675e4a 100644
--- a/p2p/src/main/java/haveno/network/p2p/DecryptedMessageWithPubKey.java
+++ b/p2p/src/main/java/haveno/network/p2p/DecryptedMessageWithPubKey.java
@@ -23,10 +23,10 @@ import haveno.common.proto.ProtobufferException;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.common.proto.persistable.PersistablePayload;
-import java.security.PublicKey;
-
import lombok.Value;
+import java.security.PublicKey;
+
@Value
public final class DecryptedMessageWithPubKey implements PersistablePayload {
private final NetworkEnvelope networkEnvelope;
diff --git a/p2p/src/main/java/haveno/network/p2p/NetworkNodeProvider.java b/p2p/src/main/java/haveno/network/p2p/NetworkNodeProvider.java
index 339b86b6..e3a1297e 100644
--- a/p2p/src/main/java/haveno/network/p2p/NetworkNodeProvider.java
+++ b/p2p/src/main/java/haveno/network/p2p/NetworkNodeProvider.java
@@ -27,14 +27,13 @@ import haveno.network.p2p.network.NewTor;
import haveno.network.p2p.network.RunningTor;
import haveno.network.p2p.network.TorMode;
import haveno.network.p2p.network.TorNetworkNode;
+
+import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
-
import java.io.File;
-import javax.annotation.Nullable;
-
public class NetworkNodeProvider implements Provider
diff --git a/p2p/src/main/java/haveno/network/utils/CapabilityUtils.java b/p2p/src/main/java/haveno/network/utils/CapabilityUtils.java
index ecff42c9..f6c3369c 100644
--- a/p2p/src/main/java/haveno/network/utils/CapabilityUtils.java
+++ b/p2p/src/main/java/haveno/network/utils/CapabilityUtils.java
@@ -22,10 +22,10 @@ import haveno.common.proto.network.NetworkEnvelope;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.peers.PeerManager;
import haveno.network.p2p.storage.payload.CapabilityRequiringPayload;
-import java.util.Optional;
-
import lombok.extern.slf4j.Slf4j;
+import java.util.Optional;
+
@Slf4j
public class CapabilityUtils {
public static boolean capabilityRequiredAndCapabilityNotSupported(NodeAddress peersNodeAddress,
diff --git a/p2p/src/main/java/haveno/network/utils/Utils.java b/p2p/src/main/java/haveno/network/utils/Utils.java
index dc0c17c5..b99bce0a 100644
--- a/p2p/src/main/java/haveno/network/utils/Utils.java
+++ b/p2p/src/main/java/haveno/network/utils/Utils.java
@@ -17,10 +17,8 @@
package haveno.network.utils;
-import java.net.ServerSocket;
-
import java.io.IOException;
-
+import java.net.ServerSocket;
import java.util.Random;
public class Utils {
diff --git a/p2p/src/test/java/haveno/network/crypto/EncryptionServiceTests.java b/p2p/src/test/java/haveno/network/crypto/EncryptionServiceTests.java
index 0abda3fe..d11ccfd5 100644
--- a/p2p/src/test/java/haveno/network/crypto/EncryptionServiceTests.java
+++ b/p2p/src/test/java/haveno/network/crypto/EncryptionServiceTests.java
@@ -17,24 +17,23 @@
package haveno.network.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 haveno.common.proto.network.NetworkEnvelope;
-import java.io.File;
-import java.io.IOException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.rules.ExpectedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
public class EncryptionServiceTests {
private static final Logger log = LoggerFactory.getLogger(EncryptionServiceTests.class);
diff --git a/p2p/src/test/java/haveno/network/p2p/DummySeedNode.java b/p2p/src/test/java/haveno/network/p2p/DummySeedNode.java
index 2c9c2253..3b575eec 100644
--- a/p2p/src/test/java/haveno/network/p2p/DummySeedNode.java
+++ b/p2p/src/test/java/haveno/network/p2p/DummySeedNode.java
@@ -17,32 +17,25 @@
package haveno.network.p2p;
+import ch.qos.logback.classic.Level;
import com.google.common.annotations.VisibleForTesting;
import haveno.common.UserThread;
import haveno.common.app.Log;
import haveno.common.app.Version;
import haveno.common.config.Config;
import haveno.common.util.Utilities;
-import haveno.network.p2p.NodeAddress;
-import haveno.network.p2p.P2PService;
-import haveno.network.p2p.P2PServiceListener;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
-
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import ch.qos.logback.classic.Level;
-
-import org.jetbrains.annotations.Nullable;
-
import static com.google.common.base.Preconditions.checkArgument;
// Previously used seednode class, replaced now by bootstrap module. We keep it here as it was used in tests...
diff --git a/p2p/src/test/java/haveno/network/p2p/MockNode.java b/p2p/src/test/java/haveno/network/p2p/MockNode.java
index 41d6d790..5d7fda70 100644
--- a/p2p/src/test/java/haveno/network/p2p/MockNode.java
+++ b/p2p/src/test/java/haveno/network/p2p/MockNode.java
@@ -19,7 +19,6 @@ package haveno.network.p2p;
import haveno.common.ClockWatcher;
import haveno.common.crypto.KeyRing;
-import haveno.common.crypto.KeyStorage;
import haveno.common.file.CorruptedStorageFileHandler;
import haveno.common.persistence.PersistenceManager;
import haveno.common.proto.persistable.PersistenceProtoResolver;
@@ -34,16 +33,14 @@ import haveno.network.p2p.network.Statistic;
import haveno.network.p2p.peers.PeerManager;
import haveno.network.p2p.peers.peerexchange.PeerList;
import haveno.network.p2p.seed.SeedNodeRepository;
-import java.nio.file.Files;
+import lombok.Getter;
import java.io.File;
import java.io.IOException;
-
+import java.nio.file.Files;
import java.util.HashSet;
import java.util.Set;
-import lombok.Getter;
-
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/p2p/src/test/java/haveno/network/p2p/PeerServiceTest.java b/p2p/src/test/java/haveno/network/p2p/PeerServiceTest.java
index 5d6736c5..c1010956 100644
--- a/p2p/src/test/java/haveno/network/p2p/PeerServiceTest.java
+++ b/p2p/src/test/java/haveno/network/p2p/PeerServiceTest.java
@@ -17,24 +17,20 @@
package haveno.network.p2p;
-import haveno.network.p2p.NodeAddress;
-import haveno.network.p2p.P2PService;
-import haveno.network.p2p.P2PServiceListener;
import haveno.network.p2p.network.LocalhostNetworkNode;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
// TorNode created. Took 6 sec.
// Hidden service created. Took 40-50 sec.
// Connection establishment takes about 4 sec.
diff --git a/p2p/src/test/java/haveno/network/p2p/TestUtils.java b/p2p/src/test/java/haveno/network/p2p/TestUtils.java
index 03b17876..41f30ddf 100644
--- a/p2p/src/test/java/haveno/network/p2p/TestUtils.java
+++ b/p2p/src/test/java/haveno/network/p2p/TestUtils.java
@@ -22,20 +22,16 @@ import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.proto.network.NetworkPayload;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.common.proto.persistable.PersistablePayload;
-import haveno.network.p2p.NodeAddress;
-import haveno.network.p2p.P2PServiceListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.NoSuchAlgorithmException;
-
import java.time.Clock;
-
import java.util.Set;
import java.util.concurrent.CountDownLatch;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
@SuppressWarnings("ALL")
public class TestUtils {
private static final Logger log = LoggerFactory.getLogger(TestUtils.class);
diff --git a/p2p/src/test/java/haveno/network/p2p/mocks/MockMailboxPayload.java b/p2p/src/test/java/haveno/network/p2p/mocks/MockMailboxPayload.java
index dc74a5f4..afda8b64 100644
--- a/p2p/src/test/java/haveno/network/p2p/mocks/MockMailboxPayload.java
+++ b/p2p/src/test/java/haveno/network/p2p/mocks/MockMailboxPayload.java
@@ -22,12 +22,11 @@ import haveno.common.proto.network.NetworkEnvelope;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.mailbox.MailboxMessage;
import haveno.network.p2p.storage.payload.ExpirablePayload;
+import lombok.Getter;
import org.apache.commons.lang3.NotImplementedException;
import java.util.UUID;
-import lombok.Getter;
-
@Getter
public final class MockMailboxPayload extends NetworkEnvelope implements MailboxMessage, ExpirablePayload {
private final String messageVersion = Version.getP2PMessageVersion();
diff --git a/p2p/src/test/java/haveno/network/p2p/network/LocalhostNetworkNodeTest.java b/p2p/src/test/java/haveno/network/p2p/network/LocalhostNetworkNodeTest.java
index 768e58b5..6320f67b 100644
--- a/p2p/src/test/java/haveno/network/p2p/network/LocalhostNetworkNodeTest.java
+++ b/p2p/src/test/java/haveno/network/p2p/network/LocalhostNetworkNodeTest.java
@@ -18,17 +18,13 @@
package haveno.network.p2p.network;
import haveno.network.p2p.TestUtils;
-import haveno.network.p2p.network.LocalhostNetworkNode;
-import haveno.network.p2p.network.SetupListener;
-import java.io.IOException;
-
-import java.util.concurrent.CountDownLatch;
-
+import org.junit.Ignore;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.junit.Ignore;
-import org.junit.Test;
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
// TorNode created. Took 6 sec.
// Hidden service created. Took 40-50 sec.
diff --git a/p2p/src/test/java/haveno/network/p2p/network/TorNetworkNodeTest.java b/p2p/src/test/java/haveno/network/p2p/network/TorNetworkNodeTest.java
index 748cb5ce..d027a4dc 100644
--- a/p2p/src/test/java/haveno/network/p2p/network/TorNetworkNodeTest.java
+++ b/p2p/src/test/java/haveno/network/p2p/network/TorNetworkNodeTest.java
@@ -23,23 +23,16 @@ import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import haveno.network.p2p.TestUtils;
import haveno.network.p2p.mocks.MockPayload;
-import haveno.network.p2p.network.Connection;
-import haveno.network.p2p.network.NewTor;
-import haveno.network.p2p.network.SetupListener;
-import haveno.network.p2p.network.TorNetworkNode;
-import java.io.File;
-import java.io.IOException;
-
-import java.util.ArrayList;
-import java.util.concurrent.CountDownLatch;
-
+import org.jetbrains.annotations.NotNull;
+import org.junit.Ignore;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.jetbrains.annotations.NotNull;
-
-import org.junit.Ignore;
-import org.junit.Test;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.concurrent.CountDownLatch;
// TorNode created. Took 6 sec.
// Hidden service created. Took 40-50 sec.
diff --git a/p2p/src/test/java/haveno/network/p2p/peers/PeerManagerTest.java b/p2p/src/test/java/haveno/network/p2p/peers/PeerManagerTest.java
index e4f7e442..f9bf2ee1 100644
--- a/p2p/src/test/java/haveno/network/p2p/peers/PeerManagerTest.java
+++ b/p2p/src/test/java/haveno/network/p2p/peers/PeerManagerTest.java
@@ -22,17 +22,16 @@ import haveno.network.p2p.network.CloseConnectionReason;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.InboundConnection;
import haveno.network.p2p.network.PeerType;
-import java.io.IOException;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import java.io.IOException;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageBuildGetDataResponseTest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageBuildGetDataResponseTest.java
index 18b583ac..65f4ee17 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageBuildGetDataResponseTest.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageBuildGetDataResponseTest.java
@@ -28,27 +28,24 @@ import haveno.network.p2p.peers.getdata.messages.GetDataRequest;
import haveno.network.p2p.peers.getdata.messages.GetDataResponse;
import haveno.network.p2p.peers.getdata.messages.GetUpdatedDataRequest;
import haveno.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest;
-import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.mocks.PersistableNetworkPayloadStub;
import haveno.network.p2p.storage.payload.CapabilityRequiringPayload;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
import java.security.KeyPair;
import java.security.NoSuchAlgorithmException;
-
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageClientAPITest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageClientAPITest.java
index 0b8de4b7..b7c3bd82 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageClientAPITest.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageClientAPITest.java
@@ -28,16 +28,15 @@ import haveno.network.p2p.storage.payload.MailboxStoragePayload;
import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-
-import java.util.Optional;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import static haveno.network.p2p.storage.TestState.*;
+import java.security.KeyPair;
+import java.security.NoSuchAlgorithmException;
+import java.util.Optional;
+
+import static haveno.network.p2p.storage.TestState.SavedTestState;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageGetDataIntegrationTest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageGetDataIntegrationTest.java
index 1a087ab7..e3445f20 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageGetDataIntegrationTest.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageGetDataIntegrationTest.java
@@ -21,20 +21,18 @@ import haveno.common.app.Capabilities;
import haveno.network.p2p.TestUtils;
import haveno.network.p2p.peers.getdata.messages.GetDataRequest;
import haveno.network.p2p.peers.getdata.messages.GetDataResponse;
-import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.mocks.PersistableExpirableProtectedStoragePayloadStub;
import haveno.network.p2p.storage.mocks.ProtectedStoragePayloadStub;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
+import org.junit.Assert;
+import org.junit.Test;
+
import java.security.KeyPair;
import java.security.NoSuchAlgorithmException;
import java.security.PublicKey;
-
import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Assert;
-import org.junit.Test;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageOnMessageHandlerTest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageOnMessageHandlerTest.java
index 7e41506b..b55ad157 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageOnMessageHandlerTest.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageOnMessageHandlerTest.java
@@ -25,11 +25,11 @@ import haveno.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage;
import haveno.network.p2p.storage.messages.BroadcastMessage;
import haveno.network.p2p.storage.mocks.PersistableNetworkPayloadStub;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
-import java.util.Optional;
-
import org.junit.Before;
import org.junit.Test;
+import java.util.Optional;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStoragePersistableNetworkPayloadTest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStoragePersistableNetworkPayloadTest.java
index b0758e46..e40f8caa 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStoragePersistableNetworkPayloadTest.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStoragePersistableNetworkPayloadTest.java
@@ -22,18 +22,18 @@ import haveno.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage;
import haveno.network.p2p.storage.mocks.DateTolerantPayloadStub;
import haveno.network.p2p.storage.mocks.PersistableNetworkPayloadStub;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import static haveno.network.p2p.storage.TestState.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+import static haveno.network.p2p.storage.TestState.SavedTestState;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageProcessGetDataResponse.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageProcessGetDataResponse.java
index e4f1d6e6..1758e6ea 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageProcessGetDataResponse.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageProcessGetDataResponse.java
@@ -26,22 +26,20 @@ import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.MockitoAnnotations;
+
import java.security.KeyPair;
import java.security.NoSuchAlgorithmException;
-
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.mockito.MockitoAnnotations;
-
public class P2PDataStorageProcessGetDataResponse {
private TestState testState;
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageProtectedStorageEntryTest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageProtectedStorageEntryTest.java
index 0f4d4074..0bc2c5b9 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageProtectedStorageEntryTest.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageProtectedStorageEntryTest.java
@@ -22,7 +22,6 @@ import haveno.common.crypto.CryptoException;
import haveno.common.crypto.Sig;
import haveno.network.p2p.TestUtils;
import haveno.network.p2p.network.Connection;
-import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.messages.AddDataMessage;
import haveno.network.p2p.storage.messages.RefreshOfferMessage;
import haveno.network.p2p.storage.messages.RemoveDataMessage;
@@ -32,15 +31,6 @@ import haveno.network.p2p.storage.mocks.ProtectedStoragePayloadStub;
import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
@@ -48,6 +38,14 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import java.security.KeyPair;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
import static haveno.network.p2p.storage.TestState.SavedTestState;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageRemoveExpiredTest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageRemoveExpiredTest.java
index c4076459..d743bc22 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageRemoveExpiredTest.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageRemoveExpiredTest.java
@@ -17,12 +17,9 @@
package haveno.network.p2p.storage;
-import static haveno.network.p2p.storage.TestState.*;
-
import haveno.common.app.Version;
import haveno.common.crypto.CryptoException;
import haveno.network.p2p.TestUtils;
-import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.mocks.ExpirableProtectedStoragePayloadStub;
import haveno.network.p2p.storage.mocks.PersistableExpirableProtectedStoragePayloadStub;
import haveno.network.p2p.storage.mocks.PersistableNetworkPayloadStub;
@@ -30,16 +27,19 @@ import haveno.network.p2p.storage.mocks.ProtectedStoragePayloadStub;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-
-import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import java.security.KeyPair;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
+
+import static haveno.network.p2p.storage.TestState.MAX_SEQUENCE_NUMBER_MAP_SIZE_BEFORE_PURGE;
+import static haveno.network.p2p.storage.TestState.SavedTestState;
+import static haveno.network.p2p.storage.TestState.getTestNodeAddress;
+
/**
* Tests of the P2PDataStore behavior that expires old Entrys periodically.
*/
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageRequestDataTest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageRequestDataTest.java
index 64d08bd1..c027221a 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageRequestDataTest.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageRequestDataTest.java
@@ -23,22 +23,19 @@ import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.TestUtils;
import haveno.network.p2p.peers.getdata.messages.GetUpdatedDataRequest;
import haveno.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest;
-import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.mocks.PersistableNetworkPayloadStub;
import haveno.network.p2p.storage.mocks.ProtectedStoragePayloadStub;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-
-import java.util.Set;
-
-import org.mockito.MockitoAnnotations;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.MockitoAnnotations;
+
+import java.security.KeyPair;
+import java.security.NoSuchAlgorithmException;
+import java.util.Set;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStoreDisconnectTest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStoreDisconnectTest.java
index c643152f..b6a5db3c 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStoreDisconnectTest.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStoreDisconnectTest.java
@@ -25,17 +25,17 @@ import haveno.network.p2p.network.Connection;
import haveno.network.p2p.storage.mocks.ExpirableProtectedStoragePayloadStub;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import static haveno.network.p2p.storage.TestState.*;
+import java.security.KeyPair;
+import java.security.NoSuchAlgorithmException;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+
+import static haveno.network.p2p.storage.TestState.SavedTestState;
+import static haveno.network.p2p.storage.TestState.getTestNodeAddress;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/TestState.java b/p2p/src/test/java/haveno/network/p2p/storage/TestState.java
index 8fdf0857..fabc9b26 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/TestState.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/TestState.java
@@ -23,8 +23,6 @@ import haveno.common.proto.persistable.PersistablePayload;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.peers.Broadcaster;
-import haveno.network.p2p.storage.HashMapChangedListener;
-import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.messages.AddDataMessage;
import haveno.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage;
import haveno.network.p2p.storage.messages.BroadcastMessage;
@@ -43,19 +41,24 @@ import haveno.network.p2p.storage.persistence.ProtectedDataStoreService;
import haveno.network.p2p.storage.persistence.RemovedPayloadsService;
import haveno.network.p2p.storage.persistence.ResourceDataStoreService;
import haveno.network.p2p.storage.persistence.SequenceNumberMap;
-import java.security.PublicKey;
+import org.junit.Assert;
+import org.mockito.ArgumentCaptor;
+import java.security.PublicKey;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import org.mockito.ArgumentCaptor;
-
-import org.junit.Assert;
-
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.isNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.nullable;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
/**
* Test object that stores a P2PDataStore instance as well as the mock objects necessary for state validation.
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/messages/AddDataMessageTest.java b/p2p/src/test/java/haveno/network/p2p/storage/messages/AddDataMessageTest.java
index ff792cf7..cac216ff 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/messages/AddDataMessageTest.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/messages/AddDataMessageTest.java
@@ -24,28 +24,23 @@ import haveno.common.crypto.KeyStorage;
import haveno.common.crypto.SealedAndSigned;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.PrefixedSealedAndSignedMessage;
-import haveno.network.p2p.storage.messages.AddDataMessage;
import haveno.network.p2p.storage.payload.MailboxStoragePayload;
import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomUtils;
+import org.junit.Before;
+import org.junit.Test;
+import java.io.File;
+import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.SignatureException;
import java.security.cert.CertificateException;
-
import java.time.Clock;
-import java.io.File;
-import java.io.IOException;
-
-import lombok.extern.slf4j.Slf4j;
-
-import org.junit.Before;
-import org.junit.Test;
-
@SuppressWarnings("UnusedAssignment")
@Slf4j
public class AddDataMessageTest {
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java b/p2p/src/test/java/haveno/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java
index d27ed091..0164699f 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java
@@ -20,6 +20,7 @@ package haveno.network.p2p.storage.mocks;
import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService;
+
import java.util.Map;
/**
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/mocks/DateTolerantPayloadStub.java b/p2p/src/test/java/haveno/network/p2p/storage/mocks/DateTolerantPayloadStub.java
index f4c4381a..45f31108 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/mocks/DateTolerantPayloadStub.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/mocks/DateTolerantPayloadStub.java
@@ -18,6 +18,7 @@
package haveno.network.p2p.storage.mocks;
import haveno.network.p2p.storage.payload.DateTolerantPayload;
+
import java.time.Clock;
/**
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/mocks/ExpirableProtectedStoragePayloadStub.java b/p2p/src/test/java/haveno/network/p2p/storage/mocks/ExpirableProtectedStoragePayloadStub.java
index a1ff0250..42ff1792 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/mocks/ExpirableProtectedStoragePayloadStub.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/mocks/ExpirableProtectedStoragePayloadStub.java
@@ -21,8 +21,8 @@ import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.storage.TestState;
import haveno.network.p2p.storage.payload.ExpirablePayload;
import haveno.network.p2p.storage.payload.RequiresOwnerIsOnlinePayload;
-import java.security.PublicKey;
+import java.security.PublicKey;
import java.util.concurrent.TimeUnit;
/**
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/mocks/MapStoreServiceFake.java b/p2p/src/test/java/haveno/network/p2p/storage/mocks/MapStoreServiceFake.java
index 8e5f27df..0c47de65 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/mocks/MapStoreServiceFake.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/mocks/MapStoreServiceFake.java
@@ -23,13 +23,12 @@ import haveno.common.proto.persistable.PersistablePayload;
import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.p2p.storage.persistence.MapStoreService;
-import java.io.File;
+import lombok.Getter;
+import java.io.File;
import java.util.HashMap;
import java.util.Map;
-import lombok.Getter;
-
import static org.mockito.Mockito.mock;
/**
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/mocks/MockData.java b/p2p/src/test/java/haveno/network/p2p/storage/mocks/MockData.java
index f978a126..e1af0475 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/mocks/MockData.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/mocks/MockData.java
@@ -17,14 +17,13 @@
package haveno.network.p2p.storage.mocks;
-import org.apache.commons.lang3.NotImplementedException;
import haveno.network.p2p.storage.payload.ExpirablePayload;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
-import java.security.PublicKey;
-
-import java.util.Map;
+import org.apache.commons.lang3.NotImplementedException;
import javax.annotation.Nullable;
+import java.security.PublicKey;
+import java.util.Map;
@SuppressWarnings("ALL")
public class MockData implements ProtectedStoragePayload, ExpirablePayload {
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/mocks/PersistableExpirableProtectedStoragePayloadStub.java b/p2p/src/test/java/haveno/network/p2p/storage/mocks/PersistableExpirableProtectedStoragePayloadStub.java
index 1957e7dd..c7a3f123 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/mocks/PersistableExpirableProtectedStoragePayloadStub.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/mocks/PersistableExpirableProtectedStoragePayloadStub.java
@@ -18,6 +18,7 @@
package haveno.network.p2p.storage.mocks;
import haveno.common.proto.persistable.PersistablePayload;
+
import java.security.PublicKey;
/**
* Stub implementation of a ProtectedStoragePayloadStub implementing the ExpirablePayload & RequiresOwnerIsOnlinePayload
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/mocks/ProtectedStoragePayloadStub.java b/p2p/src/test/java/haveno/network/p2p/storage/mocks/ProtectedStoragePayloadStub.java
index 58db8056..c1fa361b 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/mocks/ProtectedStoragePayloadStub.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/mocks/ProtectedStoragePayloadStub.java
@@ -20,13 +20,11 @@ package haveno.network.p2p.storage.mocks;
import com.google.protobuf.Message;
import haveno.common.crypto.Sig;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
-import java.security.PublicKey;
-
-import java.util.Map;
-
import lombok.Getter;
import javax.annotation.Nullable;
+import java.security.PublicKey;
+import java.util.Map;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/payload/ProtectedMailboxStorageEntryTest.java b/p2p/src/test/java/haveno/network/p2p/storage/payload/ProtectedMailboxStorageEntryTest.java
index feaf29d8..a7d22db5 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/payload/ProtectedMailboxStorageEntryTest.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/payload/ProtectedMailboxStorageEntryTest.java
@@ -23,19 +23,15 @@ import haveno.common.crypto.Sig;
import haveno.network.p2p.PrefixedSealedAndSignedMessage;
import haveno.network.p2p.TestUtils;
import haveno.network.p2p.storage.P2PDataStorage;
-import haveno.network.p2p.storage.payload.MailboxStoragePayload;
-import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry;
-import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-import java.security.PublicKey;
-
-import java.time.Clock;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import java.security.KeyPair;
+import java.security.NoSuchAlgorithmException;
+import java.security.PublicKey;
+import java.time.Clock;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/p2p/src/test/java/haveno/network/p2p/storage/payload/ProtectedStorageEntryTest.java b/p2p/src/test/java/haveno/network/p2p/storage/payload/ProtectedStorageEntryTest.java
index 47c1fba4..9f745465 100644
--- a/p2p/src/test/java/haveno/network/p2p/storage/payload/ProtectedStorageEntryTest.java
+++ b/p2p/src/test/java/haveno/network/p2p/storage/payload/ProtectedStorageEntryTest.java
@@ -24,21 +24,16 @@ import haveno.network.p2p.PrefixedSealedAndSignedMessage;
import haveno.network.p2p.TestUtils;
import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.mocks.ProtectedStoragePayloadStub;
-import haveno.network.p2p.storage.payload.MailboxStoragePayload;
-import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
-import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
-import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-import java.security.PublicKey;
-
-import java.time.Clock;
-import java.time.Duration;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import java.security.KeyPair;
+import java.security.NoSuchAlgorithmException;
+import java.security.PublicKey;
+import java.time.Clock;
+import java.time.Duration;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/p2p/src/test/java/haveno/network/utils/UtilsTest.java b/p2p/src/test/java/haveno/network/utils/UtilsTest.java
index 240e76e2..e986fb11 100644
--- a/p2p/src/test/java/haveno/network/utils/UtilsTest.java
+++ b/p2p/src/test/java/haveno/network/utils/UtilsTest.java
@@ -22,8 +22,6 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import haveno.network.utils.Utils;
-
public class UtilsTest {
@Test
diff --git a/relay/src/main/java/haveno/relay/RelayMain.java b/relay/src/main/java/haveno/relay/RelayMain.java
index ca7f26b0..f613ba99 100644
--- a/relay/src/main/java/haveno/relay/RelayMain.java
+++ b/relay/src/main/java/haveno/relay/RelayMain.java
@@ -17,18 +17,15 @@
package haveno.relay;
-import org.apache.commons.codec.binary.Hex;
-
-import java.io.File;
-
-import java.util.Locale;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import ch.qos.logback.classic.Level;
import haveno.common.app.Log;
import haveno.common.util.Utilities;
+import org.apache.commons.codec.binary.Hex;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.util.Locale;
import static spark.Spark.get;
import static spark.Spark.port;
diff --git a/relay/src/main/java/haveno/relay/RelayService.java b/relay/src/main/java/haveno/relay/RelayService.java
index a54c3fc5..ce66d007 100644
--- a/relay/src/main/java/haveno/relay/RelayService.java
+++ b/relay/src/main/java/haveno/relay/RelayService.java
@@ -17,20 +17,6 @@
package haveno.relay;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import java.util.Scanner;
-import java.util.concurrent.ExecutionException;
-
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-
import com.google.auth.oauth2.GoogleCredentials;
import com.google.firebase.FirebaseApp;
import com.google.firebase.FirebaseOptions;
@@ -44,6 +30,15 @@ import com.turo.pushy.apns.PushNotificationResponse;
import com.turo.pushy.apns.util.ApnsPayloadBuilder;
import com.turo.pushy.apns.util.SimpleApnsPushNotification;
import com.turo.pushy.apns.util.concurrent.PushNotificationFuture;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Scanner;
+import java.util.concurrent.ExecutionException;
class RelayService {
private static final Logger log = LoggerFactory.getLogger(RelayMain.class);
";
diff --git a/monitor/src/main/java/haveno/monitor/AvailableTor.java b/monitor/src/main/java/haveno/monitor/AvailableTor.java
index 869b3571..9ab0e651 100644
--- a/monitor/src/main/java/haveno/monitor/AvailableTor.java
+++ b/monitor/src/main/java/haveno/monitor/AvailableTor.java
@@ -17,8 +17,9 @@
package haveno.monitor;
-import org.berndpruenster.netlayer.tor.Tor;
import haveno.network.p2p.network.TorMode;
+import org.berndpruenster.netlayer.tor.Tor;
+
import java.io.File;
/**
diff --git a/monitor/src/main/java/haveno/monitor/Metric.java b/monitor/src/main/java/haveno/monitor/Metric.java
index b2132393..5cab11c7 100644
--- a/monitor/src/main/java/haveno/monitor/Metric.java
+++ b/monitor/src/main/java/haveno/monitor/Metric.java
@@ -17,10 +17,10 @@
package haveno.monitor;
-import static haveno.common.config.Config.BASE_CURRENCY_NETWORK;
-
import haveno.common.app.Version;
import haveno.common.util.Utilities;
+import lombok.extern.slf4j.Slf4j;
+
import java.util.Properties;
import java.util.Random;
import java.util.concurrent.ScheduledExecutorService;
@@ -28,7 +28,7 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import lombok.extern.slf4j.Slf4j;
+import static haveno.common.config.Config.BASE_CURRENCY_NETWORK;
/**
* Starts a Metric (in its own {@link Thread}), manages its properties and shuts
diff --git a/monitor/src/main/java/haveno/monitor/Monitor.java b/monitor/src/main/java/haveno/monitor/Monitor.java
index 0bef83bc..8aeaa199 100644
--- a/monitor/src/main/java/haveno/monitor/Monitor.java
+++ b/monitor/src/main/java/haveno/monitor/Monitor.java
@@ -30,24 +30,19 @@ import haveno.monitor.metric.TorRoundTripTime;
import haveno.monitor.metric.TorStartupTime;
import haveno.monitor.reporter.ConsoleReporter;
import haveno.monitor.reporter.GraphiteReporter;
+import lombok.extern.slf4j.Slf4j;
import org.berndpruenster.netlayer.tor.NativeTor;
import org.berndpruenster.netlayer.tor.Tor;
+import sun.misc.Signal;
import java.io.File;
import java.io.FileInputStream;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import lombok.extern.slf4j.Slf4j;
-
import static com.google.common.base.Preconditions.checkNotNull;
-
-
-import sun.misc.Signal;
-
/**
* Monitor executable for the Haveno network.
*
diff --git a/monitor/src/main/java/haveno/monitor/OnionParser.java b/monitor/src/main/java/haveno/monitor/OnionParser.java
index 6060e067..413ec8de 100644
--- a/monitor/src/main/java/haveno/monitor/OnionParser.java
+++ b/monitor/src/main/java/haveno/monitor/OnionParser.java
@@ -18,6 +18,7 @@
package haveno.monitor;
import haveno.network.p2p.NodeAddress;
+
import java.net.MalformedURLException;
import java.net.URL;
diff --git a/monitor/src/main/java/haveno/monitor/ThreadGate.java b/monitor/src/main/java/haveno/monitor/ThreadGate.java
index 12b2b6a2..ed30a6b8 100644
--- a/monitor/src/main/java/haveno/monitor/ThreadGate.java
+++ b/monitor/src/main/java/haveno/monitor/ThreadGate.java
@@ -17,11 +17,11 @@
package haveno.monitor;
+import lombok.extern.slf4j.Slf4j;
+
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import lombok.extern.slf4j.Slf4j;
-
/**
* Gate pattern to help with thread synchronization
*
diff --git a/monitor/src/main/java/haveno/monitor/metric/MarketStats.java b/monitor/src/main/java/haveno/monitor/metric/MarketStats.java
index f27ca4ba..3edb4123 100644
--- a/monitor/src/main/java/haveno/monitor/metric/MarketStats.java
+++ b/monitor/src/main/java/haveno/monitor/metric/MarketStats.java
@@ -17,14 +17,15 @@
package haveno.monitor.metric;
-import java.net.URL;
-import java.net.URLConnection;
import haveno.monitor.Metric;
import haveno.monitor.Reporter;
+import lombok.extern.slf4j.Slf4j;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
-
+import java.net.URL;
+import java.net.URLConnection;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -32,8 +33,6 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import lombok.extern.slf4j.Slf4j;
-
/**
* Uses the markets API to retrieve market volume data.
*
diff --git a/monitor/src/main/java/haveno/monitor/metric/P2PMarketStats.java b/monitor/src/main/java/haveno/monitor/metric/P2PMarketStats.java
index ee931338..a7749a61 100644
--- a/monitor/src/main/java/haveno/monitor/metric/P2PMarketStats.java
+++ b/monitor/src/main/java/haveno/monitor/metric/P2PMarketStats.java
@@ -26,6 +26,8 @@ import haveno.network.p2p.peers.getdata.messages.GetDataResponse;
import haveno.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
+import lombok.extern.slf4j.Slf4j;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -36,8 +38,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
-
import static com.google.common.base.Preconditions.checkNotNull;
/**
diff --git a/monitor/src/main/java/haveno/monitor/metric/P2PNetworkLoad.java b/monitor/src/main/java/haveno/monitor/metric/P2PNetworkLoad.java
index 5aca3b65..c07fbc00 100644
--- a/monitor/src/main/java/haveno/monitor/metric/P2PNetworkLoad.java
+++ b/monitor/src/main/java/haveno/monitor/metric/P2PNetworkLoad.java
@@ -40,10 +40,10 @@ import haveno.network.p2p.peers.PeerManager;
import haveno.network.p2p.peers.keepalive.KeepAliveManager;
import haveno.network.p2p.peers.peerexchange.PeerExchangeManager;
import haveno.network.p2p.storage.messages.BroadcastMessage;
-import java.time.Clock;
+import lombok.extern.slf4j.Slf4j;
import java.io.File;
-
+import java.time.Clock;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -53,8 +53,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import lombok.extern.slf4j.Slf4j;
-
/**
* Contacts a list of hosts and asks them for all the data we do not have. The
* answers are then compiled into buckets of message types. Based on these
diff --git a/monitor/src/main/java/haveno/monitor/metric/P2PRoundTripTime.java b/monitor/src/main/java/haveno/monitor/metric/P2PRoundTripTime.java
index 06dd2a0b..98d3494f 100644
--- a/monitor/src/main/java/haveno/monitor/metric/P2PRoundTripTime.java
+++ b/monitor/src/main/java/haveno/monitor/metric/P2PRoundTripTime.java
@@ -26,6 +26,7 @@ import haveno.network.p2p.network.CloseConnectionReason;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.peers.keepalive.messages.Ping;
import haveno.network.p2p.peers.keepalive.messages.Pong;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
diff --git a/monitor/src/main/java/haveno/monitor/metric/P2PSeedNodeSnapshot.java b/monitor/src/main/java/haveno/monitor/metric/P2PSeedNodeSnapshot.java
index 3f501368..38c23e19 100644
--- a/monitor/src/main/java/haveno/monitor/metric/P2PSeedNodeSnapshot.java
+++ b/monitor/src/main/java/haveno/monitor/metric/P2PSeedNodeSnapshot.java
@@ -23,27 +23,20 @@ import haveno.monitor.Reporter;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.peers.getdata.messages.GetDataResponse;
-import haveno.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
import java.net.MalformedURLException;
-
-import java.nio.ByteBuffer;
-
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Random;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-
import static com.google.common.base.Preconditions.checkNotNull;
/**
diff --git a/monitor/src/main/java/haveno/monitor/metric/P2PSeedNodeSnapshotBase.java b/monitor/src/main/java/haveno/monitor/metric/P2PSeedNodeSnapshotBase.java
index ccf5f141..fb28ed19 100644
--- a/monitor/src/main/java/haveno/monitor/metric/P2PSeedNodeSnapshotBase.java
+++ b/monitor/src/main/java/haveno/monitor/metric/P2PSeedNodeSnapshotBase.java
@@ -41,10 +41,11 @@ import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.MessageListener;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.network.TorNetworkNode;
-import java.time.Clock;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
import java.io.File;
-
+import java.time.Clock;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -56,10 +57,6 @@ import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jetbrains.annotations.NotNull;
-
/**
* Contacts a list of hosts and asks them for all the data excluding persisted messages. The
* answers are then compiled into buckets of message types. Based on these
diff --git a/monitor/src/main/java/haveno/monitor/metric/PriceNodeStats.java b/monitor/src/main/java/haveno/monitor/metric/PriceNodeStats.java
index c8a2f8f8..6393b61c 100644
--- a/monitor/src/main/java/haveno/monitor/metric/PriceNodeStats.java
+++ b/monitor/src/main/java/haveno/monitor/metric/PriceNodeStats.java
@@ -17,9 +17,6 @@
package haveno.monitor.metric;
-import org.berndpruenster.netlayer.tor.Tor;
-import org.berndpruenster.netlayer.tor.TorCtlException;
-
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import com.runjva.sourceforge.jsocks.protocol.SocksSocket;
import haveno.asset.Asset;
@@ -28,13 +25,16 @@ import haveno.monitor.Metric;
import haveno.monitor.OnionParser;
import haveno.monitor.Reporter;
import haveno.network.p2p.NodeAddress;
+import lombok.extern.slf4j.Slf4j;
+import org.berndpruenster.netlayer.tor.Tor;
+import org.berndpruenster.netlayer.tor.TorCtlException;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
@@ -43,8 +43,6 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import lombok.extern.slf4j.Slf4j;
-
import static com.google.common.base.Preconditions.checkNotNull;
/**
diff --git a/monitor/src/main/java/haveno/monitor/metric/TorHiddenServiceStartupTime.java b/monitor/src/main/java/haveno/monitor/metric/TorHiddenServiceStartupTime.java
index 8384c060..e3a56404 100644
--- a/monitor/src/main/java/haveno/monitor/metric/TorHiddenServiceStartupTime.java
+++ b/monitor/src/main/java/haveno/monitor/metric/TorHiddenServiceStartupTime.java
@@ -17,14 +17,14 @@
package haveno.monitor.metric;
-import org.berndpruenster.netlayer.tor.HiddenServiceSocket;
import haveno.monitor.Metric;
import haveno.monitor.Monitor;
import haveno.monitor.Reporter;
import haveno.monitor.ThreadGate;
-import java.io.File;
-
import lombok.extern.slf4j.Slf4j;
+import org.berndpruenster.netlayer.tor.HiddenServiceSocket;
+
+import java.io.File;
/**
* A Metric to measure the startup time of a Tor Hidden Service on a already
diff --git a/monitor/src/main/java/haveno/monitor/metric/TorRoundTripTime.java b/monitor/src/main/java/haveno/monitor/metric/TorRoundTripTime.java
index 503daa46..60bd1a8a 100644
--- a/monitor/src/main/java/haveno/monitor/metric/TorRoundTripTime.java
+++ b/monitor/src/main/java/haveno/monitor/metric/TorRoundTripTime.java
@@ -17,9 +17,6 @@
package haveno.monitor.metric;
-import org.berndpruenster.netlayer.tor.Tor;
-import org.berndpruenster.netlayer.tor.TorCtlException;
-
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import com.runjva.sourceforge.jsocks.protocol.SocksSocket;
import haveno.monitor.Metric;
@@ -27,8 +24,10 @@ import haveno.monitor.OnionParser;
import haveno.monitor.Reporter;
import haveno.monitor.StatisticsHelper;
import haveno.network.p2p.NodeAddress;
-import java.io.IOException;
+import org.berndpruenster.netlayer.tor.Tor;
+import org.berndpruenster.netlayer.tor.TorCtlException;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
diff --git a/monitor/src/main/java/haveno/monitor/metric/TorStartupTime.java b/monitor/src/main/java/haveno/monitor/metric/TorStartupTime.java
index cf03c2ff..94844000 100644
--- a/monitor/src/main/java/haveno/monitor/metric/TorStartupTime.java
+++ b/monitor/src/main/java/haveno/monitor/metric/TorStartupTime.java
@@ -17,15 +17,15 @@
package haveno.monitor.metric;
+import haveno.monitor.Metric;
+import haveno.monitor.Reporter;
import org.berndpruenster.netlayer.tor.NativeTor;
import org.berndpruenster.netlayer.tor.Tor;
import org.berndpruenster.netlayer.tor.TorCtlException;
import org.berndpruenster.netlayer.tor.Torrc;
-import haveno.monitor.Metric;
-import haveno.monitor.Reporter;
+
import java.io.File;
import java.io.IOException;
-
import java.util.LinkedHashMap;
import java.util.Properties;
diff --git a/monitor/src/main/java/haveno/monitor/reporter/ConsoleReporter.java b/monitor/src/main/java/haveno/monitor/reporter/ConsoleReporter.java
index 36639845..fcb58237 100644
--- a/monitor/src/main/java/haveno/monitor/reporter/ConsoleReporter.java
+++ b/monitor/src/main/java/haveno/monitor/reporter/ConsoleReporter.java
@@ -20,6 +20,7 @@ package haveno.monitor.reporter;
import haveno.common.app.Version;
import haveno.common.config.BaseCurrencyNetwork;
import haveno.monitor.Reporter;
+
import java.util.HashMap;
import java.util.Map;
diff --git a/monitor/src/main/java/haveno/monitor/reporter/GraphiteReporter.java b/monitor/src/main/java/haveno/monitor/reporter/GraphiteReporter.java
index d9ca6865..3ac971eb 100644
--- a/monitor/src/main/java/haveno/monitor/reporter/GraphiteReporter.java
+++ b/monitor/src/main/java/haveno/monitor/reporter/GraphiteReporter.java
@@ -17,18 +17,16 @@
package haveno.monitor.reporter;
-import org.berndpruenster.netlayer.tor.TorSocket;
-
import com.google.common.base.Charsets;
import haveno.common.app.Version;
import haveno.common.config.BaseCurrencyNetwork;
import haveno.monitor.OnionParser;
import haveno.monitor.Reporter;
import haveno.network.p2p.NodeAddress;
-import java.net.Socket;
+import org.berndpruenster.netlayer.tor.TorSocket;
import java.io.IOException;
-
+import java.net.Socket;
import java.util.HashMap;
import java.util.Map;
diff --git a/monitor/src/test/java/haveno/monitor/MonitorInfrastructureTests.java b/monitor/src/test/java/haveno/monitor/MonitorInfrastructureTests.java
index 7af3ab54..4a0adcea 100644
--- a/monitor/src/test/java/haveno/monitor/MonitorInfrastructureTests.java
+++ b/monitor/src/test/java/haveno/monitor/MonitorInfrastructureTests.java
@@ -17,18 +17,17 @@
package haveno.monitor;
-import haveno.monitor.Metric;
import haveno.monitor.reporter.ConsoleReporter;
-import java.util.HashMap;
-import java.util.Properties;
-import java.util.concurrent.ExecutionException;
-
import org.junit.Assert;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.concurrent.ExecutionException;
+
@Disabled
public class MonitorInfrastructureTests {
diff --git a/monitor/src/test/java/haveno/monitor/P2PNetworkLoadTests.java b/monitor/src/test/java/haveno/monitor/P2PNetworkLoadTests.java
index ad275636..ca64549c 100644
--- a/monitor/src/test/java/haveno/monitor/P2PNetworkLoadTests.java
+++ b/monitor/src/test/java/haveno/monitor/P2PNetworkLoadTests.java
@@ -17,25 +17,21 @@
package haveno.monitor;
+import haveno.monitor.metric.P2PNetworkLoad;
+import haveno.monitor.reporter.ConsoleReporter;
import org.berndpruenster.netlayer.tor.NativeTor;
import org.berndpruenster.netlayer.tor.Tor;
import org.berndpruenster.netlayer.tor.TorCtlException;
-
-import java.util.Map;
-import java.util.Properties;
-
import org.junit.Assert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Map;
+import java.util.Properties;
-import haveno.monitor.Metric;
-import haveno.monitor.Monitor;
-import haveno.monitor.metric.P2PNetworkLoad;
-import haveno.monitor.reporter.ConsoleReporter;
+import static com.google.common.base.Preconditions.checkNotNull;
/**
* Test the round trip time metric against the hidden service of tor project.org.
diff --git a/monitor/src/test/java/haveno/monitor/P2PRoundTripTimeTests.java b/monitor/src/test/java/haveno/monitor/P2PRoundTripTimeTests.java
index 886b4973..4ecb89a5 100644
--- a/monitor/src/test/java/haveno/monitor/P2PRoundTripTimeTests.java
+++ b/monitor/src/test/java/haveno/monitor/P2PRoundTripTimeTests.java
@@ -17,13 +17,11 @@
package haveno.monitor;
+import haveno.monitor.metric.P2PRoundTripTime;
+import haveno.monitor.reporter.ConsoleReporter;
import org.berndpruenster.netlayer.tor.NativeTor;
import org.berndpruenster.netlayer.tor.Tor;
import org.berndpruenster.netlayer.tor.TorCtlException;
-
-import java.util.Map;
-import java.util.Properties;
-
import org.junit.Assert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
@@ -31,12 +29,10 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Map;
+import java.util.Properties;
-import haveno.monitor.Metric;
-import haveno.monitor.Monitor;
-import haveno.monitor.metric.P2PRoundTripTime;
-import haveno.monitor.reporter.ConsoleReporter;
+import static com.google.common.base.Preconditions.checkNotNull;
/**
* Test the round trip time metric against the hidden service of tor project.org.
diff --git a/monitor/src/test/java/haveno/monitor/PriceNodeStatsTests.java b/monitor/src/test/java/haveno/monitor/PriceNodeStatsTests.java
index db9a0a89..e3755faf 100644
--- a/monitor/src/test/java/haveno/monitor/PriceNodeStatsTests.java
+++ b/monitor/src/test/java/haveno/monitor/PriceNodeStatsTests.java
@@ -17,26 +17,21 @@
package haveno.monitor;
+import haveno.monitor.metric.PriceNodeStats;
import org.berndpruenster.netlayer.tor.NativeTor;
import org.berndpruenster.netlayer.tor.Tor;
import org.berndpruenster.netlayer.tor.TorCtlException;
-
-import java.io.File;
-
-import java.util.Map;
-import java.util.Properties;
-
import org.junit.Assert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.io.File;
+import java.util.Map;
+import java.util.Properties;
-import haveno.monitor.Metric;
-import haveno.monitor.Reporter;
-import haveno.monitor.metric.PriceNodeStats;
+import static com.google.common.base.Preconditions.checkNotNull;
/**
* @author Florian Reimair
diff --git a/monitor/src/test/java/haveno/monitor/TorHiddenServiceStartupTimeTests.java b/monitor/src/test/java/haveno/monitor/TorHiddenServiceStartupTimeTests.java
index 2f2435f1..5a5a9ab9 100644
--- a/monitor/src/test/java/haveno/monitor/TorHiddenServiceStartupTimeTests.java
+++ b/monitor/src/test/java/haveno/monitor/TorHiddenServiceStartupTimeTests.java
@@ -17,26 +17,21 @@
package haveno.monitor;
+import haveno.monitor.metric.TorHiddenServiceStartupTime;
import org.berndpruenster.netlayer.tor.NativeTor;
import org.berndpruenster.netlayer.tor.Tor;
import org.berndpruenster.netlayer.tor.TorCtlException;
-
-import java.io.File;
-
-import java.util.Map;
-import java.util.Properties;
-
import org.junit.Assert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.io.File;
+import java.util.Map;
+import java.util.Properties;
-import haveno.monitor.Metric;
-import haveno.monitor.Reporter;
-import haveno.monitor.metric.TorHiddenServiceStartupTime;
+import static com.google.common.base.Preconditions.checkNotNull;
@Disabled // Ignore for normal test runs as the tests take lots of time
public class TorHiddenServiceStartupTimeTests {
diff --git a/monitor/src/test/java/haveno/monitor/TorRoundTripTimeTests.java b/monitor/src/test/java/haveno/monitor/TorRoundTripTimeTests.java
index ebf6db10..4b21af1d 100644
--- a/monitor/src/test/java/haveno/monitor/TorRoundTripTimeTests.java
+++ b/monitor/src/test/java/haveno/monitor/TorRoundTripTimeTests.java
@@ -17,15 +17,10 @@
package haveno.monitor;
+import haveno.monitor.metric.TorRoundTripTime;
import org.berndpruenster.netlayer.tor.NativeTor;
import org.berndpruenster.netlayer.tor.Tor;
import org.berndpruenster.netlayer.tor.TorCtlException;
-
-import java.io.File;
-
-import java.util.Map;
-import java.util.Properties;
-
import org.junit.Assert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
@@ -33,11 +28,11 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.io.File;
+import java.util.Map;
+import java.util.Properties;
-import haveno.monitor.Metric;
-import haveno.monitor.Reporter;
-import haveno.monitor.metric.TorRoundTripTime;
+import static com.google.common.base.Preconditions.checkNotNull;
/**
* Test the round trip time metric against the hidden service of tor project.org.
diff --git a/monitor/src/test/java/haveno/monitor/TorStartupTimeTests.java b/monitor/src/test/java/haveno/monitor/TorStartupTimeTests.java
index afb38c11..fd862e42 100644
--- a/monitor/src/test/java/haveno/monitor/TorStartupTimeTests.java
+++ b/monitor/src/test/java/haveno/monitor/TorStartupTimeTests.java
@@ -17,16 +17,14 @@
package haveno.monitor;
-import haveno.monitor.Metric;
-import haveno.monitor.Reporter;
import haveno.monitor.metric.TorStartupTime;
-import java.util.Map;
-import java.util.Properties;
-
import org.junit.Assert;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import java.util.Map;
+import java.util.Properties;
+
@Disabled // Ignore for normal test runs as the tests take lots of time
public class TorStartupTimeTests {
diff --git a/p2p/src/main/java/haveno/network/DnsLookupTor.java b/p2p/src/main/java/haveno/network/DnsLookupTor.java
index 8583c5ef..be5bd85b 100644
--- a/p2p/src/main/java/haveno/network/DnsLookupTor.java
+++ b/p2p/src/main/java/haveno/network/DnsLookupTor.java
@@ -17,21 +17,17 @@
package haveno.network;
-import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
-
import com.google.common.base.Charsets;
-
-import java.net.InetAddress;
-import java.net.Socket;
-
-import java.io.IOException;
-
-import java.util.HashMap;
-import java.util.Map;
-
+import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Performs DNS lookup over Socks5 proxy that implements the RESOLVE extension.
* At this time, Tor is only known Socks5 proxy that supports it.
diff --git a/p2p/src/main/java/haveno/network/Socks5DnsDiscovery.java b/p2p/src/main/java/haveno/network/Socks5DnsDiscovery.java
index 755682ba..880c56d2 100644
--- a/p2p/src/main/java/haveno/network/Socks5DnsDiscovery.java
+++ b/p2p/src/main/java/haveno/network/Socks5DnsDiscovery.java
@@ -17,6 +17,9 @@
package haveno.network;
+import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
+import haveno.common.util.Utilities;
+import lombok.extern.slf4j.Slf4j;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.net.discovery.DnsDiscovery;
import org.bitcoinj.net.discovery.MultiplexingDiscovery;
@@ -25,18 +28,13 @@ import org.bitcoinj.net.discovery.PeerDiscoveryException;
import org.bitcoinj.utils.ContextPropagatingThreadFactory;
import org.bitcoinj.utils.DaemonThreadFactory;
-import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
-import haveno.common.util.Utilities;
import java.net.InetSocketAddress;
-
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import lombok.extern.slf4j.Slf4j;
-
/**
*