refactor: rename flag for clarity

Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
hashgraph · May 15, 2024 · 7270b85 · 7270b85
1 parent 0fcff82
commit 7270b85
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/EntitiesConfig.java b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/EntitiesConfig.java
@@ -25,4 +25,4 @@ public record EntitiesConfig(
         @ConfigProperty(defaultValue = "3153600000") @NetworkProperty long maxLifetime,
         // @ConfigProperty(defaultValue = "FILE") Set<EntityType> systemDeletable
         @ConfigProperty(defaultValue = "false") @NetworkProperty boolean limitTokenAssociations,
-        @ConfigProperty(defaultValue = "true") @NetworkProperty boolean unlimitedAutoAssociations) {}
+        @ConfigProperty(defaultValue = "true") @NetworkProperty boolean unlimitedAutoAssociationsEnabled) {}
diff --git a/...rc/main/java/com/hedera/node/app/service/token/impl/validators/CryptoCreateValidator.java b/...rc/main/java/com/hedera/node/app/service/token/impl/validators/CryptoCreateValidator.java
@@ -99,6 +99,6 @@ public boolean tooManyAutoAssociations(
             @NonNull final EntitiesConfig entitiesConfig,
             @NonNull final TokensConfig tokensConfig) {
         return (entitiesConfig.limitTokenAssociations() && n > tokensConfig.maxPerAccount())
-                || (!entitiesConfig.unlimitedAutoAssociations() && n > ledgerConfig.maxAutoAssociations());
+                || (!entitiesConfig.unlimitedAutoAssociationsEnabled() && n > ledgerConfig.maxAutoAssociations());
     }
 }
diff --git a/...st/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoUpdateHandlerTest.java b/...st/java/com/hedera/node/app/service/token/impl/test/handlers/CryptoUpdateHandlerTest.java
@@ -505,7 +505,7 @@ void maxAutoAssociationUpdateToMoreThanTokenAssociationLimitFails() {
         final var config = HederaTestConfigBuilder.create()
                 .withValue("entities.limitTokenAssociations", true)
                 .withValue("tokens.maxPerAccount", 11)
-                .withValue("entities.unlimitedAutoAssociations", true)
+                .withValue("entities.unlimitedAutoAssociationsEnabled", true)
                 .getOrCreateConfig();
         given(handleContext.configuration()).willReturn(config);
 

diff --git a/...est/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCreateHandlerTest.java b/...est/java/com/hedera/node/app/service/token/impl/test/handlers/TokenCreateHandlerTest.java
@@ -256,7 +256,7 @@ void failsIfAssociationLimitExceeded() {
         setUpTxnContext();
         configuration = HederaTestConfigBuilder.create()
                 .withValue("entities.limitTokenAssociations", "true")
-                .withValue("entities.unlimitedAutoAssociations", "false")
+                .withValue("entities.unlimitedAutoAssociationsEnabled", "false")
                 .withValue("tokens.maxPerAccount", "0")
                 .getOrCreateConfig();
         given(handleContext.configuration()).willReturn(configuration);

diff --git a/...ava/com/hedera/node/app/service/token/impl/test/validators/CryptoCreateValidatorTest.java b/...ava/com/hedera/node/app/service/token/impl/test/validators/CryptoCreateValidatorTest.java
@@ -59,7 +59,7 @@ void setUp() {
                 .withValue("ledger.maxAutoAssociations", 5000)
                 .withValue("entities.limitTokenAssociations", false)
                 .withValue("tokens.maxPerAccount", 1000)
-                .withValue("entities.unlimitedAutoAssociations", true);
+                .withValue("entities.unlimitedAutoAssociationsEnabled", true);
     }
 
     //    @Test
@@ -113,7 +113,7 @@ void setUp() {
 
     @Test
     void checkTooManyAutoAssociations() {
-        testConfigBuilder = testConfigBuilder.withValue("entities.unlimitedAutoAssociations", false);
+        testConfigBuilder = testConfigBuilder.withValue("entities.unlimitedAutoAssociationsEnabled", false);
         configuration = testConfigBuilder.getOrCreateConfig();
         getConfigs(configuration);
         assertTrue(subject.tooManyAutoAssociations(5001, ledgerConfig, entitiesConfig, tokensConfig));

diff --git a/...ra-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/FeatureFlags.java b/...ra-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/FeatureFlags.java
@@ -65,6 +65,6 @@ private Map<String, String> all(final String choice, @NonNull final List<String>
         // Not being tested
         "contracts.evm.version.dynamic",
         // HIP-904
-        "entities.unlimitedAutoAssociations"
+        "entities.unlimitedAutoAssociationsEnabled"
     };
 }
diff --git a/...test-clients/src/main/java/com/hedera/services/bdd/suites/crypto/CryptoTransferSuite.java b/...test-clients/src/main/java/com/hedera/services/bdd/suites/crypto/CryptoTransferSuite.java
@@ -1918,9 +1918,9 @@ final HapiSpec vanillaTransferSucceeds() {
         long initialBalance = HapiSpecSetup.getDefaultInstance().defaultBalance();
 
         return propertyPreservingHapiSpec("VanillaTransferSucceeds", FULLY_NONDETERMINISTIC)
-                .preserving("entities.unlimitedAutoAssociations")
+                .preserving("entities.unlimitedAutoAssociationsEnabled")
                 .given(
-                        overriding("entities.unlimitedAutoAssociations", "false"),
+                        overriding("entities.unlimitedAutoAssociationsEnabled", "false"),
                         cryptoCreate("somebody")
                                 .maxAutomaticTokenAssociations(5001)
                                 .hasPrecheck(REQUESTED_NUM_AUTOMATIC_ASSOCIATIONS_EXCEEDS_ASSOCIATION_LIMIT),