Merge pull request #153 from OpenElements/HieroTestContext

HieroTestContext updated to use NetworkSettings

Author: hendrikebbers

hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/HieroTestContext.java

@@ -6,12 +6,13 @@
 import com.openelements.hiero.base.HieroException;
 import com.openelements.hiero.base.data.Account;
 import com.openelements.hiero.base.implementation.ProtocolLayerClientImpl;
+import com.openelements.hiero.base.protocol.ProtocolLayerClient;
 import com.openelements.hiero.base.protocol.data.AccountBalanceRequest;
 import com.openelements.hiero.base.protocol.data.AccountBalanceResponse;
 import com.openelements.hiero.base.protocol.data.AccountCreateRequest;
 import com.openelements.hiero.base.protocol.data.AccountCreateResult;
 import com.openelements.hiero.base.protocol.data.AccountDeleteRequest;
-import com.openelements.hiero.base.protocol.ProtocolLayerClient;
+import com.openelements.hiero.base.test.config.HieroTestContext;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;

hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/ProtocolLayerClientAccountTests.java

@@ -10,6 +10,7 @@
 import com.openelements.hiero.base.protocol.data.TokenCreateResult;
 import com.openelements.hiero.base.protocol.data.TokenMintRequest;
 import com.openelements.hiero.base.protocol.data.TokenMintResult;
+import com.openelements.hiero.base.test.config.HieroTestContext;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;

hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/ProtocolLayerClientTokenTests.java

@@ -0,0 +1,79 @@
+package com.openelements.hiero.base.test.config;
+
+import com.hedera.hashgraph.sdk.AccountId;
+import com.hedera.hashgraph.sdk.Client;
+import com.hedera.hashgraph.sdk.PrivateKey;
+import com.hedera.hashgraph.sdk.PublicKey;
+import com.openelements.hiero.base.HieroContext;
+import com.openelements.hiero.base.config.NetworkSettings;
+import com.openelements.hiero.base.data.Account;
+import io.github.cdimascio.dotenv.Dotenv;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import org.jspecify.annotations.NonNull;
+import org.slf4j.Logger;
+
+public class HieroTestContext implements HieroContext {
+
+    private final static Logger log = org.slf4j.LoggerFactory.getLogger(HieroTestContext.class);
+
+    private final Account operationalAccount;
+
+    private final Client client;
+
+    public HieroTestContext() {
+        final Dotenv dotenv = Dotenv.configure().ignoreIfMissing().load();
+
+        final String hieroAccountIdByEnv = Optional.ofNullable(System.getenv("HEDERA_ACCOUNT_ID"))
+                .orElse(dotenv.get("hiero.accountId"));
+        final String hieroPrivateKeyByEnv = Optional.ofNullable(System.getenv("HEDERA_PRIVATE_KEY"))
+                .orElse(dotenv.get("hiero.privateKey"));
+        final String hieroNetwork = Optional.ofNullable(System.getenv("HEDERA_NETWORK"))
+                .or(() -> Optional.ofNullable(dotenv.get("hiero.network")))
+                .orElse("hedera-testnet");
+
+        if (hieroAccountIdByEnv == null) {
+            throw new IllegalStateException(
+                    "AccountId for operator account is not set. Please set 'HEDERA_ACCOUNT_ID' or 'hiero.accountId' in .env file.");
+        }
+        if (hieroPrivateKeyByEnv == null) {
+            throw new IllegalStateException(
+                    "PrivateKey for operator account is not set. Please set 'HEDERA_PRIVATE_KEY' or 'hiero.privateKey' in .env file.");
+        }
+
+        log.info("Using operator account: {}", hieroAccountIdByEnv);
+        log.info("Using network: {}", hieroNetwork);
+
+        final AccountId accountId = AccountId.fromString(hieroAccountIdByEnv);
+        final PrivateKey privateKey = PrivateKey.fromString(hieroPrivateKeyByEnv);
+        final PublicKey publicKey = privateKey.getPublicKey();
+        operationalAccount = new Account(accountId, publicKey, privateKey);
+
+        final NetworkSettings networkSettings = NetworkSettings.forIdentifier(hieroNetwork)
+                .orElseThrow(() -> new IllegalStateException("ENV 'HEDERA_NETWORK' is set to '" + hieroNetwork
+                        + "' but no network settings are available for this network."));
+
+        final Map<String, AccountId> nodes = new HashMap<>();
+        networkSettings.getConsensusNodes()
+                .forEach(consensusNode -> nodes.put(consensusNode.getAddress(), consensusNode.getAccountId()));
+        client = Client.forNetwork(nodes);
+        if (!networkSettings.getMirrorNodeAddresses().isEmpty()) {
+            try {
+                client.setMirrorNetwork(networkSettings.getMirrorNodeAddresses().stream().toList());
+            } catch (InterruptedException e) {
+                throw new RuntimeException("Error in configuring Mirror Node", e);
+            }
+        }
+        client.setOperator(accountId, privateKey);
+    }
+
+    @Override
+    public @NonNull Account getOperatorAccount() {
+        return operationalAccount;
+    }
+
+    public Client getClient() {
+        return client;
+    }
+}

hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/config/HieroTestContext.java

@@ -0,0 +1,41 @@
+package com.openelements.hiero.base.test.config;
+
+import com.openelements.hiero.base.config.ConsensusNode;
+import com.openelements.hiero.base.config.NetworkSettings;
+import java.util.Optional;
+import java.util.Set;
+import org.jspecify.annotations.NonNull;
+
+
+public class SoloActionNetworkSettings implements NetworkSettings {
+
+    @Override
+    public @NonNull String getNetworkIdentifier() {
+        return "hiero-solo-action";
+    }
+
+    @Override
+    public @NonNull Optional<String> getNetworkName() {
+        return Optional.of("Hiero Solo Action");
+    }
+
+    @Override
+    public @NonNull Set<String> getMirrorNodeAddresses() {
+        return Set.of("http://localhost:8080");
+    }
+
+    @Override
+    public @NonNull Set<ConsensusNode> getConsensusNodes() {
+        return Set.of(new ConsensusNode("127.0.0.1", "50211", "0.0.3"));
+    }
+
+    @Override
+    public @NonNull Optional<Long> chainId() {
+        return Optional.empty();
+    }
+
+    @Override
+    public @NonNull Optional<String> relayUrl() {
+        return Optional.empty();
+    }
+}

hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/config/SoloActionNetworkSettings.java

@@ -0,0 +1,18 @@
+package com.openelements.hiero.base.test.config;
+
+import com.openelements.hiero.base.config.NetworkSettings;
+import com.openelements.hiero.base.config.NetworkSettingsProvider;
+import java.util.Set;
+
+public class SoloActionNetworkSettingsProvider implements NetworkSettingsProvider {
+
+    @Override
+    public String getName() {
+        return "Provider for Hiero Solo Action";
+    }
+
+    @Override
+    public Set<NetworkSettings> createNetworkSettings() {
+        return Set.of(new SoloActionNetworkSettings());
+    }
+}

hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/config/SoloActionNetworkSettingsProvider.java

@@ -5,4 +5,7 @@
     requires org.junit.jupiter.api;
     requires org.junit.jupiter.params;
     requires org.mockito;
+    requires org.slf4j;
+
+    provides com.openelements.hiero.base.config.NetworkSettingsProvider with com.openelements.hiero.base.test.config.SoloActionNetworkSettingsProvider;
 }

hiero-enterprise-base/src/test/java/module-info.java

@@ -0,0 +1 @@
+com.openelements.hiero.base.test.config.SoloActionNetworkSettingsProvider

hiero-enterprise-base/src/test/resources/META-INF/services/com.openelements.hiero.base.config.NetworkSettingsProvider

@@ -15,6 +15,8 @@ public class TestConfigSource implements ConfigSource {
     private final Map<String, String> properties;
 
     public TestConfigSource() {
+        final Dotenv dotenv = Dotenv.configure().ignoreIfMissing().load();
+
         properties = new HashMap<>();
         properties.put("mp.initializer.allow", "true");
         properties.put("mp.initializer.no-warn", "true");
@@ -23,21 +25,21 @@ public TestConfigSource() {
         if (hieroAccountIdByEnv != null) {
             properties.put("hiero.accountId", hieroAccountIdByEnv);
         } else {
-            properties.put("hiero.accountId", Dotenv.load().get("hiero.accountId"));
+            properties.put("hiero.accountId", dotenv.get("hiero.accountId"));
         }
 
         final String hieroPrivateKeyByEnv = System.getenv("HEDERA_PRIVATE_KEY");
         if (hieroPrivateKeyByEnv != null) {
             properties.put("hiero.privateKey", hieroPrivateKeyByEnv);
         } else {
-            properties.put("hiero.privateKey", Dotenv.load().get("hiero.privateKey"));
+            properties.put("hiero.privateKey", dotenv.get("hiero.privateKey"));
         }
 
         final String hieroNetwork = System.getenv("HEDERA_NETWORK");
         if (hieroNetwork != null) {
             properties.put("hiero.network.name", hieroNetwork);
         } else {
-            properties.put("hiero.network.name", Dotenv.load().get("hiero.network.name"));
+            properties.put("hiero.network.name", dotenv.get("hiero.network.name"));
         }
 
         properties.forEach((k, v) -> log.info("CONFIG: '" + k + "'->'" + v + "'"));