clean up code

Author: open-junius

contract-tests/run-ci.sh

@@ -29,6 +29,7 @@ if [ "$i" -eq 1000 ]; then
     exit 1
 fi
 
+# wait for node-subtensor to be stable
 sleep 2
 
 if ! nc -z localhost 9944; then
@@ -43,7 +44,7 @@ npm i -g polkadot-api
 
 bash get-metadata.sh
 
-sleep 2
+sleep 5
 
 yarn install --frozen-lockfile
 
@@ -56,8 +57,4 @@ if [ $TEST_EXIT_CODE -ne 0 ]; then
     exit $TEST_EXIT_CODE
 fi
 
-pkill node-subtensor
-
-sleep 2
-
 exit 0

contract-tests/src/subtensor.ts

@@ -13,10 +13,6 @@ export async function addNewSubnetwork(api: TypedApi<typeof devnet>, hotkey: Key
     const alice = getAliceSigner()
     const totalNetworks = await api.query.SubtensorModule.TotalNetworks.getValue()
 
-    const defaultNetworkLastLockCost = await api.query.SubtensorModule.NetworkMinLockCost.getValue()
-
-    // const defaultNetworkMinLockCost = await api.query.SubtensorModule.NetworkMinLockCost.getValue()
-
     const rateLimit = await api.query.SubtensorModule.NetworkRateLimit.getValue()
     if (rateLimit !== BigInt(0)) {
         const internalCall = api.tx.AdminUtils.sudo_set_network_rate_limit({ rate_limit: BigInt(0) })
@@ -32,8 +28,7 @@ export async function addNewSubnetwork(api: TypedApi<typeof devnet>, hotkey: Key
     // could create multiple subnetworks during retry, just return the first created one
     assert.ok(newTotalNetworks > totalNetworks)
 
-    // reset network last lock cost to 0, to avoid the lock cost calculation error
-    await setNetworkLastLockCost(api, defaultNetworkLastLockCost)
+    await resetNetworkLastLockCost(api)
     return totalNetworks
 }
 
@@ -408,17 +403,19 @@ export async function sendWasmContractExtrinsic(api: TypedApi<typeof devnet>, co
     await waitForTransactionWithRetry(api, tx, signer)
 }
 
-export async function setNetworkLastLockCost(api: TypedApi<typeof devnet>, defaultNetworkLastLockCost: bigint) {
+// reset network last lock cost to networkMinLockCost, to avoid the lock cost calculation error
+export async function resetNetworkLastLockCost(api: TypedApi<typeof devnet>) {
     const alice = getAliceSigner()
     const key = await api.query.SubtensorModule.NetworkLastLockCost.getKey()
     const codec = await getTypedCodecs(devnet);
-    const value = codec.query.SubtensorModule.NetworkLastLockCost.value.enc(defaultNetworkLastLockCost)
+    const networkMinLockCost = await api.query.SubtensorModule.NetworkMinLockCost.getValue()
+    const value = codec.query.SubtensorModule.NetworkLastLockCost.value.enc(networkMinLockCost)
     const internalCall = api.tx.System.set_storage({
         items: [[Binary.fromHex(key), Binary.fromBytes(value)]]
     })
     const tx = api.tx.Sudo.sudo({ call: internalCall.decodedCall })
     await waitForTransactionWithRetry(api, tx, alice)
 
     const valueOnChain = await api.query.SubtensorModule.NetworkLastLockCost.getValue()
-    assert.equal(defaultNetworkLastLockCost, valueOnChain)
+    assert.equal(networkMinLockCost, valueOnChain)
 }

contract-tests/test/leasing.precompile.test.ts

@@ -7,7 +7,7 @@ import { ethers } from "ethers";
 import { TypedApi } from "polkadot-api";
 import { devnet } from "@polkadot-api/descriptors";
 import { getAliceSigner, getBobSigner, getDevnetApi, waitForFinalizedBlock } from "../src/substrate";
-import { forceSetBalanceToEthAddress, setNetworkLastLockCost } from "../src/subtensor";
+import { forceSetBalanceToEthAddress, resetNetworkLastLockCost } from "../src/subtensor";
 import { decodeAddress } from "@polkadot/util-crypto";
 import { u8aToHex } from "@polkadot/util";
 import { ILEASING_ADDRESS, ILeasingABI } from "../src/contracts/leasing";
@@ -43,8 +43,7 @@ describe("Test Leasing precompile", () => {
         await forceSetBalanceToEthAddress(api, wallet1.address);
         await forceSetBalanceToEthAddress(api, wallet2.address);
 
-        const defaultNetworkLastLockCost = await api.query.SubtensorModule.NetworkMinLockCost.getValue()
-        await setNetworkLastLockCost(api, defaultNetworkLastLockCost);
+        await resetNetworkLastLockCost(api);
         const minLockCost = await api.query.SubtensorModule.NetworkMinLockCost.getValue();
         // guarantee that the crowdloan cap is larger than the deposit
         if (minLockCost > crowdloanDeposit) {
@@ -197,7 +196,6 @@ describe("Test Leasing precompile", () => {
 
         let lease = await api.query.SubtensorModule.SubnetLeases.getValue(nextLeaseId);
         assert.ok(lease);
-
         const netuid = lease.netuid;
 
         tx = await leaseContract.terminateLease(nextLeaseId, convertH160ToPublicKey(hotkey.address));

contract-tests/test/staking.precompile.full-limit.test.ts

@@ -62,7 +62,7 @@ describe("Test staking precompile add remove limit methods", () => {
         IStakingV2ABI,
         wallet1,
       );
-      await new Promise(resolve => setTimeout(resolve, 1000));
+
       const tx = await contract.addStakeLimit(
         hotkey.publicKey,
         tao(2000),
@@ -131,7 +131,7 @@ describe("Test staking precompile add remove limit methods", () => {
         IStakingV2ABI,
         wallet2,
       );
-      await new Promise(resolve => setTimeout(resolve, 1000));
+
       const tx = await contract.addStakeLimit(
         hotkey.publicKey,
         tao(2000),
@@ -165,7 +165,7 @@ describe("Test staking precompile add remove limit methods", () => {
         IStakingV2ABI,
         wallet2,
       );
-      await new Promise(resolve => setTimeout(resolve, 1000));
+
       const tx = await contract.removeStakeFull(
         hotkey.publicKey,
         netuid,

contract-tests/test/staking.precompile.wrap.test.ts

@@ -5,12 +5,10 @@ import { TypedApi } from "polkadot-api";
 import {
   convertH160ToSS58,
   convertPublicKeyToSs58,
-  ethAddressToH160,
 } from "../src/address-utils";
 import { tao, raoToEth } from "../src/balance-math";
 import {
   addNewSubnetwork,
-  addStake,
   disableWhiteListCheck,
   forceSetBalanceToEthAddress,
   forceSetBalanceToSs58Address,
@@ -20,7 +18,6 @@ import { ethers } from "ethers";
 import { generateRandomEthersWallet } from "../src/utils";
 
 import { abi, bytecode } from "../src/contracts/stakeWrap";
-import { setMaxIdleHTTPParsers } from "http";
 
 describe("Test staking precompile add from deployed contract", () => {
   const hotkey = getRandomSubstrateKeypair();
@@ -71,16 +68,13 @@ describe("Test staking precompile add from deployed contract", () => {
       wallet1,
     );
 
-    await new Promise(resolve => setTimeout(resolve, 1000));
     const tx = await deployedContract.stake(
       hotkey.publicKey,
       netuid,
       tao(2),
     );
     await tx.wait();
 
-    await new Promise(resolve => setTimeout(resolve, 1000));
-
     const tx2 = await deployedContract.removeStake(
       hotkey.publicKey,
       netuid,
@@ -92,7 +86,6 @@ describe("Test staking precompile add from deployed contract", () => {
 
   it("Staker add stake limit", async () => {
     let netuid = (await api.query.SubtensorModule.TotalNetworks.getValue()) - 1;
-    let ss58Address = convertH160ToSS58(wallet1.address);
 
     const contractFactory = new ethers.ContractFactory(abi, bytecode, wallet1)
     const contract = await contractFactory.deploy()
@@ -109,7 +102,6 @@ describe("Test staking precompile add from deployed contract", () => {
     await txResponse.wait();
 
     const balance = await api.query.System.Account.getValue(convertH160ToSS58(contract.target.toString()))
-    console.log(" == balance is ", balance.data.free)
 
     const deployedContract = new ethers.Contract(
       contract.target.toString(),

contract-tests/test/subnet.precompile.hyperparameter.test.ts

@@ -30,10 +30,6 @@ describe("Test the Subnet precompile contract", () => {
         await disableAdminFreezeWindowAndOwnerHyperparamRateLimit(api)
     })
 
-    beforeEach(async () => {
-        await new Promise(resolve => setTimeout(resolve, 500))
-    })
-
     it("Can register network without identity info", async () => {
         const totalNetwork = await api.query.SubtensorModule.TotalNetworks.getValue()