From fba386999c54b59054a7cbdcc21042ff9e52fb20 Mon Sep 17 00:00:00 2001 From: thecockatiel Date: Fri, 7 Feb 2025 07:45:19 +0330 Subject: [PATCH 1/3] fix: some issues in EditOfferOptionParser --- cli/src/main/java/bisq/cli/opts/EditOfferOptionParser.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cli/src/main/java/bisq/cli/opts/EditOfferOptionParser.java b/cli/src/main/java/bisq/cli/opts/EditOfferOptionParser.java index 0e0b2d61c5..fedb3b26f3 100644 --- a/cli/src/main/java/bisq/cli/opts/EditOfferOptionParser.java +++ b/cli/src/main/java/bisq/cli/opts/EditOfferOptionParser.java @@ -123,11 +123,9 @@ public class EditOfferOptionParser extends OfferIdOptionParser implements Method if (options.has(mktPriceMarginPctOpt)) { if (valueNotSpecified.test(mktPriceMarginPctOpt)) - throw new IllegalArgumentException("no mkt price margin specified"); + throw new IllegalArgumentException("no market price margin specified"); String priceMarginPctAsString = options.valueOf(mktPriceMarginPctOpt); - if (priceMarginPctAsString.isEmpty()) - throw new IllegalArgumentException("no market price margin specified"); verifyStringIsValidDouble(priceMarginPctAsString); @@ -140,6 +138,7 @@ public class EditOfferOptionParser extends OfferIdOptionParser implements Method } boolean mktPriceMarginOptAndEnableOptAreOnlyOpts = options.has(enableOpt) + && !options.has(fixedPriceOpt) && !options.has(triggerPriceOpt); if (mktPriceMarginOptAndEnableOptAreOnlyOpts) { offerEditType = MKT_PRICE_MARGIN_AND_ACTIVATION_STATE; @@ -151,7 +150,7 @@ public class EditOfferOptionParser extends OfferIdOptionParser implements Method if (valueNotSpecified.test(triggerPriceOpt)) throw new IllegalArgumentException("no trigger price specified"); - String triggerPriceAsString = options.valueOf(fixedPriceOpt); + String triggerPriceAsString = options.valueOf(triggerPriceOpt); if (triggerPriceAsString.isEmpty()) throw new IllegalArgumentException("trigger price not specified"); From 49fca9315dc9b7fbb3e19f4ea4a66030cb059ff6 Mon Sep 17 00:00:00 2001 From: thecockatiel Date: Fri, 7 Feb 2025 07:55:36 +0330 Subject: [PATCH 2/3] chore: remove unnecessary extra check of triggerPriceOpt --- cli/src/main/java/bisq/cli/opts/EditOfferOptionParser.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/cli/src/main/java/bisq/cli/opts/EditOfferOptionParser.java b/cli/src/main/java/bisq/cli/opts/EditOfferOptionParser.java index fedb3b26f3..054d693a5e 100644 --- a/cli/src/main/java/bisq/cli/opts/EditOfferOptionParser.java +++ b/cli/src/main/java/bisq/cli/opts/EditOfferOptionParser.java @@ -151,8 +151,6 @@ public class EditOfferOptionParser extends OfferIdOptionParser implements Method throw new IllegalArgumentException("no trigger price specified"); String triggerPriceAsString = options.valueOf(triggerPriceOpt); - if (triggerPriceAsString.isEmpty()) - throw new IllegalArgumentException("trigger price not specified"); verifyStringIsValidDouble(triggerPriceAsString); From aed6a668a5997c2351b348c4be07530773682fba Mon Sep 17 00:00:00 2001 From: thecockatiel Date: Fri, 7 Feb 2025 07:59:10 +0330 Subject: [PATCH 3/3] fix: testEditOfferMktPriceMarginWithoutOptValueShouldThrowException --- cli/src/test/java/bisq/cli/opts/EditOfferOptionParserTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/src/test/java/bisq/cli/opts/EditOfferOptionParserTest.java b/cli/src/test/java/bisq/cli/opts/EditOfferOptionParserTest.java index ccabec4ea8..e64b0f28e9 100644 --- a/cli/src/test/java/bisq/cli/opts/EditOfferOptionParserTest.java +++ b/cli/src/test/java/bisq/cli/opts/EditOfferOptionParserTest.java @@ -217,7 +217,7 @@ public class EditOfferOptionParserTest { }; Throwable exception = assertThrows(RuntimeException.class, () -> new EditOfferOptionParser(args).parse()); - assertEquals("no mkt price margin specified", + assertEquals("no market price margin specified", exception.getMessage()); }