more refactoring

Signed-off-by: Frank Li <b439988l@gmail.com>
hyperledger · macfarla · Nov 25, 2021 · Nov 17, 2021 · Nov 18, 2021 · Nov 18, 2021
commit 12d67788ff9601bc234f59577543ca21c6b16954
diff --git a/...l/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java b/...l/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java
@@ -135,7 +135,7 @@ public void startNode(final BesuNode node) {
         params.add(node.homeDirectory().resolve("key").toString());
       }
 
-      if (node.getPrivacyParameters().isOnchainPrivacyGroupsEnabled()) {
+      if (node.getPrivacyParameters().isFlexiblePrivacyGroupsEnabled()) {
         params.add("--privacy-flexible-groups-enabled");
       }
 

diff --git a/besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java b/besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java
@@ -19,7 +19,7 @@
 import static java.util.function.Predicate.isEqual;
 import static java.util.function.Predicate.not;
 import static org.hyperledger.besu.controller.BesuController.CACHE_PATH;
-import static org.hyperledger.besu.ethereum.core.PrivacyParameters.ONCHAIN_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
 
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
 import org.hyperledger.besu.controller.BesuController;
@@ -926,15 +926,15 @@ private void createPrivateTransactionObserver(
       final PrivateTransactionObserver privateTransactionObserver,
       final PrivacyParameters privacyParameters) {
     // register privateTransactionObserver as observer of events fired by the onchain precompile.
-    if (privacyParameters.isOnchainPrivacyGroupsEnabled()
+    if (privacyParameters.isFlexiblePrivacyGroupsEnabled()
         && privacyParameters.isMultiTenancyEnabled()) {
       final OnchainPrivacyPrecompiledContract onchainPrivacyPrecompiledContract =
           (OnchainPrivacyPrecompiledContract)
               besuController
                   .getProtocolSchedule()
                   .getByBlockNumber(1)
                   .getPrecompileContractRegistry()
-                  .get(ONCHAIN_PRIVACY);
+                  .get(FLEXIBLE_PRIVACY);
       onchainPrivacyPrecompiledContract.addPrivateTransactionObserver(privateTransactionObserver);
     }
   }

diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
@@ -977,6 +977,7 @@ void setBannedNodeIds(final List<String> values) {
   private final Boolean isFlexiblePrivacyGroupsEnabled = false;
 
   @Option(
+      hidden = true,
       names = {"--privacy-onchain-groups-enabled"},
       description = "Enable flexible (onchain) privacy groups (default: ${DEFAULT-VALUE})")
   private final Boolean isOnchainPrivacyGroupsEnabled = false;

diff --git a/besu/src/test/java/org/hyperledger/besu/PrivacyTest.java b/besu/src/test/java/org/hyperledger/besu/PrivacyTest.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
-import static org.hyperledger.besu.ethereum.core.PrivacyParameters.ONCHAIN_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
 
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.controller.BesuController;
@@ -85,7 +85,7 @@ public void onchainEnabledPrivacy() throws IOException, URISyntaxException {
     final BesuController besuController = setUpControllerWithPrivacyEnabled(true);
 
     final PrecompiledContract onchainPrecompiledContract =
-        getPrecompile(besuController, ONCHAIN_PRIVACY);
+        getPrecompile(besuController, FLEXIBLE_PRIVACY);
 
     assertThat(onchainPrecompiledContract.getName()).isEqualTo("OnchainPrivacy");
   }

diff --git a/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
@@ -3455,7 +3455,7 @@ public void onchainPrivacyGroupEnabledFlagDefaultValueIsFalse() {
     assertThat(commandErrorOutput.toString()).isEmpty();
 
     final PrivacyParameters privacyParameters = privacyParametersArgumentCaptor.getValue();
-    assertThat(privacyParameters.isOnchainPrivacyGroupsEnabled()).isEqualTo(false);
+    assertThat(privacyParameters.isFlexiblePrivacyGroupsEnabled()).isEqualTo(false);
   }
 
   @Test
@@ -3478,7 +3478,7 @@ public void onchainPrivacyGroupEnabledFlagValueIsSet() {
     assertThat(commandErrorOutput.toString()).isEmpty();
 
     final PrivacyParameters privacyParameters = privacyParametersArgumentCaptor.getValue();
-    assertThat(privacyParameters.isOnchainPrivacyGroupsEnabled()).isEqualTo(true);
+    assertThat(privacyParameters.isFlexiblePrivacyGroupsEnabled()).isEqualTo(true);
   }
 
   @Test
@@ -3501,7 +3501,7 @@ public void flexiblePrivacyGroupEnabledFlagValueIsSet() {
     assertThat(commandErrorOutput.toString()).isEmpty();
 
     final PrivacyParameters privacyParameters = privacyParametersArgumentCaptor.getValue();
-    assertThat(privacyParameters.isOnchainPrivacyGroupsEnabled()).isEqualTo(true);
+    assertThat(privacyParameters.isFlexiblePrivacyGroupsEnabled()).isEqualTo(true);
   }
 
   @Test

diff --git a/...reum/api/jsonrpc/internal/privacy/methods/eea/RestrictedOnchainEeaSendRawTransaction.java b/...reum/api/jsonrpc/internal/privacy/methods/eea/RestrictedOnchainEeaSendRawTransaction.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
 
-import static org.hyperledger.besu.ethereum.core.PrivacyParameters.ONCHAIN_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
 import static org.hyperledger.besu.ethereum.privacy.PrivacyGroupUtil.findOnchainPrivacyGroup;
 
 import org.hyperledger.besu.datatypes.Address;
@@ -99,7 +99,7 @@ protected Transaction createPrivateMarkerTransaction(
         buildCompoundLookupId(privateTransactionLookupId, addPayloadPrivateTransactionLookupId);
 
     return createPrivateMarkerTransaction(
-        sender, ONCHAIN_PRIVACY, pmtPayload, privateTransaction, privacyUserId);
+        sender, FLEXIBLE_PRIVACY, pmtPayload, privateTransaction, privacyUserId);
   }
 
   @Override

diff --git a/...pi/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EeaJsonRpcMethods.java b/...pi/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EeaJsonRpcMethods.java
@@ -66,7 +66,7 @@ protected Map<String, JsonRpcMethod> create(
               privacyController,
               getGasCalculator()),
           new PrivGetEeaTransactionCount(privacyController, privacyIdProvider));
-    } else if (getPrivacyParameters().isOnchainPrivacyGroupsEnabled()) {
+    } else if (getPrivacyParameters().isFlexiblePrivacyGroupsEnabled()) {
       return mapOf(
           new RestrictedOnchainEeaSendRawTransaction(
               transactionPool,

diff --git a/...i/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivJsonRpcMethods.java b/...i/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivJsonRpcMethods.java
@@ -75,7 +75,7 @@ protected Map<String, JsonRpcMethod> create(
             new PrivDistributeRawTransaction(
                 privacyController,
                 privacyIdProvider,
-                getPrivacyParameters().isOnchainPrivacyGroupsEnabled()),
+                getPrivacyParameters().isFlexiblePrivacyGroupsEnabled()),
             new PrivGetCode(getBlockchainQueries(), privacyController, privacyIdProvider),
             new PrivGetLogs(
                 getBlockchainQueries(), getPrivacyQueries(), privacyController, privacyIdProvider),
@@ -91,7 +91,7 @@ protected Map<String, JsonRpcMethod> create(
             new PrivNewFilter(filterManager, privacyController, privacyIdProvider),
             new PrivUninstallFilter(filterManager, privacyController, privacyIdProvider));
 
-    if (!getPrivacyParameters().isOnchainPrivacyGroupsEnabled()) {
+    if (!getPrivacyParameters().isFlexiblePrivacyGroupsEnabled()) {
       final Map<String, JsonRpcMethod> OFFCHAIN_METHODS =
           mapOf(
               new PrivCreatePrivacyGroup(privacyController, privacyIdProvider),

diff --git a/...java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivacyApiGroupJsonRpcMethods.java b/...java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivacyApiGroupJsonRpcMethods.java
@@ -149,7 +149,7 @@ private PrivacyController createPrivacyController() {
               restrictedDefaultPrivacyController,
               chainId,
               privacyParameters.getEnclave(),
-              privacyParameters.isOnchainPrivacyGroupsEnabled())
+              privacyParameters.isFlexiblePrivacyGroupsEnabled())
           : restrictedDefaultPrivacyController;
     }
   }

diff --git a/.../src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivxJsonRpcMethods.java b/.../src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivxJsonRpcMethods.java
@@ -47,7 +47,7 @@ protected Map<String, JsonRpcMethod> create(
       final PrivacyController privacyController,
       final PrivacyIdProvider privacyIdProvider,
       final PrivateMarkerTransactionFactory privateMarkerTransactionFactory) {
-    if (getPrivacyParameters().isOnchainPrivacyGroupsEnabled()) {
+    if (getPrivacyParameters().isFlexiblePrivacyGroupsEnabled()) {
       return mapOf(new PrivxFindOnchainPrivacyGroup(privacyController, privacyIdProvider));
     } else {
       return Map.of();

diff --git a/...perledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivateWebSocketMethodsFactory.java b/...perledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivateWebSocketMethodsFactory.java
@@ -88,7 +88,7 @@ private PrivacyController createPrivacyController() {
               restrictedDefaultPrivacyController,
               chainId,
               privacyParameters.getEnclave(),
-              privacyParameters.isOnchainPrivacyGroupsEnabled())
+              privacyParameters.isFlexiblePrivacyGroupsEnabled())
           : restrictedDefaultPrivacyController;
     }
   }

diff --git a/...ger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/BaseEeaSendRawTransaction.java b/...ger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/BaseEeaSendRawTransaction.java
@@ -15,7 +15,7 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
 
 import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
-import static org.hyperledger.besu.ethereum.core.PrivacyParameters.ONCHAIN_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
 import static org.hyperledger.besu.ethereum.core.PrivacyParameters.PLUGIN_PRIVACY;
 
 import org.hyperledger.besu.crypto.KeyPair;
@@ -72,7 +72,7 @@ public class BaseEeaSendRawTransaction {
           0L,
           Wei.of(1),
           21000L,
-          Optional.of(ONCHAIN_PRIVACY),
+          Optional.of(FLEXIBLE_PRIVACY),
           Wei.ZERO,
           SIGNATURE_ALGORITHM_SUPPLIER
               .get()

diff --git a/...c/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivJsonRpcMethodsTest.java b/...c/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivJsonRpcMethodsTest.java
@@ -58,7 +58,7 @@ public void setup() {
 
   @Test
   public void offchainPrivacyGroupMethodsAreDisabledWhenOnchainPrivacyGroupIsEnabled() {
-    when(privacyParameters.isOnchainPrivacyGroupsEnabled()).thenReturn(true);
+    when(privacyParameters.isFlexiblePrivacyGroupsEnabled()).thenReturn(true);
     final Map<String, JsonRpcMethod> rpcMethods = privJsonRpcMethods.create();
 
     assertThat(rpcMethods.get(PRIV_CREATE_PRIVACY_GROUP.getMethodName())).isNull();
@@ -68,7 +68,7 @@ public void offchainPrivacyGroupMethodsAreDisabledWhenOnchainPrivacyGroupIsEnabl
 
   @Test
   public void offchainPrivacyGroupMethodsAreEnabledWhenOnchainPrivacyGroupIsDisabled() {
-    when(privacyParameters.isOnchainPrivacyGroupsEnabled()).thenReturn(false);
+    when(privacyParameters.isFlexiblePrivacyGroupsEnabled()).thenReturn(false);
     final Map<String, JsonRpcMethod> rpcMethods = privJsonRpcMethods.create();
 
     assertThat(rpcMethods.get(PRIV_CREATE_PRIVACY_GROUP.getMethodName())).isNotNull();

diff --git a/.../test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivxJsonRpcMethodsTest.java b/.../test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivxJsonRpcMethodsTest.java
@@ -55,7 +55,7 @@ public void setup() {
 
   @Test
   public void privxFindPrivacyGroupMethodIsDisabledWhenOnchainPrivacyGroupIsDisabled() {
-    when(privacyParameters.isOnchainPrivacyGroupsEnabled()).thenReturn(false);
+    when(privacyParameters.isFlexiblePrivacyGroupsEnabled()).thenReturn(false);
     final Map<String, JsonRpcMethod> rpcMethods = privxJsonRpcMethods.create();
     final JsonRpcMethod method = rpcMethods.get(PRIVX_FIND_PRIVACY_GROUP.getMethodName());
 
@@ -64,7 +64,7 @@ public void privxFindPrivacyGroupMethodIsDisabledWhenOnchainPrivacyGroupIsDisabl
 
   @Test
   public void privxFindPrivacyGroupMethodIsEnabledWhenOnchainPrivacyGroupIsEnabled() {
-    when(privacyParameters.isOnchainPrivacyGroupsEnabled()).thenReturn(true);
+    when(privacyParameters.isFlexiblePrivacyGroupsEnabled()).thenReturn(true);
     final Map<String, JsonRpcMethod> rpcMethods = privxJsonRpcMethods.create();
     final JsonRpcMethod method = rpcMethods.get(PRIVX_FIND_PRIVACY_GROUP.getMethodName());
 

diff --git a/...main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java b/...main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java
@@ -15,7 +15,7 @@
 package org.hyperledger.besu.ethereum.mainnet;
 
 import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
-import static org.hyperledger.besu.ethereum.core.PrivacyParameters.ONCHAIN_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
 import static org.hyperledger.besu.ethereum.core.PrivacyParameters.PLUGIN_PRIVACY;
 import static org.hyperledger.besu.evm.precompile.MainnetPrecompiledContracts.populateForBLS12;
 import static org.hyperledger.besu.evm.precompile.MainnetPrecompiledContracts.populateForByzantium;
@@ -76,9 +76,9 @@ static void appendPrivacy(
               precompiledContractConfiguration.getPrivacyParameters()));
     } else if (precompiledContractConfiguration
         .getPrivacyParameters()
-        .isOnchainPrivacyGroupsEnabled()) {
+        .isFlexiblePrivacyGroupsEnabled()) {
       registry.put(
-          ONCHAIN_PRIVACY,
+          FLEXIBLE_PRIVACY,
           new OnchainPrivacyPrecompiledContract(
               precompiledContractConfiguration.getGasCalculator(),
               precompiledContractConfiguration.getPrivacyParameters()));

diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrivacyBlockProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrivacyBlockProcessor.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import static org.hyperledger.besu.ethereum.core.PrivacyParameters.ONCHAIN_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
 
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.enclave.Enclave;
@@ -161,7 +161,7 @@ void maybeRehydrate(
 
   private boolean onchainAddToGroupPrivateMarkerTransactions(final Transaction t) {
     return t.getTo().isPresent()
-        && t.getTo().equals(Optional.of(ONCHAIN_PRIVACY))
+        && t.getTo().equals(Optional.of(FLEXIBLE_PRIVACY))
         && t.getPayload().size() == 64;
   }
 

diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java
@@ -16,7 +16,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
-import static org.hyperledger.besu.ethereum.core.PrivacyParameters.ONCHAIN_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
 import static org.hyperledger.besu.ethereum.core.PrivacyParameters.PLUGIN_PRIVACY;
 
 import org.hyperledger.besu.datatypes.Wei;
@@ -326,9 +326,9 @@ public ProtocolSpec build(final ProtocolSchedule protocolSchedule) {
             (PrivacyPluginPrecompiledContract) precompileContractRegistry.get(PLUGIN_PRIVACY);
         privacyPluginPrecompiledContract.setPrivateTransactionProcessor(
             privateTransactionProcessor);
-      } else if (privacyParameters.isOnchainPrivacyGroupsEnabled()) {
+      } else if (privacyParameters.isFlexiblePrivacyGroupsEnabled()) {
         final OnchainPrivacyPrecompiledContract onchainPrivacyPrecompiledContract =
-            (OnchainPrivacyPrecompiledContract) precompileContractRegistry.get(ONCHAIN_PRIVACY);
+            (OnchainPrivacyPrecompiledContract) precompileContractRegistry.get(FLEXIBLE_PRIVACY);
         onchainPrivacyPrecompiledContract.setPrivateTransactionProcessor(
             privateTransactionProcessor);
       } else {

diff --git a/...c/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionDataFixture.java b/...c/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionDataFixture.java
@@ -16,7 +16,7 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
-import static org.hyperledger.besu.ethereum.core.PrivacyParameters.ONCHAIN_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
 
 import org.hyperledger.besu.crypto.KeyPair;
 import org.hyperledger.besu.crypto.SignatureAlgorithm;
@@ -90,12 +90,12 @@ public static Transaction privateMarkerTransaction() {
   }
 
   public static Transaction privateMarkerTransactionOnchain() {
-    return privateMarkerTransaction(VALID_BASE64_ENCLAVE_KEY, ONCHAIN_PRIVACY);
+    return privateMarkerTransaction(VALID_BASE64_ENCLAVE_KEY, FLEXIBLE_PRIVACY);
   }
 
   public static Transaction privateMarkerTransactionOnchainAdd() {
     return privateMarkerTransaction(
-        Bytes.concatenate(VALID_BASE64_ENCLAVE_KEY, VALID_BASE64_ENCLAVE_KEY), ONCHAIN_PRIVACY);
+        Bytes.concatenate(VALID_BASE64_ENCLAVE_KEY, VALID_BASE64_ENCLAVE_KEY), FLEXIBLE_PRIVACY);
   }
 
   private static Transaction privateMarkerTransaction(

diff --git a/.../java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistriesTest.java b/.../java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistriesTest.java
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
-import static org.hyperledger.besu.ethereum.core.PrivacyParameters.ONCHAIN_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
 import static org.hyperledger.besu.ethereum.mainnet.MainnetPrecompiledContractRegistries.appendPrivacy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -42,27 +42,27 @@ public class MainnetPrecompiledContractRegistriesTest {
 
   @Test
   public void whenOnchainPrivacyGroupsNotEnabled_defaultPrivacyPrecompileIsInRegistry() {
-    when(privacyParameters.isOnchainPrivacyGroupsEnabled()).thenReturn(false);
+    when(privacyParameters.isFlexiblePrivacyGroupsEnabled()).thenReturn(false);
     when(privacyParameters.isEnabled()).thenReturn(true);
 
     appendPrivacy(reg, config);
     verify(privacyParameters).isEnabled();
-    verify(privacyParameters).isOnchainPrivacyGroupsEnabled();
+    verify(privacyParameters).isFlexiblePrivacyGroupsEnabled();
 
     assertThat(reg.get(DEFAULT_PRIVACY)).isInstanceOf(PrivacyPrecompiledContract.class);
-    assertThat(reg.get(ONCHAIN_PRIVACY)).isNull();
+    assertThat(reg.get(FLEXIBLE_PRIVACY)).isNull();
   }
 
   @Test
   public void whenOnchainPrivacyGroupsEnabled_onchainPrivacyPrecompileIsInRegistry() {
-    when(privacyParameters.isOnchainPrivacyGroupsEnabled()).thenReturn(true);
+    when(privacyParameters.isFlexiblePrivacyGroupsEnabled()).thenReturn(true);
     when(privacyParameters.isEnabled()).thenReturn(true);
 
     appendPrivacy(reg, config);
     verify(privacyParameters).isEnabled();
-    verify(privacyParameters).isOnchainPrivacyGroupsEnabled();
+    verify(privacyParameters).isFlexiblePrivacyGroupsEnabled();
 
-    assertThat(reg.get(ONCHAIN_PRIVACY)).isInstanceOf(OnchainPrivacyPrecompiledContract.class);
+    assertThat(reg.get(FLEXIBLE_PRIVACY)).isInstanceOf(OnchainPrivacyPrecompiledContract.class);
     assertThat(reg.get(DEFAULT_PRIVACY)).isNull();
   }
 
@@ -74,7 +74,7 @@ public void whenPrivacyNotEnabled_noPrivacyPrecompileInRegistry() {
     verify(privacyParameters).isEnabled();
     verifyNoMoreInteractions(privacyParameters);
 
-    assertThat(reg.get(ONCHAIN_PRIVACY)).isNull();
+    assertThat(reg.get(FLEXIBLE_PRIVACY)).isNull();
     assertThat(reg.get(DEFAULT_PRIVACY)).isNull();
   }
 }