Solana. Fixed tests and pre-commit

Author: vlasonfa

lib/solana/lib/assets/instance/network/net-rules-stop.sh

@@ -10,4 +10,4 @@ INTERFACE=$(ip -br addr show | grep -v '^lo' | awk '{print $1}' | head -n1)
 /usr/sbin/iptables -t mangle -F MARKING
 /usr/sbin/iptables -t mangle -X MARKING
 
-exit 0;
+exit 0;

lib/solana/lib/assets/instance/network/net-rules.service

@@ -9,4 +9,4 @@ ExecStart=/opt/instance/network/net-rules-start.sh _LIMIT_OUT_TRAFFIC_MBPS_
 ExecStop=/opt/instance/network/net-rules-stop.sh
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

lib/solana/lib/assets/instance/network/setup.sh

@@ -31,4 +31,4 @@ mv $NET_SCRIPTS_PATH/net-sync-checker.timer /etc/systemd/system/net-sync-checker
 
 echo "Starting net sync checker timer"
 systemctl start net-sync-checker.timer
-systemctl enable net-sync-checker.timer
+systemctl enable net-sync-checker.timer

lib/solana/test/ha-nodes-stack.test.ts

@@ -14,17 +14,8 @@ describe("SolanaHANodesStack", () => {
     stackName: `solana-ha-nodes-${config.baseNodeConfig.nodeConfiguration}`,
     env: { account: config.baseConfig.accountId, region: config.baseConfig.region },
 
-    instanceType: config.baseNodeConfig.instanceType,
-    instanceCpuType: config.baseNodeConfig.instanceCpuType,
-    solanaCluster: config.baseNodeConfig.solanaCluster,
-    solanaVersion: config.baseNodeConfig.solanaVersion,
-    nodeConfiguration: config.baseNodeConfig.nodeConfiguration,
-    dataVolume: config.baseNodeConfig.dataVolume,
-    accountsVolume: config.baseNodeConfig.accountsVolume,
-
-    albHealthCheckGracePeriodMin: config.haNodeConfig.albHealthCheckGracePeriodMin,
-    heartBeatDelayMin: config.haNodeConfig.heartBeatDelayMin,
-    numberOfNodes: config.haNodeConfig.numberOfNodes,
+    ...config.baseNodeConfig,
+    ...config.haNodeConfig,
   });
 
     // Prepare the stack for assertions.

lib/solana/test/single-node-stack.test.ts

@@ -14,17 +14,7 @@ describe("SolanaSingleNodeStack", () => {
       stackName: `solana-single-node-${config.baseNodeConfig.nodeConfiguration}`,
       env: { account: config.baseConfig.accountId, region: config.baseConfig.region },
 
-      instanceType: config.baseNodeConfig.instanceType,
-      instanceCpuType: config.baseNodeConfig.instanceCpuType,
-      solanaCluster: config.baseNodeConfig.solanaCluster,
-      solanaVersion: config.baseNodeConfig.solanaVersion,
-      nodeConfiguration: config.baseNodeConfig.nodeConfiguration,
-      dataVolume: config.baseNodeConfig.dataVolume,
-      accountsVolume: config.baseNodeConfig.accountsVolume,
-      solanaNodeIdentitySecretARN: config.baseNodeConfig.solanaNodeIdentitySecretARN,
-      voteAccountSecretARN: config.baseNodeConfig.voteAccountSecretARN,
-      authorizedWithdrawerAccountSecretARN: config.baseNodeConfig.authorizedWithdrawerAccountSecretARN,
-      registrationTransactionFundingAccountSecretARN: config.baseNodeConfig.registrationTransactionFundingAccountSecretARN,
+      ...config.baseNodeConfig
   });
 
     // Prepare the stack for assertions.