Fix after merging develop

Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech>
hashgraph · Nov 10, 2023 · df9bdd6 · df9bdd6
1 parent 6672582
commit df9bdd6
Show file tree

Hide file tree

Showing 27 changed files with 101 additions and 101 deletions.
diff --git a/...p/service/contract/impl/test/exec/systemcontracts/hts/allowance/GetAllowanceCallTest.java b/...p/service/contract/impl/test/exec/systemcontracts/hts/allowance/GetAllowanceCallTest.java
@@ -57,7 +57,7 @@ void revertsWithFungibleToken() {
                 true,
                 true);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.REVERT, result.getState());
         assertEquals(revertOutputFor(INVALID_TOKEN_ID), result.getOutput());
@@ -77,7 +77,7 @@ void ERCGetAllowance() {
         given(addressIdConverter.convert(any())).willReturn(B_NEW_ACCOUNT_ID);
         given(nativeOperations.getAccount(B_NEW_ACCOUNT_ID.accountNumOrThrow())).willReturn(OPERATOR);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
                 Bytes.wrap(GetAllowanceTranslator.ERC_GET_ALLOWANCE
@@ -101,7 +101,7 @@ void getAllowance() {
         given(addressIdConverter.convert(any())).willReturn(B_NEW_ACCOUNT_ID);
         given(nativeOperations.getAccount(B_NEW_ACCOUNT_ID.accountNumOrThrow())).willReturn(OPERATOR);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
                 Bytes.wrap(GetAllowanceTranslator.GET_ALLOWANCE

diff --git a/.../app/service/contract/impl/test/exec/systemcontracts/hts/balanceof/BalanceOfCallTest.java b/.../app/service/contract/impl/test/exec/systemcontracts/hts/balanceof/BalanceOfCallTest.java
@@ -48,7 +48,7 @@ class BalanceOfCallTest extends HtsCallTestBase {
     void revertsWithMissingToken() {
         subject = new BalanceOfCall(mockEnhancement(), gasCalculator, null, OWNER);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.REVERT, result.getState());
         assertEquals(revertOutputFor(INVALID_TOKEN_ID), result.getOutput());
@@ -59,7 +59,7 @@ void revertsWithMissingAccount() {
         subject = new BalanceOfCall(mockEnhancement(), gasCalculator, FUNGIBLE_TOKEN, OWNER);
         given(nativeOperations.resolveAlias(tuweniToPbjBytes(EIP_1014_ADDRESS))).willReturn(MISSING_ENTITY_NUMBER);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.REVERT, result.getState());
         assertEquals(revertOutputFor(INVALID_ACCOUNT_ID), result.getOutput());
@@ -72,7 +72,7 @@ void returnsZeroBalanceForAbsentRelationship() {
                 .willReturn(A_NEW_ACCOUNT_ID.accountNumOrThrow());
         given(nativeOperations.getAccount(A_NEW_ACCOUNT_ID.accountNumOrThrow())).willReturn(ALIASED_SOMEBODY);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -92,7 +92,7 @@ void returnsNominalBalanceForPresentRelationship() {
                 .willReturn(A_FUNGIBLE_RELATION);
         given(nativeOperations.getAccount(A_NEW_ACCOUNT_ID.accountNumOrThrow())).willReturn(ALIASED_SOMEBODY);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(

diff --git a/...pp/service/contract/impl/test/exec/systemcontracts/hts/create/ClassicCreatesCallTest.java b/...pp/service/contract/impl/test/exec/systemcontracts/hts/create/ClassicCreatesCallTest.java
@@ -69,7 +69,7 @@ void createFungibleTokenHappyPathV1() {
         commonGivens();
         given(recordBuilder.status()).willReturn(SUCCESS);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -84,7 +84,7 @@ void createFungibleTokenHappyPathV2() {
         commonGivens();
         given(recordBuilder.status()).willReturn(SUCCESS);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -99,7 +99,7 @@ void createFungibleTokenHappyPathV3() {
         commonGivens();
         given(recordBuilder.status()).willReturn(SUCCESS);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -114,7 +114,7 @@ void createFungibleTokenWithCustomFeesHappyPathV1() {
         commonGivens();
         given(recordBuilder.status()).willReturn(SUCCESS);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -129,7 +129,7 @@ void createFungibleTokenWithCustomFeesHappyPathV2() {
         commonGivens();
         given(recordBuilder.status()).willReturn(SUCCESS);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -144,7 +144,7 @@ void createFungibleTokenWithCustomFeesHappyPathV3() {
         commonGivens();
         given(recordBuilder.status()).willReturn(SUCCESS);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -159,7 +159,7 @@ void createNonFungibleTokenHappyPathV1() {
         commonGivens();
         given(recordBuilder.status()).willReturn(SUCCESS);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -174,7 +174,7 @@ void createNonFungibleTokenHappyPathV2() {
         commonGivens();
         given(recordBuilder.status()).willReturn(SUCCESS);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -189,7 +189,7 @@ void createNonFungibleTokenHappyPathV3() {
         commonGivens();
         given(recordBuilder.status()).willReturn(SUCCESS);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -204,7 +204,7 @@ void createNonFungibleTokenWithCustomFeesHappyPathV1() {
         commonGivens();
         given(recordBuilder.status()).willReturn(SUCCESS);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -219,7 +219,7 @@ void createNonFungibleTokenWithCustomFeesHappyPathV2() {
         commonGivens();
         given(recordBuilder.status()).willReturn(SUCCESS);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -234,7 +234,7 @@ void createNonFungibleTokenWithCustomFeesHappyPathV3() {
         commonGivens();
         given(recordBuilder.status()).willReturn(SUCCESS);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -249,7 +249,7 @@ void createFungibleTokenUnhappyPathRevertsWithReason() {
         commonGivens();
         given(recordBuilder.status()).willReturn(TOKEN_HAS_NO_SUPPLY_KEY);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.REVERT, result.getState());
         assertEquals(Bytes.wrap(TOKEN_HAS_NO_SUPPLY_KEY.protoName().getBytes()), result.getOutput());

diff --git a/...rvice/contract/impl/test/exec/systemcontracts/hts/customfees/TokenCustomFeesCallTest.java b/...rvice/contract/impl/test/exec/systemcontracts/hts/customfees/TokenCustomFeesCallTest.java
@@ -41,7 +41,7 @@ class TokenCustomFeesCallTest extends HtsCallTestBase {
     void returnsTokenCustomFeesStatusForPresentToken() {
         final var subject = new TokenCustomFeesCall(gasCalculator, mockEnhancement(), false, FUNGIBLE_EVERYTHING_TOKEN);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -61,7 +61,7 @@ void returnsTokenCustomFeesStatusForPresentToken() {
     void returnsTokenCustomFeesStatusForMissingToken() {
         final var subject = new TokenCustomFeesCall(gasCalculator, mockEnhancement(), false, null);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -80,7 +80,7 @@ void returnsTokenCustomFeesStatusForMissingToken() {
     void returnsTokenCustomFeesStatusForMissingTokenStaticCall() {
         final var subject = new TokenCustomFeesCall(gasCalculator, mockEnhancement(), true, null);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(

diff --git a/...de/app/service/contract/impl/test/exec/systemcontracts/hts/decimals/DecimalsCallTest.java b/...de/app/service/contract/impl/test/exec/systemcontracts/hts/decimals/DecimalsCallTest.java
@@ -38,7 +38,7 @@ class DecimalsCallTest extends HtsCallTestBase {
     void revertsWithNonfungibleToken() {
         subject = new DecimalsCall(mockEnhancement(), gasCalculator, NON_FUNGIBLE_TOKEN);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.REVERT, result.getState());
         assertEquals(revertOutputFor(INVALID_TOKEN_ID), result.getOutput());
@@ -48,7 +48,7 @@ void revertsWithNonfungibleToken() {
     void returnsInRangeDecimalsForPresentToken() {
         subject = new DecimalsCall(mockEnhancement(), gasCalculator, FUNGIBLE_TOKEN);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -63,7 +63,7 @@ void returnsInRangeDecimalsForPresentToken() {
     void returnsMaxDecimalsForUnreasonableToken() {
         subject = new DecimalsCall(mockEnhancement(), gasCalculator, UNREASONABLY_DIVISIBLE_TOKEN);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(

diff --git a/...t/impl/test/exec/systemcontracts/hts/defaultfreezestatus/DefaultFreezeStatusCallTest.java b/...t/impl/test/exec/systemcontracts/hts/defaultfreezestatus/DefaultFreezeStatusCallTest.java
@@ -37,7 +37,7 @@ class DefaultFreezeStatusCallTest extends HtsCallTestBase {
     void returnsDefaultFreezeStatusForPresentToken() {
         final var subject = new DefaultFreezeStatusCall(gasCalculator, mockEnhancement(), false, FUNGIBLE_TOKEN);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -52,7 +52,7 @@ void returnsDefaultFreezeStatusForPresentToken() {
     void returnsDefaultFreezeStatusForMissingToken() {
         final var subject = new DefaultFreezeStatusCall(gasCalculator, mockEnhancement(), false, null);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -67,7 +67,7 @@ void returnsDefaultFreezeStatusForMissingToken() {
     void returnsDefaultFreezeStatusForMissingTokenStaticCall() {
         final var subject = new DefaultFreezeStatusCall(gasCalculator, mockEnhancement(), true, null);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.REVERT, result.getState());
         assertEquals(revertOutputFor(INVALID_TOKEN_ID), result.getOutput());

diff --git a/...ontract/impl/test/exec/systemcontracts/hts/defaultkycstatus/DefaultKycStatusCallTest.java b/...ontract/impl/test/exec/systemcontracts/hts/defaultkycstatus/DefaultKycStatusCallTest.java
@@ -37,7 +37,7 @@ class DefaultKycStatusCallTest extends HtsCallTestBase {
     void returnsDefaultKycStatusForPresentToken() {
         final var subject = new DefaultKycStatusCall(gasCalculator, mockEnhancement(), false, FUNGIBLE_TOKEN);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -52,7 +52,7 @@ void returnsDefaultKycStatusForPresentToken() {
     void returnsDefaultKycStatusForMissingToken() {
         final var subject = new DefaultKycStatusCall(gasCalculator, mockEnhancement(), false, null);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -67,7 +67,7 @@ void returnsDefaultKycStatusForMissingToken() {
     void returnsDefaultKycStatusForMissingTokenStaticCall() {
         final var subject = new DefaultKycStatusCall(gasCalculator, mockEnhancement(), true, null);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.REVERT, result.getState());
         assertEquals(revertOutputFor(INVALID_TOKEN_ID), result.getOutput());

diff --git a/...tract/impl/test/exec/systemcontracts/hts/fungibletokeninfo/FungibleTokenInfoCallTest.java b/...tract/impl/test/exec/systemcontracts/hts/fungibletokeninfo/FungibleTokenInfoCallTest.java
@@ -62,7 +62,7 @@ void returnsFungibleTokenInfoStatusForPresentToken() {
         final var subject =
                 new FungibleTokenInfoCall(gasCalculator, mockEnhancement(), false, FUNGIBLE_EVERYTHING_TOKEN, config);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -104,7 +104,7 @@ void returnsFungibleTokenInfoStatusForMissingToken() {
 
         final var subject = new FungibleTokenInfoCall(gasCalculator, mockEnhancement(), false, null, config);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -145,7 +145,7 @@ void returnsFungibleTokenInfoStatusForMissingTokenStaticCall() {
 
         final var subject = new FungibleTokenInfoCall(gasCalculator, mockEnhancement(), true, null, config);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.REVERT, result.getState());
         assertEquals(revertOutputFor(INVALID_TOKEN_ID), result.getOutput());

diff --git a/.../service/contract/impl/test/exec/systemcontracts/hts/getapproved/GetApprovedCallTest.java b/.../service/contract/impl/test/exec/systemcontracts/hts/getapproved/GetApprovedCallTest.java
@@ -44,7 +44,7 @@ public class GetApprovedCallTest extends HtsCallTestBase {
     void revertsWithFungibleTokenStaticCall() {
         subject = new GetApprovedCall(gasCalculator, mockEnhancement(), FUNGIBLE_TOKEN, 123L, true, true);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.REVERT, result.getState());
         assertEquals(revertOutputFor(INVALID_TOKEN_ID), result.getOutput());
@@ -54,7 +54,7 @@ void revertsWithFungibleTokenStaticCall() {
     void revertsWithFungibleToken() {
         subject = new GetApprovedCall(gasCalculator, mockEnhancement(), FUNGIBLE_TOKEN, 123L, true, false);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.REVERT, result.getState());
         assertEquals(revertOutputFor(INVALID_TOKEN_NFT_SERIAL_NUMBER), result.getOutput());
@@ -67,7 +67,7 @@ void getApprovedErc() {
         given(nativeOperations.getNft(9898L, 123)).willReturn(CIVILIAN_OWNED_NFT);
         given(nativeOperations.getAccount(B_NEW_ACCOUNT_ID.accountNumOrThrow())).willReturn(OPERATOR);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
                 Bytes.wrap(GetApprovedTranslator.ERC_GET_APPROVED
@@ -83,7 +83,7 @@ void getApprovedHapi() {
         given(nativeOperations.getNft(9898L, 123)).willReturn(CIVILIAN_OWNED_NFT);
         given(nativeOperations.getAccount(B_NEW_ACCOUNT_ID.accountNumOrThrow())).willReturn(OPERATOR);
 
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
                 Bytes.wrap(GetApprovedTranslator.HAPI_GET_APPROVED

diff --git a/...e/contract/impl/test/exec/systemcontracts/hts/grantapproval/ERCGrantApprovalCallTest.java b/...e/contract/impl/test/exec/systemcontracts/hts/grantapproval/ERCGrantApprovalCallTest.java
@@ -72,7 +72,7 @@ void erc20approve() {
                         eq(SingleTransactionRecordBuilder.class)))
                 .willReturn(recordBuilder);
         given(recordBuilder.status()).willReturn(ResponseCodeEnum.SUCCESS);
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(
@@ -99,7 +99,7 @@ void erc721approve() {
                         eq(SingleTransactionRecordBuilder.class)))
                 .willReturn(recordBuilder);
         given(recordBuilder.status()).willReturn(ResponseCodeEnum.SUCCESS);
-        final var result = subject.execute(frame).fullResult().result();
+        final var result = subject.execute().fullResult().result();
 
         assertEquals(MessageFrame.State.COMPLETED_SUCCESS, result.getState());
         assertEquals(