fix: Remove default shard and realm constants

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/HapiPropertySource.java

@@ -48,10 +48,6 @@ public interface HapiPropertySource {
 
     String ENTITY_STRING = "%d.%d.%d";
 
-    // Default shard and realm for static ID building and comparisons
-    int shard = SHARD;
-    long realm = REALM;
-
     String NODE_BLOCK_STREAM_DIR = String.format("block-%d.%d.3", SHARD, REALM);
     String NODE_RECORD_STREAM_DIR = String.format("record%d.%d.3", SHARD, REALM);
 
@@ -155,7 +151,7 @@ default RealmID getRealm(String property) {
     default long getRealm() {
         return Optional.ofNullable(get("hapi.spec.default.realm"))
                 .map(Long::parseLong)
-                .orElse(realm);
+                .orElse(REALM);
     }
 
     @Deprecated
@@ -166,7 +162,7 @@ default ShardID getShard(String property) {
     default long getShard() {
         return Optional.ofNullable(get("hapi.spec.default.shard"))
                 .map(Long::parseLong)
-                .orElse((long) shard);
+                .orElse((long) SHARD);
     }
 
     static long getConfigShard() {
@@ -449,8 +445,8 @@ static ContractID asContract(String v) {
 
     static ContractID asContractIdWithEvmAddress(ByteString address) {
         return ContractID.newBuilder()
-                .setShardNum(shard)
-                .setRealmNum(realm)
+                .setShardNum(getConfigShard())
+                .setRealmNum(getConfigRealm())
                 .setEvmAddress(address)
                 .build();
     }
@@ -590,11 +586,6 @@ static String asEntityString(final long shard, final long realm, final String nu
         return String.format("%d.%d.%s", shard, realm, num);
     }
 
-    @Deprecated(forRemoval = true)
-    static String asEntityString(final long num) {
-        return asEntityString(shard, realm, num);
-    }
-
     static String asEntityString(final String shard, final String realm, final String num) {
         return String.format("%s.%s.%s", shard, realm, num);
     }

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/HapiPropertySourceStaticInitializer.java

@@ -7,14 +7,12 @@
  * Initialize static properties for the HapiPropertySource.
  */
 public class HapiPropertySourceStaticInitializer {
-    public static final int SHARD;
-    public static final long REALM;
-    public static final String SHARD_AND_REALM;
+    static final int SHARD;
+    static final long REALM;
 
     static {
         HapiPropertySource defaultSource = new JutilPropertySource("spec-default.properties");
         SHARD = Integer.parseInt(defaultSource.get("default.shard"));
         REALM = Long.parseLong(defaultSource.get("default.realm"));
-        SHARD_AND_REALM = SHARD + "." + REALM + ".";
     }
 }

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/HapiSpec.java

@@ -829,7 +829,10 @@ private void buildRemoteNetwork() {
                     "default.realm", "" + targetNetwork.realm()));
         } catch (Exception ignore) {
             targetNetwork = RemoteNetwork.newRemoteNetwork(
-                    hapiSetup.nodes(), clientsFor(hapiSetup), HapiPropertySource.shard, HapiPropertySource.realm);
+                    hapiSetup.nodes(),
+                    clientsFor(hapiSetup),
+                    HapiPropertySource.getConfigShard(),
+                    HapiPropertySource.getConfigRealm());
         }
     }
 

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/HapiSpecOperation.java

@@ -124,8 +124,7 @@ public abstract class HapiSpecOperation implements SpecOperation {
     protected Optional<String> metadata = Optional.empty();
     protected Optional<String> payer = Optional.empty();
     protected Optional<Boolean> genRecord = Optional.empty();
-    protected Optional<AccountID> node = Optional.empty();
-    protected Optional<String> nodeNum = Optional.empty();
+    protected Optional<String> node = Optional.empty();
     protected Optional<Supplier<AccountID>> nodeSupplier = Optional.empty();
     protected OptionalDouble usdFee = OptionalDouble.empty();
     protected Optional<Integer> retryLimits = Optional.empty();
@@ -170,8 +169,7 @@ public boolean requiresFinalization(final HapiSpec spec) {
     }
 
     protected AccountID targetNodeFor(final HapiSpec spec) {
-        fixNodeFor(spec);
-        return node.get();
+        return fixNodeFor(spec);
     }
 
     protected void configureTlsFor(final HapiSpec spec) {
@@ -184,18 +182,17 @@ private void configureProtoStructureFor(final HapiSpec spec) {
                 : spec.setup().txnProtoStructure();
     }
 
-    protected void fixNodeFor(final HapiSpec spec) {
-        nodeNum.ifPresent(s -> node = Optional.of(asId(s, spec)));
+    protected AccountID fixNodeFor(final HapiSpec spec) {
         if (node.isPresent()) {
-            return;
+            return asId(node.get(), spec);
         }
         if (nodeSupplier.isPresent()) {
-            node = Optional.of(nodeSupplier.get().get());
+            return nodeSupplier.get().get();
         } else {
             if (spec.setup().nodeSelector() == HapiSpecSetup.NodeSelection.RANDOM) {
-                node = Optional.of(randomNodeFrom(spec));
+                return randomNodeFrom(spec);
             } else {
-                node = Optional.of(spec.setup().defaultNode());
+                return spec.setup().defaultNode();
             }
         }
     }
@@ -275,7 +272,7 @@ protected Consumer<TransactionBody.Builder> bodyDef(final HapiSpec spec) {
             if (omitNodeAccount) {
                 builder.clearNodeAccountID();
             } else {
-                node.ifPresent(builder::setNodeAccountID);
+                node.ifPresent((s) -> builder.setNodeAccountID(fixNodeFor(spec)));
             }
             validDurationSecs.ifPresent(s -> builder.setTransactionValidDuration(
                     Duration.newBuilder().setSeconds(s).build()));
@@ -452,7 +449,7 @@ protected MoreObjects.ToStringHelper toStringHelper() {
             helper.add("sigs", FeeBuilder.getSignatureCount(txnSubmitted));
         }
         payer.ifPresent(a -> helper.add("payer", a));
-        node.ifPresent(id -> helper.add("node", HapiPropertySource.asAccountString(id)));
+        node.ifPresent(id -> helper.add("node", id));
         return helper;
     }
 

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/assertions/AccountInfoAsserts.java

@@ -89,8 +89,12 @@ public AccountInfoAsserts accountId(String account) {
     }
 
     public AccountInfoAsserts stakedAccountId(String acctNum) {
+        return stakedAccountId(Long.parseLong(acctNum));
+    }
+
+    public AccountInfoAsserts stakedAccountId(long acctNum) {
         registerProvider((spec, o) -> assertEquals(
-                asAccount(spec.shard(), spec.realm(), Long.parseLong(acctNum)),
+                asAccount(spec.shard(), spec.realm(), acctNum),
                 ((AccountInfo) o).getStakingInfo().getStakedAccountId(),
                 "Bad stakedAccountId id!"));
         return this;

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/props/NodeConnectInfo.java

@@ -47,7 +47,7 @@ public NodeConnectInfo(String inString) {
                 .filter(TxnUtils::isIdLiteral)
                 .map(HapiPropertySource::asAccount)
                 .findAny()
-                .orElse(HapiPropertySource.asAccount(asEntityString(NEXT_DEFAULT_ACCOUNT_NUM++)));
+                .orElse(HapiPropertySource.asAccount(asEntityString(0, 0, NEXT_DEFAULT_ACCOUNT_NUM++)));
         host = Stream.of(aspects)
                 .filter(aspect -> !(isIdLiteral(aspect) || isNumericLiteral(aspect)))
                 .findAny()

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/HapiQueryOp.java

@@ -173,7 +173,6 @@ protected long costFrom(Response response) throws Throwable {
 
     @Override
     protected boolean submitOp(HapiSpec spec) throws Throwable {
-        fixNodeFor(spec);
         configureTlsFor(spec);
 
         Transaction payment = Transaction.getDefaultInstance();
@@ -433,8 +432,8 @@ public T useEmptyTxnAsAnswerPayment() {
         return self();
     }
 
-    public T setNode(String account) {
-        node = Optional.of(HapiPropertySource.asAccount(account));
+    public T setNode(String accountNum) {
+        node = Optional.of(accountNum);
         return self();
     }
 

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/HapiTxnOp.java

@@ -182,7 +182,6 @@ public Transaction signedTxnFor(HapiSpec spec) throws Throwable {
 
     @Override
     protected boolean submitOp(HapiSpec spec) throws Throwable {
-        fixNodeFor(spec);
         configureTlsFor(spec);
         int retryCount = 1;
         while (true) {
@@ -783,13 +782,13 @@ public T txnId(String name) {
         return self();
     }
 
-    public T setNodeId(AccountID account) {
-        node = Optional.of(account);
+    public T setNode(String accountNum) {
+        node = Optional.of(accountNum);
         return self();
     }
 
-    public T setNode(String accountNum) {
-        nodeNum = Optional.of(accountNum);
+    public T setNode(long accountNum) {
+        node = Optional.of(Long.toString(accountNum));
         return self();
     }
 
@@ -890,11 +889,7 @@ public T batchKey(String key) {
         return self();
     }
 
-    public Optional<AccountID> getNode() {
+    public Optional<String> getNode() {
         return node;
     }
-
-    public Optional<String> getNodeNum() {
-        return nodeNum;
-    }
 }

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnUtils.java

@@ -12,8 +12,6 @@
 import static com.hedera.services.bdd.spec.HapiPropertySource.asToken;
 import static com.hedera.services.bdd.spec.HapiPropertySource.asTokenString;
 import static com.hedera.services.bdd.spec.HapiPropertySource.asTopic;
-import static com.hedera.services.bdd.spec.HapiPropertySource.realm;
-import static com.hedera.services.bdd.spec.HapiPropertySource.shard;
 import static com.hedera.services.bdd.spec.queries.QueryVerbs.getContractInfo;
 import static com.hedera.services.bdd.spec.queries.QueryVerbs.getFileInfo;
 import static com.hedera.services.bdd.spec.transactions.contract.HapiParserUtil.encodeParametersForConstructor;

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/contract/HapiContractCall.java

@@ -18,7 +18,6 @@
 import com.hedera.services.bdd.spec.assertions.TransactionRecordAsserts;
 import com.hedera.services.bdd.spec.infrastructure.meta.ActionableContractCall;
 import com.hedera.services.bdd.spec.transactions.TxnUtils;
-import com.hederahashgraph.api.proto.java.AccountID;
 import com.hederahashgraph.api.proto.java.ContractCallTransactionBody;
 import com.hederahashgraph.api.proto.java.ContractID;
 import com.hederahashgraph.api.proto.java.HederaFunctionality;
@@ -240,10 +239,6 @@ public Optional<String> getCustomTxnId() {
         return customTxnId;
     }
 
-    public Optional<AccountID> getNode() {
-        return node;
-    }
-
     public OptionalDouble getUsdFee() {
         return usdFee;
     }

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/contract/HapiContractCreate.java

@@ -2,8 +2,6 @@
 package com.hedera.services.bdd.spec.transactions.contract;
 
 import static com.hedera.services.bdd.spec.HapiPropertySource.asContractString;
-import static com.hedera.services.bdd.spec.HapiPropertySource.realm;
-import static com.hedera.services.bdd.spec.HapiPropertySource.shard;
 import static com.hedera.services.bdd.spec.transactions.TxnUtils.asId;
 import static com.hedera.services.bdd.spec.transactions.TxnUtils.bannerWith;
 import static com.hedera.services.bdd.spec.transactions.TxnUtils.equivAccount;
@@ -19,7 +17,6 @@
 import com.hedera.services.bdd.spec.keys.KeyFactory;
 import com.hedera.services.bdd.spec.keys.SigControl;
 import com.hedera.services.bdd.spec.transactions.TxnUtils;
-import com.hederahashgraph.api.proto.java.AccountID;
 import com.hederahashgraph.api.proto.java.ContractCreateTransactionBody;
 import com.hederahashgraph.api.proto.java.ContractGetInfoResponse;
 import com.hederahashgraph.api.proto.java.ContractID;
@@ -52,10 +49,7 @@
 
 public class HapiContractCreate extends HapiBaseContractCreate<HapiContractCreate> {
     static final Key DEPRECATED_CID_ADMIN_KEY = Key.newBuilder()
-            .setContractID(ContractID.newBuilder()
-                    .setShardNum(shard)
-                    .setRealmNum(realm)
-                    .setContractNum(1_234L))
+            .setContractID(ContractID.newBuilder().setShardNum(0).setRealmNum(0).setContractNum(1_234L))
             .build();
 
     public HapiContractCreate(String contract) {
@@ -377,8 +371,10 @@ protected Consumer<TransactionBody.Builder> opBodyDef(HapiSpec spec) throws Thro
                             }
                             b.setDeclineReward(isDeclinedReward);
 
-                            b.setRealmID(RealmID.newBuilder().setShardNum(shard).setRealmNum(realm));
-                            b.setShardID(ShardID.newBuilder().setShardNum(shard));
+                            b.setRealmID(RealmID.newBuilder()
+                                    .setShardNum(spec.shard())
+                                    .setRealmNum(spec.realm()));
+                            b.setShardID(ShardID.newBuilder().setShardNum(spec.shard()));
                         });
         return b -> b.setContractCreateInstance(opBody);
     }
@@ -456,10 +452,6 @@ public Optional<String> getCustomTxnId() {
         return customTxnId;
     }
 
-    public Optional<AccountID> getNode() {
-        return node;
-    }
-
     public OptionalDouble getUsdFee() {
         return usdFee;
     }

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/crypto/HapiCryptoUpdate.java

@@ -132,6 +132,10 @@ public HapiCryptoUpdate maxAutomaticAssociations(int max) {
         return this;
     }
 
+    public HapiCryptoUpdate newStakedAccountId(long stakee) {
+        return newStakedAccountId(String.valueOf(stakee));
+    }
+
     public HapiCryptoUpdate newStakedAccountId(String stakee) {
         newStakee = Optional.of(stakee);
         return this;

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/network/HapiUncheckedSubmit.java

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 package com.hedera.services.bdd.spec.transactions.network;
 
-import static com.hedera.services.bdd.spec.transactions.TxnUtils.asId;
 import static com.hederahashgraph.api.proto.java.HederaFunctionality.UncheckedSubmit;
 
 import com.google.common.base.MoreObjects;
@@ -39,9 +38,6 @@ public HederaFunctionality type() {
 
     @Override
     protected Consumer<TransactionBody.Builder> opBodyDef(final HapiSpec spec) throws Throwable {
-        if (subOp.getNodeNum().isPresent()) {
-            subOp.setNodeId(asId(subOp.getNodeNum().get(), spec));
-        }
         final var subOpBytes = subOp.serializeSignedTxnFor(spec);
         if (verboseLoggingOn) {
             log.info("Submitting unchecked: {}", CommonUtils.extractTransactionBody(Transaction.parseFrom(subOpBytes)));

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/util/HapiAtomicBatch.java

@@ -2,7 +2,6 @@
 package com.hedera.services.bdd.spec.transactions.util;
 
 import static com.hedera.services.bdd.spec.queries.QueryVerbs.getTxnRecord;
-import static com.hedera.services.bdd.spec.transactions.TxnUtils.asId;
 import static com.hedera.services.bdd.spec.transactions.TxnUtils.extractTxnId;
 import static com.hedera.services.bdd.spec.transactions.TxnUtils.suFrom;
 import static com.hedera.services.bdd.spec.transactions.TxnUtils.txnToString;
@@ -78,8 +77,10 @@ protected Consumer<TransactionBody.Builder> opBodyDef(final HapiSpec spec) throw
                         AtomicBatchTransactionBody.class, b -> {
                             for (HapiTxnOp<?> op : operationsToBatch) {
                                 try {
-                                    // If the node num is not set, set the ID to 0.0.0
-                                    setInnerTxnNodeID(spec, op);
+                                    // set node account id to 0.0.0 if not set
+                                    if (op.getNode().isEmpty()) {
+                                        op.setNode(DEFAULT_NODE_ACCOUNT_ID);
+                                    }
                                     // create a transaction for each operation
                                     final var transaction = op.signedTxnFor(spec);
                                     if (!loggingOff) {
@@ -173,15 +174,4 @@ private void validateExecutionOrder(HapiSpec spec, List<String> transactionIds)
             }
         }
     }
-
-    private void setInnerTxnNodeID(HapiSpec spec, HapiTxnOp<?> op) {
-        // Set node ID for inner transactions
-        if (op.getNodeNum().isPresent()) {
-            op.setNodeId(asId(op.getNodeNum().get(), spec));
-        }
-        // set node account id to 0.0.0 if not set
-        if (op.getNode().isEmpty()) {
-            op.setNodeId(asId(DEFAULT_NODE_ACCOUNT_ID, spec));
-        }
-    }
 }