dialing timeout back down

.dockerignore

@@ -1,2 +0,0 @@
-Dockerfile
-node_modules

.gitea/workflows/publish.yaml

@@ -1,32 +0,0 @@
-name: Publish npm package to gitea
-on:
-  release:
-    types: [published]
-jobs:
-  npm_publish:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [ 16.x ]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-      - run: yarn
-      - name: Run yarn build
-        run: |
-          yarn build
-      - name: Configure git.vdb.to npm registry
-        run: |
-          npm config set registry https://git.vdb.to/api/packages/cerc-io/npm/
-      - name: Authenticate to git.vdb.to registry
-        run: |
-          npm config set -- '//git.vdb.to/api/packages/cerc-io/npm/:_authToken' "${{ secrets.GITEA_PUBLISH_TOKEN }}"
-      - name: npm publish
-        run: |
-          npm publish

.gitea/workflows/test.yml

@@ -1,81 +0,0 @@
-name: Tests
-on:
-  pull_request:
-    branches:
-      - '*'
-  push:
-    branches:
-      - main
-      - release/**
-
-env:
-  DOCKER_HOST: unix:///var/run/dind.sock
-
-jobs:
-  sdk_tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Checkout laconicd
-        uses: actions/checkout@v3
-        with:
-          path: "./laconicd/"
-          repository: cerc-io/laconicd
-          fetch-depth: 0
-          ref: main
-      - name: Environment
-        run: ls -tlh && env
-      - name: Start dockerd
-        run: |
-          dockerd -H $DOCKER_HOST --userland-proxy=false &
-          sleep 5
-      - name: build containers scripts
-        working-directory: laconicd/tests/sdk_tests
-        run: ./build-laconicd-container.sh
-      - name: build test-container
-        run: docker build -t cerc-io/laconic-sdk-tester:local-test -f laconicd/tests/sdk_tests/Dockerfile-sdk .
-      - name: start containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose up -d
-      - name: run basic tests
-        working-directory: laconicd/tests/sdk_tests
-        run: |
-          laconicd_key=$( docker compose exec laconicd echo y | docker compose exec laconicd laconicd keys export mykey --unarmored-hex --unsafe )
-          cosmos_chain_id=laconic_9000-1
-          laconicd_rest_endpoint=http://laconicd:1317
-          laconicd_gql_endpoint=http://laconicd:9473/api
-          sleep 30s
-          docker compose exec sdk-test-runner sh -c "COSMOS_CHAIN_ID=${cosmos_chain_id} LACONICD_REST_ENDPOINT=${laconicd_rest_endpoint} LACONICD_GQL_ENDPOINT=${laconicd_gql_endpoint} PRIVATE_KEY=${laconicd_key} yarn test"
-      - name: stop containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose down
-      - name: start auction containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose -f docker-compose-auctions.yml up -d
-      - name: run auction tests
-        working-directory: laconicd/tests/sdk_tests
-        run: |
-          laconicd_key=$( docker compose exec laconicd echo y | docker compose exec laconicd laconicd keys export mykey --unarmored-hex --unsafe )
-          cosmos_chain_id=laconic_9000-1
-          laconicd_rest_endpoint=http://laconicd:1317
-          laconicd_gql_endpoint=http://laconicd:9473/api
-          sleep 30s
-          docker compose exec sdk-test-runner sh -c "COSMOS_CHAIN_ID=${cosmos_chain_id} LACONICD_REST_ENDPOINT=${laconicd_rest_endpoint} LACONICD_GQL_ENDPOINT=${laconicd_gql_endpoint} PRIVATE_KEY=${laconicd_key} yarn test:auctions"
-      - name: start containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose down
-      - name: start containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose -f docker-compose-nameservice.yml up -d
-      - name: run nameservice expiry tests
-        working-directory: laconicd/tests/sdk_tests
-        run: |
-          laconicd_key=$( docker compose exec laconicd echo y | docker compose exec laconicd laconicd keys export mykey --unarmored-hex --unsafe )
-          cosmos_chain_id=laconic_9000-1
-          laconicd_rest_endpoint=http://laconicd:1317
-          laconicd_gql_endpoint=http://laconicd:9473/api
-          sleep 30s
-          docker compose exec sdk-test-runner sh -c "COSMOS_CHAIN_ID=${cosmos_chain_id} LACONICD_REST_ENDPOINT=${laconicd_rest_endpoint} LACONICD_GQL_ENDPOINT=${laconicd_gql_endpoint} PRIVATE_KEY=${laconicd_key} yarn test:nameservice-expiry"
-      - name: stop nameservice containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose down

.github/workflows/test.yml

@@ -1,72 +0,0 @@
-name: Tests
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-      - release/**
-
-jobs:
-  sdk_tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Checkout laconicd
-        uses: actions/checkout@v3
-        with:
-          path: "./laconicd/"
-          repository: cerc-io/laconicd
-          fetch-depth: 0
-          ref: main
-      - name: Environment
-        run: ls -tlh && env
-      - name: build containers scripts
-        working-directory: laconicd/tests/sdk_tests
-        run: ./build-laconicd-container.sh
-      - name: build test-container
-        run: docker build -t cerc-io/laconic-sdk-tester:local-test -f laconicd/tests/sdk_tests/Dockerfile-sdk .
-      - name: start containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose up -d
-      - name: run basic tests
-        working-directory: laconicd/tests/sdk_tests
-        run: |
-          laconicd_key=$( docker compose exec laconicd echo y | docker compose exec laconicd laconicd keys export mykey --unarmored-hex --unsafe )
-          cosmos_chain_id=laconic_9000-1
-          laconicd_rest_endpoint=http://laconicd:1317
-          laconicd_gql_endpoint=http://laconicd:9473/api
-          sleep 30s
-          docker compose exec sdk-test-runner sh -c "COSMOS_CHAIN_ID=${cosmos_chain_id} LACONICD_REST_ENDPOINT=${laconicd_rest_endpoint} LACONICD_GQL_ENDPOINT=${laconicd_gql_endpoint} PRIVATE_KEY=${laconicd_key} yarn test"
-      - name: stop containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose down
-      - name: start auction containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose -f docker-compose-auctions.yml up -d
-      - name: run auction tests
-        working-directory: laconicd/tests/sdk_tests
-        run: |
-          laconicd_key=$( docker compose exec laconicd echo y | docker compose exec laconicd laconicd keys export mykey --unarmored-hex --unsafe )
-          cosmos_chain_id=laconic_9000-1
-          laconicd_rest_endpoint=http://laconicd:1317
-          laconicd_gql_endpoint=http://laconicd:9473/api
-          sleep 30s
-          docker compose exec sdk-test-runner sh -c "COSMOS_CHAIN_ID=${cosmos_chain_id} LACONICD_REST_ENDPOINT=${laconicd_rest_endpoint} LACONICD_GQL_ENDPOINT=${laconicd_gql_endpoint} PRIVATE_KEY=${laconicd_key} yarn test:auctions"
-      - name: start containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose down
-      - name: start containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose -f docker-compose-nameservice.yml up -d
-      - name: run nameservice expiry tests
-        working-directory: laconicd/tests/sdk_tests
-        run: |
-          laconicd_key=$( docker compose exec laconicd echo y | docker compose exec laconicd laconicd keys export mykey --unarmored-hex --unsafe )
-          cosmos_chain_id=laconic_9000-1
-          laconicd_rest_endpoint=http://laconicd:1317
-          laconicd_gql_endpoint=http://laconicd:9473/api
-          sleep 30s
-          docker compose exec sdk-test-runner sh -c "COSMOS_CHAIN_ID=${cosmos_chain_id} LACONICD_REST_ENDPOINT=${laconicd_rest_endpoint} LACONICD_GQL_ENDPOINT=${laconicd_gql_endpoint} PRIVATE_KEY=${laconicd_key} yarn test:nameservice-expiry"
-      - name: stop nameservice containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose down

.gitignore

@@ -1,4 +1,3 @@
 node_modules
 dist
 .env
-.idea*

Dockerfile

@@ -1,38 +0,0 @@
-# Originally from: https://github.com/devcontainers/images/blob/main/src/javascript-node/.devcontainer/Dockerfile
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=16-bullseye
-FROM node:${VARIANT}
-
-ARG USERNAME=node
-ARG NPM_GLOBAL=/usr/local/share/npm-global
-
-# Add NPM global to PATH.
-ENV PATH=${NPM_GLOBAL}/bin:${PATH}
-
-RUN \
-    # Configure global npm install location, use group to adapt to UID/GID changes
-    if ! cat /etc/group | grep -e "^npm:" > /dev/null 2>&1; then groupadd -r npm; fi \
-    && usermod -a -G npm ${USERNAME} \
-    && umask 0002 \
-    && mkdir -p ${NPM_GLOBAL} \
-    && touch /usr/local/etc/npmrc \
-    && chown ${USERNAME}:npm ${NPM_GLOBAL} /usr/local/etc/npmrc \
-    && chmod g+s ${NPM_GLOBAL} \
-    && npm config -g set prefix ${NPM_GLOBAL} \
-    && su ${USERNAME} -c "npm config -g set prefix ${NPM_GLOBAL}" \
-    # Install eslint
-    && su ${USERNAME} -c "umask 0002 && npm install -g eslint" \
-    && npm cache clean --force > /dev/null 2>&1
-
-WORKDIR /
-COPY entrypoint.sh .
-ENTRYPOINT ["/entrypoint.sh"]
-CMD node --version
-
-WORKDIR /app/laconic-sdk
-
-COPY package*.json .
-RUN yarn install
-COPY . .
-
-WORKDIR /app/laconic-sdk

README.md

@@ -57,7 +57,7 @@ Follow these steps to run the tests:
   - In laconicd repo run:
 
     ```bash
-    TEST_REGISTRY_EXPIRY=true ./init.sh
+    TEST_NAMESERVICE_EXPIRY=true ./init.sh
     ```
 
   - Export the private key and change it in `.env` file again using:

entrypoint.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-exec "$@"
-

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/laconic-sdk",
-  "version": "0.1.6",
+  "version": "0.1.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "git@github.com:cerc-io/laconic-sdk.git",

src/bond.test.ts

@@ -12,10 +12,20 @@ jest.setTimeout(90 * 1000);
 const bondTests = () => {
   let registry: Registry;
 
+  let watcher: any;
+
+  let version1: string;
+  let version2: string;
+
+  let bondId1: string;
+  let bondId2: string;
+
+  let bondOwner: string;
+
   const publishNewWatcherVersion = async (bondId: string) => {
-    let watcher = await ensureUpdatedConfig(WATCHER_YML_PATH);
+    watcher = await ensureUpdatedConfig(WATCHER_YML_PATH);
     await registry.setRecord({ privateKey, record: watcher.record, bondId }, privateKey, fee);
-    return watcher;
+    return watcher.record.version;
   };
 
   beforeAll(async () => {
@@ -23,119 +33,93 @@ const bondTests = () => {
   });
 
   test('Create bond.', async () => {
-    let bondId = await registry.getNextBondId(privateKey);
-    expect(bondId).toBeDefined();
+    bondId1 = await registry.getNextBondId(privateKey);
+    expect(bondId1).toBeDefined();
     await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);
+  })
+
+  test('Get bond by ID.', async () => {
+    const [bond] = await registry.getBondsByIds([bondId1]);
+    expect(bond).toBeDefined();
+    expect(bond.id).toBe(bondId1);
+    expect(bond.balance).toHaveLength(1);
+    expect(bond.balance[0]).toEqual({ type: 'aphoton', quantity: '1000000000' });
+    bondOwner = bond.owner;
   });
 
-  describe('With bond created', () => {
-    let bond1: any
+  test('Query bonds.', async () => {
+    const bonds = await registry.queryBonds();
+    expect(bonds).toBeDefined();
+    const bond = bonds.filter((bond: any) => bond.id === bondId1);
+    expect(bond).toBeDefined();
+  });
 
-    beforeAll(async () => {
-      let bondId1 = await registry.getNextBondId(privateKey);
-      expect(bondId1).toBeDefined();
-      await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);
+  test('Query bonds by owner.', async () => {
+    const bonds = await registry.queryBonds({ owner: bondOwner });
+    expect(bonds).toBeDefined();
+    const bond = bonds.filter((bond: any) => bond.id === bondId1);
+    expect(bond).toBeDefined();
+  });
 
-      [bond1] = await registry.getBondsByIds([bondId1]);
-      expect(bond1).toBeDefined();
-      expect(bond1.id).toEqual(bondId1);
-    });
+  test('Refill bond.', async () => {
+    await registry.refillBond({ id: bondId1, denom: 'aphoton', amount: '500' }, privateKey, fee);
 
-    test('Get bond by ID.', async () => {
-      const [bond] = await registry.getBondsByIds([bond1.id]);
-      expect(bond).toBeDefined();
-      expect(bond.id).toBe(bond1.id);
-      expect(bond.balance).toHaveLength(1);
-      expect(bond.balance[0]).toEqual({ type: 'aphoton', quantity: '1000000000' });
-    });
+    const [bond] = await registry.getBondsByIds([bondId1]);
+    expect(bond).toBeDefined();
+    expect(bond.id).toBe(bondId1);
+    expect(bond.balance).toHaveLength(1);
+    expect(bond.balance[0]).toEqual({ type: 'aphoton', quantity: '1000000500' });
+  });
 
-    test('Query bonds.', async () => {
-      const bonds = await registry.queryBonds();
-      expect(bonds).toBeDefined();
-      const bond = bonds.filter((bond: any) => bond.id === bond1.id);
-      expect(bond).toBeDefined();
-    });
+  test('Withdraw bond.', async () => {
+    await registry.withdrawBond({ id: bondId1, denom: 'aphoton', amount: '500' }, privateKey, fee);
 
-    test('Query bonds by owner.', async () => {
-      const bonds = await registry.queryBonds({ owner: bond1.owner });
-      expect(bonds).toBeDefined();
-      const bond = bonds.filter((bond: any) => bond.id === bond1.id);
-      expect(bond).toBeDefined();
-    });
+    const [bond] = await registry.getBondsByIds([bondId1]);
+    expect(bond).toBeDefined();
+    expect(bond.id).toBe(bondId1);
+    expect(bond.balance).toHaveLength(1);
+    expect(bond.balance[0]).toEqual({ type: 'aphoton', quantity: '1000000000' });
+  });
 
-    test('Refill bond.', async () => {
-      await registry.refillBond({ id: bond1.id, denom: 'aphoton', amount: '500' }, privateKey, fee);
-
-      const [bond] = await registry.getBondsByIds([bond1.id]);
-      expect(bond).toBeDefined();
-      expect(bond.id).toBe(bond1.id);
-      expect(bond.balance).toHaveLength(1);
-      expect(bond.balance[0]).toEqual({ type: 'aphoton', quantity: '1000000500' });
-    });
-
-    test('Withdraw bond.', async () => {
-      await registry.withdrawBond({ id: bond1.id, denom: 'aphoton', amount: '500' }, privateKey, fee);
-
-      const [bond] = await registry.getBondsByIds([bond1.id]);
-      expect(bond).toBeDefined();
-      expect(bond.id).toBe(bond1.id);
-      expect(bond.balance).toHaveLength(1);
-      expect(bond.balance[0]).toEqual({ type: 'aphoton', quantity: '1000000000' });
-    });
-
-    test('Cancel bond.', async () => {
-      await registry.cancelBond({ id: bond1.id }, privateKey, fee);
-
-      const [bond] = await registry.getBondsByIds([bond1.id]);
-      expect(bond.id).toBe("");
-      expect(bond.owner).toBe("");
-      expect(bond.balance).toHaveLength(0);
-    });
+  test('Cancel bond.', async () => {
+    await registry.cancelBond({ id: bondId1 }, privateKey, fee);
 
+    const [bond] = await registry.getBondsByIds([bondId1]);
+    expect(bond.id).toBe("");
+    expect(bond.owner).toBe("");
+    expect(bond.balance).toHaveLength(0);
   });
 
   test('Associate/Dissociate bond.', async () => {
-    let bondId1: string;
-
     bondId1 = await registry.getNextBondId(privateKey);
     expect(bondId1).toBeDefined();
     await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);
 
     // Create a new record.
-    let watcher = await publishNewWatcherVersion(bondId1);
-    let query = { type: watcher.record.type, url: watcher.record.url, version: watcher.record.version };
-    let [record1] = await registry.queryRecords(query, true);
+    version1 = await publishNewWatcherVersion(bondId1);
+    let [record1] = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
     expect(record1.bondId).toBe(bondId1);
 
     // Dissociate record, query and confirm.
     await registry.dissociateBond({ recordId: record1.id }, privateKey, fee);
-    [record1] = await registry.queryRecords(query, true);
+    [record1] = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
     expect(record1.bondId).toBe('');
 
     // Associate record with bond, query and confirm.
     await registry.associateBond({ recordId: record1.id, bondId: bondId1 }, privateKey, fee);
-    [record1] = await registry.queryRecords(query, true);
+    [record1] = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
     expect(record1.bondId).toBe(bondId1);
   });
 
   test('Reassociate/Dissociate records.', async () => {
-    let bondId1: string;
-    let bondId2: string;
-
-    bondId1 = await registry.getNextBondId(privateKey);
-    expect(bondId1).toBeDefined();
-    await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);
-
     // Create a new record version.
-    let watcher = await publishNewWatcherVersion(bondId1);
-    let queryv1 = { type: watcher.record.type, url: watcher.record.url, version: watcher.record.version };
-    let queryv2 = { type: watcher.record.type, url: watcher.record.url, version: watcher.record.version };
+    version2 = await publishNewWatcherVersion(bondId1);
 
     // Check version1, version2 as associated with bondId1.
     let records;
-    records = await registry.queryRecords(queryv1, true);
+    records = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
     expect(records[0].bondId).toBe(bondId1);
-    records = await registry.queryRecords(queryv2, true);
+    records = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version2 }, true);
     expect(records[0].bondId).toBe(bondId1);
 
     // Create another bond.
@@ -147,16 +131,16 @@ const bondTests = () => {
 
     // Reassociate records from bondId1 to bondId2, verify change.
     await registry.reassociateRecords({ oldBondId: bondId1, newBondId: bondId2 }, privateKey, fee);
-    records = await registry.queryRecords(queryv1, true);
+    records = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
     expect(records[0].bondId).toBe(bondId2);
-    records = await registry.queryRecords(queryv2, true);
+    records = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version2 }, true);
     expect(records[0].bondId).toBe(bondId2);
 
     // Dissociate all records from bond, verify change.
     await registry.dissociateRecords({ bondId: bondId2 }, privateKey, fee);
-    records = await registry.queryRecords(queryv1, true);
+    records = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
     expect(records[0].bondId).toBe('');
-    records = await registry.queryRecords(queryv2, true);
+    records = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version2 }, true);
     expect(records[0].bondId).toBe('');
   });
 };

src/index.ts

@@ -180,9 +180,9 @@ export class Registry {
   }
 
   /**
-   * Publish record.
-   * @param transactionPrivateKey - private key in HEX to sign transaction.
-   */
+ * Publish record.
+ * @param transactionPrivateKey - private key in HEX to sign transaction.
+ */
   async setRecord(
     params: { privateKey: string, record: any, bondId: string },
     transactionPrivateKey: string,

src/nameservice-expiry.test.ts

@@ -30,7 +30,7 @@ const nameserviceExpiryTests = () => {
   test('Set record and check bond balance', async () => {
     // Create watcher.
     watcher = await ensureUpdatedConfig(WATCHER_YML_PATH);
-    const result = await registry.setRecord(
+    await registry.setRecord(
       {
         privateKey,
         bondId,
@@ -39,8 +39,8 @@ const nameserviceExpiryTests = () => {
       privateKey,
       fee
     )
-    console.log("SetRecordResult: " + result.data.id)
-    const [record] = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version }, true);
+
+    const [record] = await registry.queryRecords({ type: 'watcher', version: watcher.record.version }, true);
     recordExpiryTime = new Date(record.expiryTime);
 
     const [bond] = await registry.getBondsByIds([bondId]);
@@ -63,22 +63,21 @@ const nameserviceExpiryTests = () => {
   });
 
   test('Check record expiry time', async() => {
-    const [record] = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version }, true);
-    const updatedExpiryTime = new Date();
+    const [record] = await registry.queryRecords({ type: 'watcher', version: watcher.record.version }, true);
+    const updatedExpiryTime = new Date(record.expiryTime);
     expect(updatedExpiryTime.getTime()).toBeGreaterThan(recordExpiryTime.getTime());
     recordExpiryTime = updatedExpiryTime;
   })
 
   test('Check authority expiry time', async() => {
     const [authority] = await registry.lookupAuthorities([authorityName]);
-    const updatedExpiryTime = new Date();
+    const updatedExpiryTime = new Date(authority.expiryTime);
     expect(updatedExpiryTime.getTime()).toBeGreaterThan(authorityExpiryTime.getTime());
     authorityExpiryTime = updatedExpiryTime;
   })
 
   test('Check bond balance', async () => {
     const [bond] = await registry.getBondsByIds([bondId]);
-    console.log(bond)
     expect(bond).toBeDefined();
     expect(bond.balance).toHaveLength(0);
   })
@@ -88,7 +87,7 @@ const nameserviceExpiryTests = () => {
   });
 
   test('Check record deleted without bond balance', async() => {
-    const records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version }, true);
+    const records = await registry.queryRecords({ type: 'watcher', version: watcher.record.version }, true);
     expect(records).toHaveLength(0);
   })
 
