using default treasuryAccount, change from customizable method, const…

…ant extract and remove method Signed-off-by: filev94 <[email protected]>
hiero-ledger · Feb 5, 2025 · 680d543 · 680d543
1 parent bb04bf6
commit 680d543
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 32 deletions.
diff --git a/...or-web3/src/test/java/com/hedera/mirror/web3/service/AbstractContractCallServiceTest.java b/...or-web3/src/test/java/com/hedera/mirror/web3/service/AbstractContractCallServiceTest.java
@@ -73,6 +73,7 @@
 public abstract class AbstractContractCallServiceTest extends Web3IntegrationTest {
 
     protected static final String TREASURY_ADDRESS = EvmTokenUtils.toAddress(2).toHexString();
+    public static final long BALANCE = 1_000_000_000_000_000L;
 
     @Resource
     protected TestWeb3jService testWeb3jService;
@@ -236,15 +237,6 @@ protected Token fungibleTokenPersist() {
         return fungibleTokenCustomizable(t -> {});
     }
 
-    /**
-     *
-     * @param treasuryEntity - the treasuryEntity that has to be set in the token
-     * @return Token object that is persisted in db
-     */
-    protected Token fungibleTokenPersistWithTreasuryAccount(final Entity treasuryEntity) {
-        return fungibleTokenCustomizable(t -> t.treasuryAccountId(treasuryEntity.toEntityId()));
-    }
-
     /**
      *
      * @param treasuryEntityId - the treasuryEntityId that has to be set in the token
@@ -370,11 +362,11 @@ protected NftAllowance nftAllowancePersist(Token token, Entity owner, Entity spe
      */
     protected Entity accountEntityPersist() {
         return accountEntityPersistCustomizable(
-                e -> e.type(EntityType.ACCOUNT).evmAddress(null).alias(null).balance(100_000_000_000_000_000L));
+                e -> e.type(EntityType.ACCOUNT).evmAddress(null).alias(null).balance(BALANCE));
     }
 
     protected Entity accountEntityWithEvmAddressPersist() {
-        return accountEntityPersistCustomizable(e -> e.type(EntityType.ACCOUNT).balance(1_000_000_000_000_000L));
+        return accountEntityPersistCustomizable(e -> e.type(EntityType.ACCOUNT).balance(BALANCE));
     }
 
     /**

diff --git a/.../com/hedera/mirror/web3/service/ContractCallServiceERCTokenModificationFunctionsTest.java b/.../com/hedera/mirror/web3/service/ContractCallServiceERCTokenModificationFunctionsTest.java
@@ -161,8 +161,7 @@ void approveFungibleTokenWithAlias() {
         // Given
         final var spender =
                 accountPersistWithAlias(SPENDER_ALIAS, SPENDER_PUBLIC_KEY).toEntityId();
-        final var treasury = accountEntityPersist();
-        final var token = fungibleTokenPersistWithTreasuryAccount(treasury);
+        final var token = fungibleTokenPersist();
         final var amountGranted = 13L;
         final var tokenEntity = entityIdFromEvmAddress(toAddress(token.getTokenId()));
         final var tokenAddress = toAddress(token.getTokenId());
@@ -203,8 +202,7 @@ void approveNFTWithAlias() {
     void transfer() {
         // Given
         final var recipient = accountEntityPersist().toEntityId();
-        final var treasury = accountEntityPersist();
-        final var token = fungibleTokenPersistWithTreasuryAccount(treasury);
+        final var token = fungibleTokenPersist();
         final var tokenEntity = entityIdFromEvmAddress(toAddress(token.getTokenId()));
         final var tokenAddress = toAddress(tokenEntity.getId());
         tokenAssociateAccountPersist(recipient, entityIdFromEvmAddress(toAddress(tokenEntity.getId())));
@@ -225,11 +223,10 @@ void transfer() {
     @Test
     void transferFrom() {
         // Given
-        final var treasury = accountEntityPersist();
         final var owner = accountEntityPersist().toEntityId();
         final var recipient = accountEntityPersist().toEntityId();
 
-        final var token = fungibleTokenPersistWithTreasuryAccount(treasury);
+        final var token = fungibleTokenPersist();
         final var tokenEntity = entityIdFromEvmAddress(toAddress(token.getTokenId()));
         tokenAssociateAccountPersist(owner, tokenEntity);
         tokenAssociateAccountPersist(recipient, tokenEntity);
@@ -317,8 +314,7 @@ void transferFromNFT() {
     void transferWithAlias() {
         // Given
         final var recipient = accountPersistWithAlias(SPENDER_ALIAS, SPENDER_PUBLIC_KEY);
-        final var treasury = accountPersistWithAlias(SENDER_ALIAS, SENDER_PUBLIC_KEY);
-        final var token = fungibleTokenPersistWithTreasuryAccount(treasury);
+        final var token = fungibleTokenPersist();
         tokenAssociateAccountPersist(recipient.toEntityId(), entityIdFromEvmAddress(toAddress(token.getTokenId())));
 
         final var contract = testWeb3jService.deploy(ERCTestContract::deploy);
@@ -337,12 +333,11 @@ void transferWithAlias() {
     @Test
     void transferFromWithAlias() {
         // Given
-        final var treasury = accountEntityPersist();
         final var owner =
                 accountPersistWithAlias(SENDER_ALIAS, SENDER_PUBLIC_KEY).toEntityId();
         final var recipient =
                 accountPersistWithAlias(SPENDER_ALIAS, SPENDER_PUBLIC_KEY).toEntityId();
-        final var token = fungibleTokenPersistWithTreasuryAccount(treasury);
+        final var token = fungibleTokenPersist();
         final var tokenEntity = entityIdFromEvmAddress(toAddress(token.getTokenId()));
         tokenAssociateAccountPersist(owner, tokenEntity);
         tokenAssociateAccountPersist(recipient, tokenEntity);
@@ -496,8 +491,7 @@ void approveNFTWithAliasRedirect() {
     void transferRedirect() {
         // Given
         final var recipient = accountEntityPersist().toEntityId();
-        final var treasury = accountEntityPersist();
-        final var token = fungibleTokenPersistWithTreasuryAccount(treasury);
+        final var token = fungibleTokenPersist();
         final var amount = 10L;
 
         final var tokenEntity = entityIdFromEvmAddress(toAddress(token.getTokenId()));
@@ -518,11 +512,10 @@ void transferRedirect() {
     @Test
     void transferFromRedirect() {
         // Given
-        final var treasury = accountEntityPersist();
         final var owner = accountEntityPersist().toEntityId();
         final var recipient = accountEntityPersist().toEntityId();
 
-        final var token = fungibleTokenPersistWithTreasuryAccount(treasury);
+        final var token = fungibleTokenPersist();
         final var tokenEntity = entityIdFromEvmAddress(toAddress(token.getTokenId()));
         tokenAssociateAccountPersist(owner, tokenEntity);
         tokenAssociateAccountPersist(recipient, tokenEntity);
@@ -614,8 +607,7 @@ void transferWithAliasRedirect() {
         // Given
         final var recipient =
                 accountPersistWithAlias(SPENDER_ALIAS, SPENDER_PUBLIC_KEY).toEntityId();
-        final var treasury = accountPersistWithAlias(SENDER_ALIAS, SENDER_PUBLIC_KEY);
-        final var token = fungibleTokenPersistWithTreasuryAccount(treasury);
+        final var token = fungibleTokenPersist();
         tokenAssociateAccountPersist(recipient, entityIdFromEvmAddress(toAddress(token.getTokenId())));
 
         final var contract = testWeb3jService.deploy(RedirectTestContract::deploy);
@@ -634,12 +626,11 @@ void transferWithAliasRedirect() {
     @Test
     void transferFromWithAliasRedirect() {
         // Given
-        final var treasury = accountEntityPersist();
         final var owner =
                 accountPersistWithAlias(SENDER_ALIAS, SENDER_PUBLIC_KEY).toEntityId();
         final var recipient =
                 accountPersistWithAlias(SPENDER_ALIAS, SPENDER_PUBLIC_KEY).toEntityId();
-        final var token = fungibleTokenPersistWithTreasuryAccount(treasury);
+        final var token = fungibleTokenPersist();
         final var tokenEntity = entityIdFromEvmAddress(toAddress(token.getTokenId()));
         tokenAssociateAccountPersist(owner, tokenEntity);
         tokenAssociateAccountPersist(recipient, tokenEntity);
@@ -692,8 +683,7 @@ void transferFromNFTWithAliasRedirect() {
     void delegateTransferDoesNotExecuteAndReturnEmpty() throws Exception {
         // Given
         final var recipient = accountEntityPersist().toEntityId();
-        final var treasury = accountEntityPersist();
-        final var token = fungibleTokenPersistWithTreasuryAccount(treasury);
+        final var token = fungibleTokenPersist();
         final var tokenEntity = entityIdFromEvmAddress(toAddress(token.getTokenId()));
         final var tokenAddress = toAddress(tokenEntity.getId());
         tokenAssociateAccountPersist(recipient, entityIdFromEvmAddress(toAddress(tokenEntity.getId())));

diff --git a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/service/OpcodeServiceTest.java b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/service/OpcodeServiceTest.java
@@ -870,7 +870,7 @@ private Token nftPersist(final Entity treasuryEntity) {
     }
 
     private Entity accountPersist() {
-        return accountEntityPersistCustomizable(e -> e.evmAddress(null));
+        return accountEntityPersist();
     }
 
     private Entity accountPersistWithAccountBalances() {