4: Change datatype of severity field and parsing
This commit is contained in:
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
# Asset Direction Target TRIGGER SEVERITY NOTE
|
# Asset Direction Target TRIGGER SEVERITY NOTE
|
||||||
#############################################################
|
#############################################################
|
||||||
SOL BELOW 70.0 ONETIME 2 "ALARM: Risiko for Perps Solana long LIKVIDERING!"
|
SOL BELOW 170.0 ONETIME CRITICAL "EMERGENCY: Risiko for Perps Solana long LIKVIDERING!"
|
||||||
SOL BELOW 71.4 ONETIME 2 "ALARM: Risiko for Solana Raydium LÅN LIKVIDERING!"
|
#SOL BELOW 71.4 ONETIME CRITICAL "CRITICAL: Risiko for Solana Raydium LÅN LIKVIDERING!"
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package com.r35157.jupiterperpsalarm.impl.ref;
|
package com.r35157.jupiterperpsalarm.impl.ref;
|
||||||
|
|
||||||
|
import com.r35157.jupiterperpsalarm.AlarmSeverity;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
@@ -44,15 +46,21 @@ public final class AlarmConfigurationParser {
|
|||||||
JupiterPerpsAsset asset = JupiterPerpsAsset.valueOf(
|
JupiterPerpsAsset asset = JupiterPerpsAsset.valueOf(
|
||||||
cursor.nextToken("asset").toUpperCase(Locale.ROOT)
|
cursor.nextToken("asset").toUpperCase(Locale.ROOT)
|
||||||
);
|
);
|
||||||
|
|
||||||
PriceDirection direction = PriceDirection.valueOf(
|
PriceDirection direction = PriceDirection.valueOf(
|
||||||
cursor.nextToken("direction").toUpperCase(Locale.ROOT)
|
cursor.nextToken("direction").toUpperCase(Locale.ROOT)
|
||||||
);
|
);
|
||||||
|
|
||||||
BigDecimal target = new BigDecimal(cursor.nextToken("target"));
|
BigDecimal target = new BigDecimal(cursor.nextToken("target"));
|
||||||
|
|
||||||
AlarmTrigger trigger = AlarmTrigger.valueOf(
|
AlarmTrigger trigger = AlarmTrigger.valueOf(
|
||||||
cursor.nextToken("trigger").toUpperCase(Locale.ROOT)
|
cursor.nextToken("trigger").toUpperCase(Locale.ROOT)
|
||||||
);
|
);
|
||||||
int severity = Integer.parseInt(cursor.nextToken("severity"));
|
|
||||||
|
AlarmSeverity severity = AlarmSeverity.valueOf(
|
||||||
|
cursor.nextToken("severity").toUpperCase()
|
||||||
|
);
|
||||||
|
|
||||||
String note = cursor.nextQuotedString("note");
|
String note = cursor.nextQuotedString("note");
|
||||||
|
|
||||||
cursor.skipWhitespace();
|
cursor.skipWhitespace();
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ public final class JupiterPerpsAlarmImpl {
|
|||||||
asset.oracleAccount()
|
asset.oracleAccount()
|
||||||
);
|
);
|
||||||
assetDefinitions.forEach(definition -> System.out.printf(
|
assetDefinitions.forEach(definition -> System.out.printf(
|
||||||
" %s %s USD, %s, severity=%d%n",
|
" %s %s USD, %s, severity=%s%n",
|
||||||
definition.direction(),
|
definition.direction(),
|
||||||
definition.target().toPlainString(),
|
definition.target().toPlainString(),
|
||||||
definition.trigger(),
|
definition.trigger(),
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package com.r35157.jupiterperpsalarm.impl.ref;
|
package com.r35157.jupiterperpsalarm.impl.ref;
|
||||||
|
|
||||||
|
import com.r35157.jupiterperpsalarm.AlarmSeverity;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
@@ -8,7 +10,7 @@ public record PriceAlarmDefinition(
|
|||||||
PriceDirection direction,
|
PriceDirection direction,
|
||||||
BigDecimal target,
|
BigDecimal target,
|
||||||
AlarmTrigger trigger,
|
AlarmTrigger trigger,
|
||||||
int severity,
|
AlarmSeverity severity,
|
||||||
String note
|
String note
|
||||||
) {
|
) {
|
||||||
public PriceAlarmDefinition {
|
public PriceAlarmDefinition {
|
||||||
@@ -21,8 +23,5 @@ public record PriceAlarmDefinition(
|
|||||||
if (target.signum() <= 0) {
|
if (target.signum() <= 0) {
|
||||||
throw new IllegalArgumentException("Target price must be positive");
|
throw new IllegalArgumentException("Target price must be positive");
|
||||||
}
|
}
|
||||||
if (severity < 0) {
|
|
||||||
throw new IllegalArgumentException("Severity must be zero or positive");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package com.r35157.jupiterperpsalarm.impl.ref;
|
package com.r35157.jupiterperpsalarm.impl.ref;
|
||||||
|
|
||||||
|
import com.r35157.jupiterperpsalarm.AlarmSeverity;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -17,14 +19,14 @@ public final class SelfTest {
|
|||||||
|
|
||||||
private static void configurationParserTest() {
|
private static void configurationParserTest() {
|
||||||
PriceAlarmDefinition alarm = AlarmConfigurationParser.parseLine(
|
PriceAlarmDefinition alarm = AlarmConfigurationParser.parseLine(
|
||||||
"SOL ABOVE 75.7 ONETIME 2 \"ALARM: Risiko for likvidering!\""
|
"SOL ABOVE 75.7 ONETIME CRITICAL \"ALARM: Risiko for likvidering!\""
|
||||||
);
|
);
|
||||||
|
|
||||||
require(alarm.asset() == JupiterPerpsAsset.SOL, "Asset parsing failed");
|
require(alarm.asset() == JupiterPerpsAsset.SOL, "Asset parsing failed");
|
||||||
require(alarm.direction() == PriceDirection.ABOVE, "Direction parsing failed");
|
require(alarm.direction() == PriceDirection.ABOVE, "Direction parsing failed");
|
||||||
require(alarm.target().compareTo(new BigDecimal("75.7")) == 0, "Target parsing failed");
|
require(alarm.target().compareTo(new BigDecimal("75.7")) == 0, "Target parsing failed");
|
||||||
require(alarm.trigger() == AlarmTrigger.ONETIME, "Trigger parsing failed");
|
require(alarm.trigger() == AlarmTrigger.ONETIME, "Trigger parsing failed");
|
||||||
require(alarm.severity() == 2, "Severity parsing failed");
|
require(alarm.severity() == AlarmSeverity.CRITICAL, "Severity parsing failed");
|
||||||
require(alarm.note().equals("ALARM: Risiko for likvidering!"), "Note parsing failed");
|
require(alarm.note().equals("ALARM: Risiko for likvidering!"), "Note parsing failed");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -89,7 +91,7 @@ public final class SelfTest {
|
|||||||
direction,
|
direction,
|
||||||
new BigDecimal(target),
|
new BigDecimal(target),
|
||||||
trigger,
|
trigger,
|
||||||
2,
|
AlarmSeverity.CRITICAL,
|
||||||
"ignored for now"
|
"ignored for now"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user