@@ -105,7 +104,7 @@ if (!process.env.TEST_NAMESERVICE_EXPIRY) {
   /**
     Running these tests requires timers to be set. In laconicd repo run:
 
-    TEST_REGISTRY_EXPIRY=true ./init.sh
+    TEST_NAMESERVICE_EXPIRY=true ./init.sh
 
 
     Run tests:

src/naming.test.ts

@@ -7,7 +7,7 @@ import { ensureUpdatedConfig, getConfig } from './testing/helper';
 
 const WATCHER_YML_PATH = path.join(__dirname, './testing/data/watcher.yml');
 
-jest.setTimeout(120 * 1000);
+jest.setTimeout(180 * 1000);
 
 const { chainId, restEndpoint, gqlEndpoint, privateKey, fee } = getConfig();
 
@@ -18,12 +18,18 @@ const namingTests = () => {
   let watcher: any;
   let watcherId: string;
 
+  let authorityName: string;
+  let otherAuthorityName: string;
+  let otherPrivateKey: string;
+
+  let crn: string;
+
   beforeAll(async () => {
     registry = new Registry(gqlEndpoint, restEndpoint, chainId);
 
     // Create bond.
     bondId = await registry.getNextBondId(privateKey);
-    await registry.createBond({ denom: 'aphoton', amount: '2000000000' }, privateKey, fee);
+    await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);
 
     // Create watcher.
     watcher = await ensureUpdatedConfig(WATCHER_YML_PATH);
@@ -40,271 +46,221 @@ const namingTests = () => {
     watcherId = result.data.id;
   });
 
-  describe('Authority tests', () => {
-    test('Reserve authority.', async () => {
-      const authorityName = `laconic-${Date.now()}`;
-
-      await registry.reserveAuthority({ name: authorityName }, privateKey, fee);
-    });
-
-    describe('With authority reserved', () => {
-      let authorityName: string;
-      let crn: string;
-
-      beforeAll(async () => {
-        authorityName = `laconic-${Date.now()}`;
-        crn = `crn://${authorityName}/app/test`;
-
-        await registry.reserveAuthority({ name: authorityName }, privateKey, fee);
-      })
-
-      test('Lookup authority.', async () => {
-        const [record] = await registry.lookupAuthorities([authorityName]);
-
-        expect(record).toBeDefined();
-        expect(record.ownerAddress).not.toBe('');
-        expect(record.ownerPublicKey).not.toBe('');
-        expect(Number(record.height)).toBeGreaterThan(0);
-      });
-
-      test('Lookup non existing authority', async () => {
-        const [record] = await registry.lookupAuthorities(['does-not-exist']);
-
-        expect(record.ownerAddress).toBe('');
-        expect(record.ownerPublicKey).toBe('');
-        expect(Number(record.height)).toBe(0);
-      });
-
-      test('Reserve already reserved authority', async () => {
-        await expect(registry.reserveAuthority({ name: authorityName }, privateKey, fee)).
-          rejects.toThrow('Name already reserved.');
-      });
-
-      test('Reserve sub-authority.', async () => {
-        const subAuthority = `echo.${authorityName}`;
-        await registry.reserveAuthority({ name: subAuthority }, privateKey, fee);
-
-        const [record] = await registry.lookupAuthorities([subAuthority]);
-        expect(record).toBeDefined();
-        expect(record.ownerAddress).not.toBe('');
-        expect(record.ownerPublicKey).not.toBe('');
-        expect(Number(record.height)).toBeGreaterThan(0);
-      });
-
-      test('Reserve sub-authority with different owner.', async () => {
-        // Create another account, send tx to set public key on the account.
-        const mnenonic1 = Account.generateMnemonic();
-        const otherAccount1 = await Account.generateFromMnemonic(mnenonic1);
-        await registry.sendCoins({ denom: 'aphoton', amount: '1000000000', destinationAddress: otherAccount1.formattedCosmosAddress }, privateKey, fee);
-
-        const mnenonic2 = Account.generateMnemonic();
-        const otherAccount2 = await Account.generateFromMnemonic(mnenonic2);
-        await registry.sendCoins({ denom: 'aphoton', amount: '10', destinationAddress: otherAccount2.formattedCosmosAddress }, otherAccount1.getPrivateKey(), fee);
-
-        const subAuthority = `halo.${authorityName}`;
-        await registry.reserveAuthority({ name: subAuthority, owner: otherAccount1.formattedCosmosAddress }, privateKey, fee);
-
-        const [record] = await registry.lookupAuthorities([subAuthority]);
-        expect(record).toBeDefined();
-        expect(record.ownerAddress).toBeDefined();
-        expect(record.ownerAddress).toBe(otherAccount1.getCosmosAddress());
-        expect(record.ownerPublicKey).toBeDefined();
-        expect(Number(record.height)).toBeGreaterThan(0);
-      });
-
-      test('Set name for unbonded authority', async () => {
-        assert(watcherId)
-        await expect(registry.setName({ crn, cid: watcherId }, privateKey, fee)).
-          rejects.toThrow('Authority bond not found.');
-      });
-
-      test('Set authority bond', async () => {
-        await registry.setAuthorityBond({ name: authorityName, bondId }, privateKey, fee);
-      });
-    });
+  test('Reserve authority.', async () => {
+    authorityName = `laconic-${Date.now()}`;
+    await registry.reserveAuthority({ name: authorityName }, privateKey, fee);
   });
 
-  describe('Naming tests', () => {
-    let authorityName: string;
-    let otherAuthorityName: string;
-    let otherPrivateKey: string;
-    let otherAccount: Account;
+  test('Lookup authority.', async () => {
+    const [record] = await registry.lookupAuthorities([authorityName]);
 
-    beforeAll(async () => {
-      authorityName = `laconic-${Date.now()}`;
+    expect(record).toBeDefined();
+    expect(record.ownerAddress).not.toBe('');
+    expect(record.ownerPublicKey).not.toBe('');
+    expect(Number(record.height)).toBeGreaterThan(0);
+  });
 
-      await registry.reserveAuthority({ name: authorityName }, privateKey, fee);
-      await registry.setAuthorityBond({ name: authorityName, bondId }, privateKey, fee);
+  test('Lookup non existing authority', async () => {
+    const [record] = await registry.lookupAuthorities(['does-not-exist']);
 
-      // Create another account.
-      const mnenonic = Account.generateMnemonic();
-      otherAccount = await Account.generateFromMnemonic(mnenonic);
-      await registry.sendCoins({ denom: 'aphoton', amount: '1000000000', destinationAddress: otherAccount.formattedCosmosAddress }, privateKey, fee);
+    expect(record.ownerAddress).toBe('');
+    expect(record.ownerPublicKey).toBe('');
+    expect(Number(record.height)).toBe(0);
+  });
 
-      otherAuthorityName = `other-${Date.now()}`;
-      otherPrivateKey = otherAccount.privateKey.toString('hex');
-    });
+  test('Reserve already reserved authority', async () => {
+    await expect(registry.reserveAuthority({ name: authorityName }, privateKey, fee)).rejects.toThrow('Name already reserved.');
+  });
 
-    test('Set name', async () => {
-      const crn = `crn://${authorityName}/app/test1`;
+  test('Reserve sub-authority.', async () => {
+    const subAuthority = `echo.${authorityName}`;
+    await registry.reserveAuthority({ name: subAuthority }, privateKey, fee);
 
-      await registry.setName({ crn, cid: watcherId }, privateKey, fee);
+    const [record] = await registry.lookupAuthorities([subAuthority]);
+    expect(record).toBeDefined();
+    expect(record.ownerAddress).not.toBe('');
+    expect(record.ownerPublicKey).not.toBe('');
+    expect(Number(record.height)).toBeGreaterThan(0);
+  });
 
-      // Query records should return it (some CRN points to it).
-      const records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version });
-      expect(records).toBeDefined();
-      expect(records).toHaveLength(1);
+  test('Reserve sub-authority with different owner.', async () => {
+    // Create another account, send tx to set public key on the account.
+    const mnenonic1 = Account.generateMnemonic();
+    const otherAccount1 = await Account.generateFromMnemonic(mnenonic1);
+    await registry.sendCoins({ denom: 'aphoton', amount: '1000000000', destinationAddress: otherAccount1.formattedCosmosAddress }, privateKey, fee);
 
-      await registry.deleteName({ crn }, privateKey, fee);
-    });
+    const mnenonic2 = Account.generateMnemonic();
+    const otherAccount2 = await Account.generateFromMnemonic(mnenonic2);
+    await registry.sendCoins({ denom: 'aphoton', amount: '10', destinationAddress: otherAccount2.formattedCosmosAddress }, otherAccount1.getPrivateKey(), fee);
 
-    describe('With name set', () => {
-      let crn: string;
+    const subAuthority = `halo.${authorityName}`;
+    await registry.reserveAuthority({ name: subAuthority, owner: otherAccount1.formattedCosmosAddress }, privateKey, fee);
 
-      beforeAll(async () => {
-        crn = `crn://${authorityName}/app/test2`;
-        await registry.setName({ crn, cid: watcherId }, privateKey, fee);
-      });
+    const [record] = await registry.lookupAuthorities([subAuthority]);
+    expect(record).toBeDefined();
+    expect(record.ownerAddress).toBeDefined();
+    expect(record.ownerAddress).toBe(otherAccount1.getCosmosAddress());
+    expect(record.ownerPublicKey).toBeDefined();
+    expect(Number(record.height)).toBeGreaterThan(0);
+  });
 
-      afterAll(async () => {
-        await registry.deleteName({ crn }, privateKey, fee);
-      });
+  test('Set name for unbonded authority', async () => {
+    crn = `crn://${authorityName}/app/test`;
+    assert(watcherId)
+    await expect(registry.setName({ crn, cid: watcherId }, privateKey, fee)).rejects.toThrow('Authority bond not found.');
+  });
 
-      test('Lookup name', async () => {
-        const records = await registry.lookupNames([crn]);
-        expect(records).toBeDefined();
-        expect(records).toHaveLength(1);
+  test('Set authority bond', async () => {
+    await registry.setAuthorityBond({ name: authorityName, bondId }, privateKey, fee);
+  });
 
-        const [{ latest, history }] = records;
-        expect(latest).toBeDefined();
-        expect(latest.id).toBeDefined();
-        expect(latest.id).toBe(watcherId);
-        expect(latest.height).toBeDefined();
-        expect(history).toBeUndefined();
-      });
+  test('Set name', async () => {
+    crn = `crn://${authorityName}/app/test`;
+    await registry.setName({ crn, cid: watcherId }, privateKey, fee);
 
-      test('Resolve name', async () => {
-        const records = await registry.resolveNames([crn]);
-        expect(records).toBeDefined();
-        expect(records).toHaveLength(1);
+    // Query records should return it (some CRN points to it).
+    const records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version });
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(1);
+  });
 
-        const [{ attributes }] = records;
-        expect(attributes).toEqual(watcher.record);
-      });
+  test('Lookup name', async () => {
+    const records = await registry.lookupNames([crn]);
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(1);
 
-      test('Lookup name with history', async () => {
-        const updatedWatcher = await ensureUpdatedConfig(WATCHER_YML_PATH);
-        const result = await registry.setRecord(
-          {
-            privateKey,
-            bondId,
-            record: updatedWatcher.record
-          },
-          privateKey,
-          fee
-        )
+    const [{ latest, history }] = records;
+    expect(latest).toBeDefined();
+    expect(latest.id).toBeDefined();
+    expect(latest.id).toBe(watcherId);
+    expect(latest.height).toBeDefined();
+    expect(history).toBeUndefined();
+  });
 
-        const updatedWatcherId = result.data.id;
-        await registry.setName({ crn, cid: updatedWatcherId }, privateKey, fee);
+  test('Resolve name', async () => {
+    const records = await registry.resolveNames([crn]);
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(1);
 
-        const records = await registry.lookupNames([crn], true);
-        expect(records).toHaveLength(1);
+    const [{ attributes }] = records;
+    expect(attributes).toEqual(watcher.record);
+  });
 
-        const [{ latest, history }] = records;
-        expect(latest).toBeDefined();
-        expect(latest.id).toBeDefined();
-        expect(latest.id).toBe(updatedWatcherId);
-        expect(latest.height).toBeDefined();
-        expect(history).toBeDefined();
-        expect(history).toHaveLength(1);
+  test('Lookup name with history', async () => {
+    const updatedWatcher = await ensureUpdatedConfig(WATCHER_YML_PATH);
+    const result = await registry.setRecord(
+      {
+        privateKey,
+        bondId,
+        record: updatedWatcher.record
+      },
+      privateKey,
+      fee
+    )
 
-        const [oldRecord] = history;
-        expect(oldRecord).toBeDefined();
-        expect(oldRecord.id).toBeDefined();
-        expect(oldRecord.id).toBe(watcherId);
-        expect(oldRecord.height).toBeDefined();
-      });
+    const updatedWatcherId = result.data.id;
+    await registry.setName({ crn, cid: updatedWatcherId }, privateKey, fee);
 
-      test('Delete name', async () => {
-        await registry.deleteName({ crn }, privateKey, fee);
+    const records = await registry.lookupNames([crn], true);
+    expect(records).toHaveLength(1);
 
-        let records = await registry.lookupNames([crn], true);
-        expect(records).toBeDefined();
-        expect(records).toHaveLength(1);
+    const [{ latest, history }] = records;
+    expect(latest).toBeDefined();
+    expect(latest.id).toBeDefined();
+    expect(latest.id).toBe(updatedWatcherId);
+    expect(latest.height).toBeDefined();
+    expect(history).toBeDefined();
+    expect(history).toHaveLength(1);
 
-        const [{ latest }] = records;
-        expect(latest).toBeDefined();
-        expect(latest.id).toBeDefined();
-        expect(latest.id).toBe('');
-        expect(latest.height).toBeDefined();
+    const [oldRecord] = history;
+    expect(oldRecord).toBeDefined();
+    expect(oldRecord.id).toBeDefined();
+    expect(oldRecord.id).toBe(watcherId);
+    expect(oldRecord.height).toBeDefined();
+  });
 
-        // Query records should NOT return it (no CRN points to it).
-        records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version });
-        expect(records).toBeDefined();
-        expect(records).toHaveLength(0);
+  test('Set name without reserving authority', async () => {
+    await expect(registry.setName({ crn: 'crn://not-reserved/app/test', cid: watcherId }, privateKey, fee))
+      .rejects.toThrow('Name authority not found.');
+  });
 
-        // Query all records should return it (all: true).
-        records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version }, true);
-        expect(records).toBeDefined();
-        expect(records).toHaveLength(1);
-      });
+  test('Set name for non-owned authority', async () => {
+    // Create another account.
+    const mnenonic = Account.generateMnemonic();
+    const otherAccount = await Account.generateFromMnemonic(mnenonic);
+    await registry.sendCoins({ denom: 'aphoton', amount: '1000000000', destinationAddress: otherAccount.formattedCosmosAddress }, privateKey, fee);
 
-      test('Delete already deleted name', async () => {
-        await registry.deleteName({ crn }, privateKey, fee);
-        await registry.deleteName({ crn }, privateKey, fee);
+    // Other account reserves an authority.
+    otherAuthorityName = `other-${Date.now()}`;
+    otherPrivateKey = otherAccount.privateKey.toString('hex');
+    await registry.reserveAuthority({ name: otherAuthorityName }, otherPrivateKey, fee);
 
-        const records = await registry.lookupNames([crn], true);
-        expect(records).toBeDefined();
-        expect(records).toHaveLength(1);
+    // Try setting name under other authority.
+    await expect(registry.setName({ crn: `crn://${otherAuthorityName}/app/test`, cid: watcherId }, privateKey, fee)).rejects.toThrow('Access denied.');
+  });
 
-        const [{ latest }] = records;
-        expect(latest).toBeDefined();
-        expect(latest.id).toBeDefined();
-        expect(latest.id).toBe('');
-        expect(latest.height).toBeDefined();
-      });
-    });
+  test('Lookup non existing name', async () => {
+    const records = await registry.lookupNames(['crn://not-reserved/app/test']);
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(1);
+    const [record] = records;
+    expect(record).toBeNull();
+  });
 
-    test('Set name without reserving authority', async () => {
-      await expect(registry.setName({ crn: 'crn://not-reserved/app/test', cid: watcherId }, privateKey, fee))
-        .rejects.toThrow('Name authority not found.');
-    });
+  test('Resolve non existing name', async () => {
+    const records = await registry.resolveNames(['crn://not-reserved/app/test']);
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(1);
+    const [record] = records;
+    expect(record).toBeNull();
+  });
 
-    test('Set name for non-owned authority', async () => {
-      await registry.sendCoins({ denom: 'aphoton', amount: '1000000000', destinationAddress: otherAccount.formattedCosmosAddress }, privateKey, fee);
+  test('Delete name', async () => {
+    await registry.deleteName({ crn }, privateKey, fee);
 
-      // Other account reserves an authority.
-      await registry.reserveAuthority({ name: otherAuthorityName }, otherPrivateKey, fee);
+    let records = await registry.lookupNames([crn], true);
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(1);
 
-      // Try setting name under other authority.
-      await expect(registry.setName({ crn: `crn://${otherAuthorityName}/app/test`, cid: watcherId }, privateKey, fee)).rejects.toThrow('Access denied.');
-    });
+    const [{ latest }] = records;
+    expect(latest).toBeDefined();
+    expect(latest.id).toBeDefined();
+    expect(latest.id).toBe('');
+    expect(latest.height).toBeDefined();
 
-    test('Delete name for non-owned authority.', async () => {
-      const otherBondId = await registry.getNextBondId(otherPrivateKey);
-      await registry.createBond({ denom: 'aphoton', amount: '10000' }, otherPrivateKey, fee);
-      await registry.setAuthorityBond({ name: otherAuthorityName, bondId: otherBondId }, otherPrivateKey, fee);
-      await registry.setName({ crn: `crn://${otherAuthorityName}/app/test`, cid: watcherId }, otherPrivateKey, fee);
+    // Query records should NOT return it (no CRN points to it).
+    records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version });
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(0);
 
-      // Try deleting name under other authority.
-      await expect(registry.deleteName({ crn: `crn://${otherAuthorityName}/app/test` }, privateKey, fee)).rejects.toThrow('Access denied.');
-    });
+    // Query all records should return it (all: true).
+    records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version }, true);
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(1);
+  });
 
-    test('Lookup non existing name', async () => {
-      const records = await registry.lookupNames(['crn://not-reserved/app/test']);
-      expect(records).toBeDefined();
-      expect(records).toHaveLength(1);
-      const [record] = records;
-      expect(record).toBeNull();
-    });
+  test('Delete already deleted name', async () => {
+    await registry.deleteName({ crn }, privateKey, fee);
 
-    test('Resolve non existing name', async () => {
-      const records = await registry.resolveNames(['crn://not-reserved/app/test']);
-      expect(records).toBeDefined();
-      expect(records).toHaveLength(1);
-      const [record] = records;
-      expect(record).toBeNull();
-    });
+    const records = await registry.lookupNames([crn], true);
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(1);
+
+    const [{ latest }] = records;
+    expect(latest).toBeDefined();
+    expect(latest.id).toBeDefined();
+    expect(latest.id).toBe('');
+    expect(latest.height).toBeDefined();
+  });
+
+  test('Delete name for non-owned authority.', async () => {
+    const otherBondId = await registry.getNextBondId(otherPrivateKey);
+    await registry.createBond({ denom: 'aphoton', amount: '10000' }, otherPrivateKey, fee);
+    await registry.setAuthorityBond({ name: otherAuthorityName, bondId: otherBondId }, otherPrivateKey, fee);
+    await registry.setName({ crn: `crn://${otherAuthorityName}/app/test`, cid: watcherId }, otherPrivateKey, fee);
+
+    // Try deleting name under other authority.
+    await expect(registry.deleteName({ crn: `crn://${otherAuthorityName}/app/test` }, privateKey, fee)).rejects.toThrow('Access denied.');
   });
 };
 

src/testing/data/watcher.yml

@@ -4,4 +4,4 @@ record:
   repo_registration_record_cid: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D
   build_artifact_cid: QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9
   tls_cert_cid: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
-  version: 1.0.23
+  version: 1.0.17

src/testing/helper.ts

@@ -24,18 +24,13 @@ export const getBaseConfig = async (path: string) => {
  * Provision a bond for record registration.
  */
 export const provisionBondId = async (registry: Registry, privateKey: string, fee: Fee) => {
-  // let bonds = await registry.queryBonds();
-  // console.log("found bonds: " + bonds.length)
-  // if (!bonds.length) {
-  //   await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);
-  //   bonds = await registry.queryBonds();
-  //   console.log("created bond and got back: " + bonds.length)
-  // }
-  let bondId: string;
-  bondId = await registry.getNextBondId(privateKey);
-  await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);
-  return bondId
-  //return bonds[0].id;
+  let bonds = await registry.queryBonds();
+  if (!bonds.length) {
+    await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);
+    bonds = await registry.queryBonds();
+  }
+
+  return bonds[0].id;
 };
 
 export const getConfig = () => {