Skip to content

Commit 63bec16

Browse files
committed
refactor: Update bip340 test
1 parent 8600c63 commit 63bec16

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

src/main/java/com/danubetech/dataintegrity/suites/DataIntegrityProofDataIntegritySuite.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ public class DataIntegrityProofDataIntegritySuite extends DataIntegritySuite {
3131
JWSAlgorithm.ES384, JCSSHA384Canonicalizer.getInstance(),
3232
JWSAlgorithm.ES512, JCSSHA512Canonicalizer.getInstance()
3333
),
34-
"schnorr-secp256k1-rdfc-2025", Map.of(
34+
"bip340-rdfc-2025", Map.of(
3535
JWSAlgorithm.ES256KS, RDFC10SHA256Canonicalizer.getInstance()
3636
),
37-
"schnorr-secp256k1-jcs-2025", Map.of(
37+
"bip340-jcs-2025", Map.of(
3838
JWSAlgorithm.ES256KS, JCSSHA256Canonicalizer.getInstance()
3939
)
4040
);
4141

4242
private static final Map<String, List<String>> CRYPTOSUITES_BY_JWS_ALGORITHM = Map.of(
4343
JWSAlgorithm.EdDSA, List.of("eddsa-rdfc-2022", "eddsa-jcs-2022"),
4444
JWSAlgorithm.ES256K, List.of("ecdsa-rdfc-2019", "ecdsa-jcs-2019"),
45-
JWSAlgorithm.ES256KS, List.of("schnorr-secp256k1-rdfc-2025", "schnorr-secp256k1-jcs-2025"),
45+
JWSAlgorithm.ES256KS, List.of("bip340-rdfc-2025", "bip340-jcs-2025"),
4646
JWSAlgorithm.ES256, List.of("ecdsa-rdfc-2019", "ecdsa-jcs-2019"),
4747
JWSAlgorithm.ES384, List.of("ecdsa-rdfc-2019", "ecdsa-jcs-2019"),
4848
JWSAlgorithm.ES512, List.of("ecdsa-rdfc-2019", "ecdsa-jcs-2019")

src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_schnorr_secp256k1_jcs_2025_Test.java renamed to src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_bip340_jcs_2025_Test.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.danubetech.dataintegrity.signer.DataIntegrityProofLdSigner;
55
import com.danubetech.dataintegrity.suites.DataIntegritySuites;
66
import com.danubetech.dataintegrity.util.TestKeys;
7-
import com.danubetech.dataintegrity.util.TestUtil;
87
import com.danubetech.dataintegrity.verifier.DataIntegrityProofLdVerifier;
98
import com.danubetech.keyformats.crypto.PrivateKeySigner;
109
import com.danubetech.keyformats.crypto.PrivateKeySignerFactory;
@@ -30,7 +29,7 @@
3029
import static org.junit.jupiter.api.Assertions.assertEquals;
3130
import static org.junit.jupiter.api.Assertions.assertTrue;
3231

33-
public class JsonLdSignDataIntegrityProof_schnorr_secp256k1_jcs_2025_Test {
32+
public class JsonLdSignDataIntegrityProof_bip340_jcs_2025_Test {
3433

3534
@BeforeEach
3635
public void before() {
@@ -44,7 +43,7 @@ public void before() {
4443
@SuppressWarnings("unchecked")
4544
public void testSign() throws Throwable {
4645

47-
JsonLDObject jsonLdObject = JsonLDObject.fromJson(new InputStreamReader(Objects.requireNonNull(JsonLdSignDataIntegrityProof_schnorr_secp256k1_jcs_2025_Test.class.getResourceAsStream("input.jsonld"))));
46+
JsonLDObject jsonLdObject = JsonLDObject.fromJson(new InputStreamReader(Objects.requireNonNull(JsonLdSignDataIntegrityProof_bip340_jcs_2025_Test.class.getResourceAsStream("input.jsonld"))));
4847
jsonLdObject.setDocumentLoader(DataIntegrityContexts.DOCUMENT_LOADER);
4948

5049
Date created = JsonLDUtils.DATE_FORMAT.parse("2017-10-24T05:33:31Z");
@@ -54,7 +53,7 @@ public void testSign() throws Throwable {
5453

5554
PrivateKeySigner<?> privateKeySigner = PrivateKeySignerFactory.privateKeySignerForKey(KeyTypeName.secp256k1, JWSAlgorithm.ES256KS, TestKeys.testSecp256k1PrivateKey);
5655
DataIntegrityProofLdSigner signer = new DataIntegrityProofLdSigner(privateKeySigner);
57-
signer.setCryptosuite("schnorr-secp256k1-jcs-2025");
56+
signer.setCryptosuite("bip340-jcs-2025");
5857
signer.setCreated(created);
5958
signer.setExpires(expires);
6059
signer.setDomain(domain);
@@ -66,7 +65,7 @@ public void testSign() throws Throwable {
6665
assertEquals(expires, dataIntegrityProof.getExpires());
6766
assertEquals(domain, dataIntegrityProof.getDomain());
6867
assertEquals(nonce, dataIntegrityProof.getNonce());
69-
assertEquals("z58KqoFzyJUKe1m3nLZJrpcncoH963sHVvpnBdbhEhmU1UGewiko16o7oUbVPhzycv33b3EAYkNvBtdQWZqD5so7c", dataIntegrityProof.getProofValue());
68+
assertEquals("z5uS3kTe23v4nAjuB4YfHduuyxvDfiZJEpXeaB6mEfGQr6Gy2Uyi7Ff5byo2BjzWfNPvcMzA5Chyu4P4V8GsbBXxU", dataIntegrityProof.getProofValue());
7069

7170
PublicKeyVerifier<?> publicKeyVerifier = PublicKeyVerifierFactory.publicKeyVerifierForKey(KeyTypeName.secp256k1, JWSAlgorithm.ES256KS, TestKeys.testSecp256k1PublicKey);
7271
DataIntegrityProofLdVerifier verifier = new DataIntegrityProofLdVerifier(publicKeyVerifier);

src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_schnorr_secp256k1_rdfc_2025_Test.java renamed to src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_bip340_rdfc_2025_Test.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.danubetech.dataintegrity.signer.DataIntegrityProofLdSigner;
55
import com.danubetech.dataintegrity.suites.DataIntegritySuites;
66
import com.danubetech.dataintegrity.util.TestKeys;
7-
import com.danubetech.dataintegrity.util.TestUtil;
87
import com.danubetech.dataintegrity.verifier.DataIntegrityProofLdVerifier;
98
import com.danubetech.keyformats.crypto.PrivateKeySigner;
109
import com.danubetech.keyformats.crypto.PrivateKeySignerFactory;
@@ -30,7 +29,7 @@
3029
import static org.junit.jupiter.api.Assertions.assertEquals;
3130
import static org.junit.jupiter.api.Assertions.assertTrue;
3231

33-
public class JsonLdSignDataIntegrityProof_schnorr_secp256k1_rdfc_2025_Test {
32+
public class JsonLdSignDataIntegrityProof_bip340_rdfc_2025_Test {
3433

3534
@BeforeEach
3635
public void before() {
@@ -44,7 +43,7 @@ public void before() {
4443
@SuppressWarnings("unchecked")
4544
public void testSign() throws Throwable {
4645

47-
JsonLDObject jsonLdObject = JsonLDObject.fromJson(new InputStreamReader(Objects.requireNonNull(JsonLdSignDataIntegrityProof_schnorr_secp256k1_rdfc_2025_Test.class.getResourceAsStream("input.jsonld"))));
46+
JsonLDObject jsonLdObject = JsonLDObject.fromJson(new InputStreamReader(Objects.requireNonNull(JsonLdSignDataIntegrityProof_bip340_rdfc_2025_Test.class.getResourceAsStream("input.jsonld"))));
4847
jsonLdObject.setDocumentLoader(DataIntegrityContexts.DOCUMENT_LOADER);
4948

5049
Date created = JsonLDUtils.DATE_FORMAT.parse("2017-10-24T05:33:31Z");
@@ -54,7 +53,7 @@ public void testSign() throws Throwable {
5453

5554
PrivateKeySigner<?> privateKeySigner = PrivateKeySignerFactory.privateKeySignerForKey(KeyTypeName.secp256k1, JWSAlgorithm.ES256KS, TestKeys.testSecp256k1PrivateKey);
5655
DataIntegrityProofLdSigner signer = new DataIntegrityProofLdSigner(privateKeySigner);
57-
signer.setCryptosuite("schnorr-secp256k1-rdfc-2025");
56+
signer.setCryptosuite("bip340-rdfc-2025");
5857
signer.setCreated(created);
5958
signer.setExpires(expires);
6059
signer.setDomain(domain);
@@ -66,7 +65,7 @@ public void testSign() throws Throwable {
6665
assertEquals(expires, dataIntegrityProof.getExpires());
6766
assertEquals(domain, dataIntegrityProof.getDomain());
6867
assertEquals(nonce, dataIntegrityProof.getNonce());
69-
assertEquals("z3vajFqAUAEw6o5BXXNPevSKM14ZXdg6uFz9vND3TQkhmb678QFxAwzu4udPzrYUdmgLqm9Z8esP57TRkb9SdKCt7", dataIntegrityProof.getProofValue());
68+
assertEquals("z2urDk4xts5xTrivYbHRdgFA7S5iA1et8jLqGjj7sVCcXpfHbykpWJoF6Vzr2yyxxjUE7UmTxdADKUoBEE3LcX1TX", dataIntegrityProof.getProofValue());
7069

7170
PublicKeyVerifier<?> publicKeyVerifier = PublicKeyVerifierFactory.publicKeyVerifierForKey(KeyTypeName.secp256k1, JWSAlgorithm.ES256KS, TestKeys.testSecp256k1PublicKey);
7271
DataIntegrityProofLdVerifier verifier = new DataIntegrityProofLdVerifier(publicKeyVerifier);

0 commit comments

Comments
 (0)