Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update bitcoinj-thin version to 0.14.4-rsk-17 #2934

Merged
merged 2 commits into from
Jan 15, 2025
+6 −14
Merged

Update bitcoinj-thin version to 0.14.4-rsk-17 #2934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb8723d
- Update bitcoinj-thin version to 0.14.4-rsk-17
nathanieliov Jan 15, 2025
33bc1d4
Get rid of use of findWitnessCommitment from bitcoinj-thin
nathanieliov Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
<sha256 value="c717c468bfc91536f1dbc0d98d6116a8e7c49fbaff643ef8710e7505cc450878" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="co.rsk.bitcoinj" name="bitcoinj-thin" version="0.14.4-rsk-16">
<artifact name="bitcoinj-thin-0.14.4-rsk-16.jar">
<sha256 value="53957d6941a882f7aa33188da3dadcf96f15fa2ffd62e9130937eb84e98f11a4" origin="Generated by Gradle"/>
<component group="co.rsk.bitcoinj" name="bitcoinj-thin" version="0.14.4-rsk-17">
<artifact name="bitcoinj-thin-0.14.4-rsk-17.jar">
<sha256 value="beff6002e72162984daa3e7016b1a6fb6d372e5cfb14101a50d150c0adfbda71" origin="Generated by Gradle"/>
</artifact>
<artifact name="bitcoinj-thin-0.14.4-rsk-16.pom">
<sha256 value="ea7726838385d7694f63622398d871b92a247b83418fe4d6cb9c6f3d5991fd3a" origin="Generated by Gradle"/>
<artifact name="bitcoinj-thin-0.14.4-rsk-17.pom">
<sha256 value="32fca4aac555f60d824cda58f69e64a7641f60dbbf5ec733966dbe2ded3214d7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.diffplug.durian" name="durian-collect" version="1.2.0">
Expand Down
2 changes: 1 addition & 1 deletion rskj-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ ext {
jaxwsRtVer : '2.3.5',
picocliVer : '4.6.3',

bitcoinjThinVer: '0.14.4-rsk-17-SNAPSHOT',
bitcoinjThinVer: '0.14.4-rsk-17',
rskjNativeVer: '1.3.0',
]

Expand Down
8 changes: 0 additions & 8 deletions rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,6 @@ void findWitnessCommitment_whenTxHasNoOutputs_shouldThrowException() {

// Act
assertThrows(IllegalStateException.class, () -> BitcoinUtils.findWitnessCommitment(btcTx));
assertThrows(IllegalStateException.class, btcTx::findWitnessCommitment);
}

@Test
Expand All @@ -417,7 +416,6 @@ void findWitnessCommitment_whenTxIsNotCoinbase_shouldThrowException() {

// Act
assertThrows(IllegalStateException.class, () -> BitcoinUtils.findWitnessCommitment(btcTx));
assertThrows(IllegalStateException.class, btcTx::findWitnessCommitment);
}

@Test
Expand All @@ -430,7 +428,6 @@ void findWitnessCommitment_whenNoWitnessCommitment_shouldReturnEmpty() {

// Assert
assertFalse(witnessCommitment.isPresent());
assertNull(btcTx.findWitnessCommitment());
}

@Test
Expand All @@ -448,7 +445,6 @@ void findWitnessCommitment_withWitnessCommitment_shouldReturnExpectedValue() {
// Assert
assertTrue(witnessCommitmentFound.isPresent());
assertEquals(witnessCommitment, witnessCommitmentFound.get());
assertEquals(witnessCommitment, btcTx.findWitnessCommitment());
}

@Test
Expand All @@ -468,7 +464,6 @@ void findWitnessCommitment_withMultipleWitnessCommitments_shouldReturnLastOne()
// Assert
assertTrue(witnessCommitmentFound.isPresent());
assertEquals(witnessCommitment3, witnessCommitmentFound.get());
assertEquals(witnessCommitment3, btcTx.findWitnessCommitment());
}

@Test
Expand All @@ -485,7 +480,6 @@ void findWitnessCommitment_withWrongWitnessCommitment_shouldReturnEmpty() {

// Assert
assertFalse(witnessCommitment.isPresent());
assertEquals(fakeWitnessCommitment, btcTx.findWitnessCommitment()); // bitcoinj implementation detects it as a valid witness commitment
}

@Test
Expand All @@ -502,7 +496,6 @@ void findWitnessCommitment_withRealTransaction_shouldReturnExpectedValue() {
// Assert
assertTrue(witnessCommitment.isPresent());
assertEquals(expectedWitnessCommitment, witnessCommitment.get());
assertEquals(expectedWitnessCommitment, btcTx.findWitnessCommitment());
}
}

Expand Down Expand Up @@ -530,6 +523,5 @@ void findWitnessCommitment_withDataLargenThanExpected_shouldReturnEmpty() {

// Assert, should not find the commitment since the data length != 36 bytes
assertFalse(obtainedWitnessCommitment.isPresent());
assertNull(btcTx.findWitnessCommitment());
}
}
Loading