aljaz/lnd-manageJ
1
0
Fork 0
mirror of https://github.com/aljazceru/lnd-manageJ.git synced 2026-01-31 03:34:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove expensive regular expression matching for pubkeys

Browse Source
This commit is contained in:
Carsten Otto
2022-04-02 17:58:20 +02:00
parent 7c673501c0
commit dd4d2074ea
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
model/src/main/java/de/cotto/lndmanagej/model/Pubkey.java
View File

@@ -3,10 +3,10 @@ package de.cotto.lndmanagej.model;
import java.util.Arrays;
import java.util.HexFormat;
import java.util.Locale;
import java.util.regex.Pattern;
public final class Pubkey implements Comparable<Pubkey> {
private static final Pattern PATTERN = Pattern.compile("[0-9a-fA-F]{66}");
private static final int EXPECTED_NUMBER_OF_BYTES = 33;
private final String string;
private final byte[] byteArray;
private final int hash;
@@ -15,12 +15,12 @@ public final class Pubkey implements Comparable<Pubkey> {
this.string = string;
byteArray = HexFormat.of().parseHex(string);
hash = Arrays.hashCode(byteArray);
if (byteArray.length != EXPECTED_NUMBER_OF_BYTES) {
throw new IllegalArgumentException();
}
}
public static Pubkey create(String string) {
if (!PATTERN.matcher(string).matches()) {
throw new IllegalArgumentException("Pubkey must have 66 hex characters");
}
return new Pubkey(string.toLowerCase(Locale.US));
}

18
model/src/test/java/de/cotto/lndmanagej/model/PubkeyTest.java
View File

@@ -20,14 +20,28 @@ class PubkeyTest {
@Test
void too_short() {
assertThatIllegalArgumentException().isThrownBy(
() -> Pubkey.create("027abc123abc123abc123abc123123abc123abc123abc123abc123abc123abc12")
() -> Pubkey.create("027abc123abc123abc123abc123123abc123abc123abc123abc123abc123abc1")
);
}
@Test
void odd_number_of_characters() {
assertThatIllegalArgumentException().isThrownBy(
() -> Pubkey.create("0")
);
}
@Test
void not_hex() {
assertThatIllegalArgumentException().isThrownBy(
() -> Pubkey.create("fg")
);
}
@Test
void too_long() {
assertThatIllegalArgumentException().isThrownBy(
() -> Pubkey.create("027abc123abc123abc123abc123123abc123abc123abc123abc123abc123abc123a")
() -> Pubkey.create("027abc123abc123abc123abc123123abc123abc123abc123abc123abc123abc123aa")
);
}