Skip to content

Commit

Permalink
end 1.2.1 development cycle
Browse files Browse the repository at this point in the history
  • Loading branch information
joaquinlpereyra-iov committed Jan 17, 2020
1 parent c1c42fd commit 45baf4c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion rskj-core/src/main/resources/version.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
versionNumber='1.2.0'
versionNumber='1.2.1'
modifier="WASABI"
8 changes: 4 additions & 4 deletions rskj-core/src/test/java/co/rsk/mine/MinerServerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ public void extraDataNotInitializedWithClientData() {

byte[] secondItem = decodedExtraData.get(1).getRLPData();
assertNotNull(secondItem);
assertEquals("SNAPSHOT-cb7f28e", new String(secondItem));
assertEquals("WASABI-cb7f28e", new String(secondItem));
}

@Test
Expand Down Expand Up @@ -833,7 +833,7 @@ public void extraDataWithClientData() {

byte[] secondItem = decodedExtraData.get(1).getRLPData();
assertNotNull(secondItem);
assertEquals("SNAPSHOT-cb7f28e", new String(secondItem));
assertEquals("WASABI-cb7f28e", new String(secondItem));

byte[] thirdItem = decodedExtraData.get(2).getRLPData();
assertNotNull(thirdItem);
Expand Down Expand Up @@ -868,11 +868,11 @@ public void extraDataWithClientDataMoreThan32Bytes() {

byte[] secondItem = decodedExtraData.get(1).getRLPData();
assertNotNull(secondItem);
assertEquals("SNAPSHOT-cb7f28e", new String(secondItem));
assertEquals("WASABI-cb7f28e", new String(secondItem));

byte[] thirdItem = decodedExtraData.get(2).getRLPData();
assertNotNull(thirdItem);
assertEquals("tincho is th", new String(thirdItem));
assertEquals("tincho is the ", new String(thirdItem));
}

private BtcBlock getMergedMiningBlockWithOnlyCoinbase(MinerWork work) {
Expand Down

0 comments on commit 45baf4c

Please sign in to comment.