From 5e96f455a47d8749930f781402febd2c00e01cbd Mon Sep 17 00:00:00 2001 From: Volodymyr Kravets Date: Fri, 28 Mar 2025 18:13:36 +0200 Subject: [PATCH] feat(superchain): update tests --- .../ConfirmedBlocksProviderTest.java | 2 +- .../HSMBookkeepingServiceTest.java | 1 + .../HsmBookkeepingClientImplTest.java | 10 +++++----- .../message/AdvanceBlockchainMessageTest.java | 20 +++++++++---------- .../PowHSMSignerMessageBuilderTest.java | 4 ++-- .../SignerMessageBuilderFactoryTest.java | 1 + .../AncestorBlockUpdaterTest.java | 1 + .../rsk/federate/signing/utils/TestUtils.java | 2 +- 8 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/test/java/co/rsk/federate/signing/hsm/advanceblockchain/ConfirmedBlocksProviderTest.java b/src/test/java/co/rsk/federate/signing/hsm/advanceblockchain/ConfirmedBlocksProviderTest.java index 87f05ebbf..7d9ab31a0 100644 --- a/src/test/java/co/rsk/federate/signing/hsm/advanceblockchain/ConfirmedBlocksProviderTest.java +++ b/src/test/java/co/rsk/federate/signing/hsm/advanceblockchain/ConfirmedBlocksProviderTest.java @@ -368,6 +368,6 @@ private Block buildBlockWithUncles() { .build(); // build block 4 with block 2 and block 3 as uncles List block4Uncles = Arrays.asList(block2Header, block3Header); - return new Block(block4Header, Collections.emptyList(), block4Uncles, true, true); + return new Block(block4Header, Collections.emptyList(), block4Uncles, null, true, true); } } diff --git a/src/test/java/co/rsk/federate/signing/hsm/advanceblockchain/HSMBookkeepingServiceTest.java b/src/test/java/co/rsk/federate/signing/hsm/advanceblockchain/HSMBookkeepingServiceTest.java index b06aec5ab..7b08bb978 100644 --- a/src/test/java/co/rsk/federate/signing/hsm/advanceblockchain/HSMBookkeepingServiceTest.java +++ b/src/test/java/co/rsk/federate/signing/hsm/advanceblockchain/HSMBookkeepingServiceTest.java @@ -349,6 +349,7 @@ void informConfirmedBlockHeaders_onIrrecoverableError() throws HSMClientExceptio blockHeaderBuilder.setNumber(1).build(), Collections.emptyList(), Collections.emptyList(), + null, true, true ); diff --git a/src/test/java/co/rsk/federate/signing/hsm/advanceblockchain/HsmBookkeepingClientImplTest.java b/src/test/java/co/rsk/federate/signing/hsm/advanceblockchain/HsmBookkeepingClientImplTest.java index d491f2600..9027cb191 100644 --- a/src/test/java/co/rsk/federate/signing/hsm/advanceblockchain/HsmBookkeepingClientImplTest.java +++ b/src/test/java/co/rsk/federate/signing/hsm/advanceblockchain/HsmBookkeepingClientImplTest.java @@ -633,11 +633,11 @@ private List buildBlocks() { ); return Arrays.asList( - new Block(block1Header, Collections.emptyList(), block1Uncles, true, true), - new Block(block2Header, Collections.emptyList(), block2Uncles, true, true), - new Block(block3Header, Collections.emptyList(), block3Uncles, true, true), - new Block(block4Header, Collections.emptyList(), block4Uncles, true, true), - new Block(block5Header, Collections.emptyList(), block5Uncles, true, true) + new Block(block1Header, Collections.emptyList(), block1Uncles, null, true, true), + new Block(block2Header, Collections.emptyList(), block2Uncles, null, true, true), + new Block(block3Header, Collections.emptyList(), block3Uncles, null, true, true), + new Block(block4Header, Collections.emptyList(), block4Uncles, null, true, true), + new Block(block5Header, Collections.emptyList(), block5Uncles, null, true, true) ); } diff --git a/src/test/java/co/rsk/federate/signing/hsm/message/AdvanceBlockchainMessageTest.java b/src/test/java/co/rsk/federate/signing/hsm/message/AdvanceBlockchainMessageTest.java index 06e884bf9..a8134e194 100644 --- a/src/test/java/co/rsk/federate/signing/hsm/message/AdvanceBlockchainMessageTest.java +++ b/src/test/java/co/rsk/federate/signing/hsm/message/AdvanceBlockchainMessageTest.java @@ -172,11 +172,11 @@ private List buildBlocks() { ); return Arrays.asList( - new Block(block1Header, Collections.emptyList(), block1Uncles, true, true), - new Block(block2Header, Collections.emptyList(), block2Uncles, true, true), - new Block(block3Header, Collections.emptyList(), block3Uncles, true, true), - new Block(block4Header, Collections.emptyList(), block4Uncles, true, true), - new Block(block5Header, Collections.emptyList(), block5Uncles, true, true) + new Block(block1Header, Collections.emptyList(), block1Uncles, null, true, true), + new Block(block2Header, Collections.emptyList(), block2Uncles, null, true, true), + new Block(block3Header, Collections.emptyList(), block3Uncles, null, true, true), + new Block(block4Header, Collections.emptyList(), block4Uncles, null, true, true), + new Block(block5Header, Collections.emptyList(), block5Uncles, null, true, true) ); } @@ -342,11 +342,11 @@ private List buildBlocksWithMultipleBrothers() { ); return Arrays.asList( - new Block(blocks.get(0).getHeader(), Collections.emptyList(), block1Uncles, true, true), - new Block(blocks.get(1).getHeader(), Collections.emptyList(), block2Uncles, true, true), - new Block(blocks.get(2).getHeader(), Collections.emptyList(), block3Uncles, true, true), - new Block(blocks.get(3).getHeader(), Collections.emptyList(), block4Uncles, true, true), - new Block(blocks.get(4).getHeader(), Collections.emptyList(), block5Uncles, true, true) + new Block(blocks.get(0).getHeader(), Collections.emptyList(), block1Uncles, null, true, true), + new Block(blocks.get(1).getHeader(), Collections.emptyList(), block2Uncles, null, true, true), + new Block(blocks.get(2).getHeader(), Collections.emptyList(), block3Uncles, null, true, true), + new Block(blocks.get(3).getHeader(), Collections.emptyList(), block4Uncles, null, true, true), + new Block(blocks.get(4).getHeader(), Collections.emptyList(), block5Uncles, null, true, true) ); } diff --git a/src/test/java/co/rsk/federate/signing/hsm/message/PowHSMSignerMessageBuilderTest.java b/src/test/java/co/rsk/federate/signing/hsm/message/PowHSMSignerMessageBuilderTest.java index e928fce4f..f7c4410f6 100644 --- a/src/test/java/co/rsk/federate/signing/hsm/message/PowHSMSignerMessageBuilderTest.java +++ b/src/test/java/co/rsk/federate/signing/hsm/message/PowHSMSignerMessageBuilderTest.java @@ -108,7 +108,7 @@ private Block createBlock(int blockNumber, List rskTxs) { BlockHeader blockHeader = new BlockHeaderBuilder(mock(ActivationConfig.class)).setNumber( blockNumber).setParentHashFromKeccak256(TestUtils.createHash(parentBlockNumber)) .build(); - return new Block(blockHeader, rskTxs, Collections.emptyList(), true, true); + return new Block(blockHeader, rskTxs, Collections.emptyList(), null, true, true); } @Test @@ -154,7 +154,7 @@ void createHSMVersion2Message() throws SignerMessageBuilderException { void buildMessageForIndex_fails() { BlockHeaderBuilder blockHeaderBuilder = new BlockHeaderBuilder( mock(ActivationConfig.class)); - Block block = new Block(blockHeaderBuilder.setNumber(1).build(), Collections.singletonList(pegoutCreationRskTx), Collections.emptyList(), true, true); + Block block = new Block(blockHeaderBuilder.setNumber(1).build(), Collections.singletonList(pegoutCreationRskTx), Collections.emptyList(), null, true, true); ReleaseCreationInformation releaseCreationInformation = new ReleaseCreationInformation( block, pegoutCreationRskTxReceipt, pegoutCreationRskTx.getHash(), mock(BtcTransaction.class), diff --git a/src/test/java/co/rsk/federate/signing/hsm/message/SignerMessageBuilderFactoryTest.java b/src/test/java/co/rsk/federate/signing/hsm/message/SignerMessageBuilderFactoryTest.java index b08c4af17..823b273d3 100644 --- a/src/test/java/co/rsk/federate/signing/hsm/message/SignerMessageBuilderFactoryTest.java +++ b/src/test/java/co/rsk/federate/signing/hsm/message/SignerMessageBuilderFactoryTest.java @@ -64,6 +64,7 @@ void test_buildFromConfig_hsm(int version) throws HSMUnsupportedVersionException blockHeaderBuilder.setNumber(1).build(), Collections.emptyList(), Collections.emptyList(), + null, true, true ); diff --git a/src/test/java/co/rsk/federate/signing/hsm/requirements/AncestorBlockUpdaterTest.java b/src/test/java/co/rsk/federate/signing/hsm/requirements/AncestorBlockUpdaterTest.java index f486e73bf..be64b10de 100644 --- a/src/test/java/co/rsk/federate/signing/hsm/requirements/AncestorBlockUpdaterTest.java +++ b/src/test/java/co/rsk/federate/signing/hsm/requirements/AncestorBlockUpdaterTest.java @@ -99,6 +99,7 @@ void ensureSignerAncestorBlockInPosition_hsm_throws_exception() throws Exception blockHeaderBuilder.setNumber(1).build(), Collections.emptyList(), Collections.emptyList(), + null, true, true ); diff --git a/src/test/java/co/rsk/federate/signing/utils/TestUtils.java b/src/test/java/co/rsk/federate/signing/utils/TestUtils.java index ccf80e017..11af6578a 100644 --- a/src/test/java/co/rsk/federate/signing/utils/TestUtils.java +++ b/src/test/java/co/rsk/federate/signing/utils/TestUtils.java @@ -48,7 +48,7 @@ public static Block createBlock(int blockNumber, List rskTxs) { .setNumber(blockNumber) .setParentHashFromKeccak256(TestUtils.createHash(parentBlockNumber)) .build(); - return new Block(blockHeader, rskTxs, Collections.emptyList(), true, true); + return new Block(blockHeader, rskTxs, Collections.emptyList(), null, true, true); } public static Keccak256 createHash(int nHash) {