From e17da0154cbec3b1fd69b47b275280dd5d966d1a Mon Sep 17 00:00:00 2001 From: Marcos Date: Tue, 15 Oct 2024 10:28:25 -0300 Subject: [PATCH] Rename variables in releaseBtc tests --- .../co/rsk/peg/BridgeSupportReleaseBtcTest.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportReleaseBtcTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportReleaseBtcTest.java index 0fc3d506b3..141a792e5d 100644 --- a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportReleaseBtcTest.java +++ b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportReleaseBtcTest.java @@ -1279,7 +1279,8 @@ void low_amount_release_request_rejected_before_lovell() throws IOException { // Add some extra weis to the value, but less than 1 satoshi. // To ensure that the pegout value is rounded down to fit in satoshis. co.rsk.core.Coin oneSatoshiInWeis = co.rsk.core.Coin.fromBitcoin(Coin.SATOSHI); - co.rsk.core.Coin extraWeis = oneSatoshiInWeis.subtract(co.rsk.core.Coin.valueOf(1)); + co.rsk.core.Coin oneWei = co.rsk.core.Coin.valueOf(Denomination.WEI.longValue()); + co.rsk.core.Coin extraWeis = oneSatoshiInWeis.subtract(oneWei); pegoutRequestValue = pegoutRequestValue.add(extraWeis); bridgeSupport.releaseBtc(buildReleaseRskTx(pegoutRequestValue)); @@ -1375,7 +1376,8 @@ void contract_caller_release_request_rejected_before_lovell() throws IOException // Add some extra weis to the value, but less than 1 satoshi. // To ensure that the pegout value is rounded down to fit in satoshis. co.rsk.core.Coin oneSatoshiInWeis = co.rsk.core.Coin.fromBitcoin(Coin.SATOSHI); - co.rsk.core.Coin extraWeis = oneSatoshiInWeis.subtract(co.rsk.core.Coin.valueOf(1)); + co.rsk.core.Coin oneWei = co.rsk.core.Coin.valueOf(Denomination.WEI.longValue()); + co.rsk.core.Coin extraWeis = oneSatoshiInWeis.subtract(oneWei); pegoutRequestValue = pegoutRequestValue.add(extraWeis); bridgeSupport.releaseBtc(buildReleaseRskTx_fromContract(pegoutRequestValue)); @@ -1422,7 +1424,8 @@ void contract_caller_release_request_rejected_after_lovell() throws IOException // Add some extra weis to the value, but less than 1 satoshi. // To ensure that the pegout value is rounded down to fit in satoshis. co.rsk.core.Coin oneSatoshiInWeis = co.rsk.core.Coin.fromBitcoin(Coin.SATOSHI); - co.rsk.core.Coin extraWeis = oneSatoshiInWeis.subtract(co.rsk.core.Coin.valueOf(1)); + co.rsk.core.Coin oneWei = co.rsk.core.Coin.valueOf(Denomination.WEI.longValue()); + co.rsk.core.Coin extraWeis = oneSatoshiInWeis.subtract(oneWei); pegoutRequestValue = pegoutRequestValue.add(extraWeis); bridgeSupport.releaseBtc(buildReleaseRskTx_fromContract(pegoutRequestValue)); @@ -1480,7 +1483,8 @@ void fee_above_value_release_request_rejected_before_lovell() throws IOException // Add some extra weis to the value, but less than 1 satoshi. // To ensure that the pegout value is rounded down to fit in satoshis. co.rsk.core.Coin oneSatoshiInWeis = co.rsk.core.Coin.fromBitcoin(Coin.SATOSHI); - co.rsk.core.Coin extraWeis = oneSatoshiInWeis.subtract(co.rsk.core.Coin.valueOf(1)); + co.rsk.core.Coin oneWei = co.rsk.core.Coin.valueOf(Denomination.WEI.longValue()); + co.rsk.core.Coin extraWeis = oneSatoshiInWeis.subtract(oneWei); pegoutRequestValue = pegoutRequestValue.add(extraWeis); bridgeSupport.releaseBtc(buildReleaseRskTx(pegoutRequestValue)); @@ -1543,7 +1547,8 @@ void fee_above_value_release_request_rejected_after_lovell() throws IOException // Add some extra weis to the value, but less than 1 satoshi. // To ensure that the pegout value is rounded down to fit in satoshis. co.rsk.core.Coin oneSatoshiInWeis = co.rsk.core.Coin.fromBitcoin(Coin.SATOSHI); - co.rsk.core.Coin extraWeis = oneSatoshiInWeis.subtract(co.rsk.core.Coin.valueOf(1)); + co.rsk.core.Coin oneWei = co.rsk.core.Coin.valueOf(Denomination.WEI.longValue()); + co.rsk.core.Coin extraWeis = oneSatoshiInWeis.subtract(oneWei); pegoutRequestValue = pegoutRequestValue.add(extraWeis); bridgeSupport.releaseBtc(buildReleaseRskTx(pegoutRequestValue));