From 1842b159f11c83a7403c30823e71b08569ecf37c Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@evernym.com>
Date: Wed, 17 Aug 2022 15:13:24 +0300
Subject: [PATCH 01/76] Introduce first ginkgo tests

---
 .github/workflows/build.yml       |   4 +-
 .github/workflows/test.yml        | 487 ++++++++++++++++--------------
 x/cheqd/utils/crypto_test.go      | 127 ++++----
 x/cheqd/utils/utils_suite_test.go |  13 +
 4 files changed, 343 insertions(+), 288 deletions(-)
 create mode 100644 x/cheqd/utils/utils_suite_test.go

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 35c41a0e2..14e3bfe82 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,8 +35,8 @@ jobs:
           name: cheqd-noded
           path: dist/**/cheqd-noded
 
-      - name: Run Golang unit tests
-        run: go test -v ./...
+      # - name: Run Golang unit tests
+      #   run: go test -v ./...
 
   build-docker:
     name: "Docker image"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c2fdf826c..3630f7b54 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,248 +15,267 @@ permissions:
   packages: read
 
 jobs:
-
-  test-new-node-setup:
-    name: "New node setup"
-    runs-on: ubuntu-latest
-    env:
-      VERSION: ${{ inputs.VERSION }}
-    
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install cheqd-noded binary
-        working-directory: ./tests/e2e-complex/interactive-install
-        run: sudo sh -c 'python3 ../../../installer/installer.py 1 < .answers'
-
-      - name: Download node Docker image
-        uses: actions/download-artifact@v3
-        with:
-          name: cheqd-node-image.tar
-
-      - name: Load node Docker image
-        run: docker load -i cheqd-node-image.tar
-
-      - name: Setup 4 Validators + 2 Observers Docker localnet
-        working-directory: ./docker/localnet
-        run: |
-          set -euo pipefail
-          bash gen-network-config.sh
-          CHEQD_NODE_IMAGE=cheqd-node DOCKER_IMAGE_VERSION=latest docker compose up -d
-
-      - name: Check all Docker localnet nodes are active
-        run: |
-          set -euo pipefail
-          bash ./tests/tools/wait-for-chain.sh
-
-      - name: Add an Observer node using Interactive installer
-        working-directory: ./tests/e2e-complex/interactive-install
-        run: |
-          set -euo pipefail
-          bash add-observer.sh
-          bash wait.sh "[[ $(cheqd-noded status -n 'tcp://localhost:26677' 2>&1 | wc -l) == 1 ]] && echo "Observer node is up""
-
-      - name: Promote Observer to Validator
-        working-directory: ./tests/e2e-complex/interactive-install
-        run: |
-          bash promote-validator.sh
-          bash check-promotion.sh
-          # shellcheck disable=SC2016
-          bash wait.sh '[[ $(curl -s localhost:26657/block | sed -nr '"'"'s/.*signature": (.*?).*/\1/p'"'"' | wc -l) == 5 ]] && echo "There are 5 validators signatures in block!"'
-          # shellcheck disable=SC2016
-          bash wait.sh '[[ $(curl -s localhost:26657/block | sed -nr '"'"'s/.*(signature": null).*/\1/p'"'"' | wc -l) == 0 ]] && echo "There are no null signatures in block!"'
-
-      - name: Gather logs on failure
-        if: ${{ failure() }}
-        run: |
-          journalctl -ex | grep cheqd
-
-  python-integration-tests:
-    name: "Python based Cosmos and identity tests"
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Load node binary artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: cheqd-noded
-          path: /home/runner/.local/bin
-
-      - name: Restore binary permissions
-        run: sudo chmod +x /home/runner/.local/bin/cheqd-noded
-
-      - name: Download node Docker image
-        uses: actions/download-artifact@v3
-        with:
-          name: cheqd-node-image.tar
-
-      - name: Load node Docker image
-        run: docker load -i cheqd-node-image.tar
-
-      - name: Setup 4 Validators + 2 Observers Docker localnet 
-        working-directory: ./docker/localnet
-        run: |
-          bash gen-network-config.sh
-          CHEQD_NODE_IMAGE=cheqd-node DOCKER_IMAGE_VERSION=latest docker compose up -d
-
-      - name: Check all Docker localnet nodes are active
-        run: bash tests/tools/wait-for-chain.sh
-
-      - name: Setup Python environment
-        working-directory: ./tests/e2e-pytest
-        run: |
-          set -euo pipefail
-          pip3 install -r requirements.txt >> /dev/null
-          cp -Rf "${NODE_CONFIGS_BASE}"/validator-0/. /home/runner/.cheqdnode/
-          cp -Rf "${NODE_CONFIGS_BASE}"/validator-1/. /home/runner/.cheqdnode/
-          sudo chmod -R 775 /home/runner/
-
-      - name: Run Cosmos-related tests
-        working-directory: ./tests/e2e-pytest
-        run: |
-          set -euo pipefail
-          OP0_ADDRESS=$(cheqd-noded keys list --keyring-backend "test" --home "${NODE_CONFIGS_BASE}/validator-0" | sed -nr 's/.*address: (.*?).*/\1/p' | sed 's/\r//g')
-          export OP0_ADDRESS
-          OP1_ADDRESS=$(cheqd-noded keys list --keyring-backend "test" --home "${NODE_CONFIGS_BASE}/validator-1" | sed -nr 's/.*address: (.*?).*/\1/p' | sed 's/\r//g')
-          export OP1_ADDRESS
-          pytest -v -rP test_cosmos.py
-
-      - name: Run identity-related tests # TODO: Move into separate stage?
-        working-directory: ./tests/e2e-pytest
-        run: |
-          set -euo pipefail
-          OP0_ADDRESS=$(cheqd-noded keys list --keyring-backend "test" | sed -nr 's/.*address: (.*?).*/\1/p' | sed -n 1p | sed 's/\r//g')
-          export OP0_ADDRESS
-          OP1_ADDRESS=$(cheqd-noded keys list --keyring-backend "test" | sed -nr 's/.*address: (.*?).*/\1/p' | sed -n 2p | sed 's/\r//g')
-          export OP1_ADDRESS
-          pytest -v -rP test_identity.py
-
-  bash-integration-tests:
-    name: "Bash-based identity tests"
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Load binary artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: cheqd-noded
-          path: /home/runner/.local/bin
-
-      - name: Restore binary permissions
-        run: sudo chmod +x /home/runner/.local/bin/cheqd-noded
-
-      - name: Download node Docker image
-        uses: actions/download-artifact@v3
-        with:
-          name: cheqd-node-image.tar
-
-      - name: Load node Docker image
-        run: docker load -i cheqd-node-image.tar
-
-      - name: Setup 4 Validators + 2 Observers Docker localnet
-        working-directory: ./docker/localnet
-        run: |
-          bash gen-network-config.sh
-          CHEQD_NODE_IMAGE=cheqd-node DOCKER_IMAGE_VERSION=latest docker compose up -d
-
-      - name: Check all Docker localnet nodes are active
-        run: bash ./tests/tools/wait-for-chain.sh
-
-      - name: Import keys
-        working-directory: ./docker/localnet
-        run: |
-          bash import_keys.sh
-
-      - name: Run tests
-        working-directory: ./tests/e2e-bash
-        run: |
-          bash run_all.sh
-
-  node-upgrade-test:
-    name: "Run positive case for upgrade"
+  ginkgo-tests:
+    name: "Ginkgo-based unit tests"
     runs-on: ubuntu-latest
-    env:
-      VERSION: ${{ inputs.VERSION }}
 
     steps:
       - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
 
-      - name: Download cheqd-cli Docker image
-        uses: actions/download-artifact@v3
+      - uses: actions/setup-go@v3
         with:
-          name: cheqd-node-image.tar
-
-      - name: Load cheqd-cli Docker image
-        run: docker load -i cheqd-node-image.tar
+          go-version-file: ./go.mod
+          cache: true
 
-      - name: Give current user ownership
-        run: sudo chown "$USER":"$USER" .
-
-      - name: Prepare nodes for upgrade
-        working-directory: ./tests/e2e-complex/upgrade
-        run: bash prepare.sh
-
-      - name: Initiate upgrade
-        working-directory: ./tests/e2e-complex/upgrade
-        run: bash initiate_upgrade.sh
-
-      - name: Check for successful upgrade
-        working-directory: ./tests/e2e-complex/upgrade
-        run: bash upgrade_and_check.sh
-
-  node-cosmovisor-upgrade-test:
-    name: "Run positive case for upgrade with Cosmovisor installed"
-    runs-on: ubuntu-latest
-    env:
-      NODE_CONFIGS_BASE: "/home/runner/work/cheqd-node/cheqd-node/tests/e2e-complex/upgrade/node_configs"
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Download cheqd-cli Docker image
-        uses: actions/download-artifact@v3
-        with:
-          name: cheqd-node-image.tar
-
-      - name: Load cheqd-cli Docker image
-        run: docker load -i cheqd-node-image.tar
-
-      - name: Install cheqd-noded binary
-        working-directory: ./tests/e2e-complex/upgrade/cosmovisor
-        run: sudo sh -c 'python3 ../../../../installer/installer.py 1 < .answers'
-
-      - name: Give current user ownership
-        run: sudo chown "$USER":"$USER" .
-
-      - name: Prepare nodes for upgrade
-        working-directory: ./tests/e2e-complex/upgrade
-        run: bash prepare.sh
-
-      - name: Add observer with Cosmovisor
-        working-directory: ./tests/e2e-complex/upgrade/cosmovisor
-        run: bash add-observer.sh
-
-      - name: Initiate upgrade
-        id: initiate-upgrade
-        working-directory: ./tests/e2e-complex/upgrade
+      - name: Install ginkgo
         run: |
-          START_HEIGHT=$(printf '%d' "$(cheqd-noded status 2>&1 | jq ".SyncInfo.latest_block_height" | tr -d '"')")
-          echo ::set-output name=START_HEIGHT::"$START_HEIGHT"
-          START_HEIGHT=$START_HEIGHT bash initiate_upgrade.sh
+          go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo
+          go get github.com/onsi/gomega/...
 
-      - name: Check for successful upgrade
-        working-directory: ./tests/e2e-complex/upgrade
-        run: START_HEIGHT=${{ steps.initiate-upgrade.outputs.START_HEIGHT }} bash upgrade_and_check.sh
+      - name: Run Ginkgo tests
+        run: ginkego -v ./...
 
-      - name: Check that node with Cosmovisor was upgraded
-        working-directory: ./tests/e2e-complex/upgrade/cosmovisor
-        run: START_HEIGHT=${{ steps.initiate-upgrade.outputs.START_HEIGHT }} bash check_upgrade.sh
+  # test-new-node-setup:
+  #   name: "New node setup"
+  #   runs-on: ubuntu-latest
+  #   env:
+  #     VERSION: ${{ inputs.VERSION }}
+    
+  #   steps:
+  #     - uses: actions/checkout@v3
+
+  #     - name: Install cheqd-noded binary
+  #       working-directory: ./tests/e2e-complex/interactive-install
+  #       run: sudo sh -c 'python3 ../../../installer/installer.py 1 < .answers'
+
+  #     - name: Download node Docker image
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: cheqd-node-image.tar
+
+  #     - name: Load node Docker image
+  #       run: docker load -i cheqd-node-image.tar
+
+  #     - name: Setup 4 Validators + 2 Observers Docker localnet
+  #       working-directory: ./docker/localnet
+  #       run: |
+  #         set -euo pipefail
+  #         bash gen-network-config.sh
+  #         CHEQD_NODE_IMAGE=cheqd-node DOCKER_IMAGE_VERSION=latest docker compose up -d
+
+  #     - name: Check all Docker localnet nodes are active
+  #       run: |
+  #         set -euo pipefail
+  #         bash ./tests/tools/wait-for-chain.sh
+
+  #     - name: Add an Observer node using Interactive installer
+  #       working-directory: ./tests/e2e-complex/interactive-install
+  #       run: |
+  #         set -euo pipefail
+  #         bash add-observer.sh
+  #         bash wait.sh "[[ $(cheqd-noded status -n 'tcp://localhost:26677' 2>&1 | wc -l) == 1 ]] && echo "Observer node is up""
+
+  #     - name: Promote Observer to Validator
+  #       working-directory: ./tests/e2e-complex/interactive-install
+  #       run: |
+  #         bash promote-validator.sh
+  #         bash check-promotion.sh
+  #         # shellcheck disable=SC2016
+  #         bash wait.sh '[[ $(curl -s localhost:26657/block | sed -nr '"'"'s/.*signature": (.*?).*/\1/p'"'"' | wc -l) == 5 ]] && echo "There are 5 validators signatures in block!"'
+  #         # shellcheck disable=SC2016
+  #         bash wait.sh '[[ $(curl -s localhost:26657/block | sed -nr '"'"'s/.*(signature": null).*/\1/p'"'"' | wc -l) == 0 ]] && echo "There are no null signatures in block!"'
+
+  #     - name: Gather logs on failure
+  #       if: ${{ failure() }}
+  #       run: |
+  #         journalctl -ex | grep cheqd
+
+  # python-integration-tests:
+  #   name: "Python based Cosmos and identity tests"
+  #   runs-on: ubuntu-latest
+
+  #   steps:
+  #     - uses: actions/checkout@v3
+
+  #     - name: Load node binary artifact
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: cheqd-noded
+  #         path: /home/runner/.local/bin
+
+  #     - name: Restore binary permissions
+  #       run: sudo chmod +x /home/runner/.local/bin/cheqd-noded
+
+  #     - name: Download node Docker image
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: cheqd-node-image.tar
+
+  #     - name: Load node Docker image
+  #       run: docker load -i cheqd-node-image.tar
+
+  #     - name: Setup 4 Validators + 2 Observers Docker localnet 
+  #       working-directory: ./docker/localnet
+  #       run: |
+  #         bash gen-network-config.sh
+  #         CHEQD_NODE_IMAGE=cheqd-node DOCKER_IMAGE_VERSION=latest docker compose up -d
+
+  #     - name: Check all Docker localnet nodes are active
+  #       run: bash tests/tools/wait-for-chain.sh
+
+  #     - name: Setup Python environment
+  #       working-directory: ./tests/e2e-pytest
+  #       run: |
+  #         set -euo pipefail
+  #         pip3 install -r requirements.txt >> /dev/null
+  #         cp -Rf "${NODE_CONFIGS_BASE}"/validator-0/. /home/runner/.cheqdnode/
+  #         cp -Rf "${NODE_CONFIGS_BASE}"/validator-1/. /home/runner/.cheqdnode/
+  #         sudo chmod -R 775 /home/runner/
+
+  #     - name: Run Cosmos-related tests
+  #       working-directory: ./tests/e2e-pytest
+  #       run: |
+  #         set -euo pipefail
+  #         OP0_ADDRESS=$(cheqd-noded keys list --keyring-backend "test" --home "${NODE_CONFIGS_BASE}/validator-0" | sed -nr 's/.*address: (.*?).*/\1/p' | sed 's/\r//g')
+  #         export OP0_ADDRESS
+  #         OP1_ADDRESS=$(cheqd-noded keys list --keyring-backend "test" --home "${NODE_CONFIGS_BASE}/validator-1" | sed -nr 's/.*address: (.*?).*/\1/p' | sed 's/\r//g')
+  #         export OP1_ADDRESS
+  #         pytest -v -rP test_cosmos.py
+
+  #     - name: Run identity-related tests # TODO: Move into separate stage?
+  #       working-directory: ./tests/e2e-pytest
+  #       run: |
+  #         set -euo pipefail
+  #         OP0_ADDRESS=$(cheqd-noded keys list --keyring-backend "test" | sed -nr 's/.*address: (.*?).*/\1/p' | sed -n 1p | sed 's/\r//g')
+  #         export OP0_ADDRESS
+  #         OP1_ADDRESS=$(cheqd-noded keys list --keyring-backend "test" | sed -nr 's/.*address: (.*?).*/\1/p' | sed -n 2p | sed 's/\r//g')
+  #         export OP1_ADDRESS
+  #         pytest -v -rP test_identity.py
+
+  # bash-integration-tests:
+  #   name: "Bash-based identity tests"
+  #   runs-on: ubuntu-latest
+
+  #   steps:
+  #     - uses: actions/checkout@v3
+
+  #     - name: Load binary artifact
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: cheqd-noded
+  #         path: /home/runner/.local/bin
+
+  #     - name: Restore binary permissions
+  #       run: sudo chmod +x /home/runner/.local/bin/cheqd-noded
+
+  #     - name: Download node Docker image
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: cheqd-node-image.tar
+
+  #     - name: Load node Docker image
+  #       run: docker load -i cheqd-node-image.tar
+
+  #     - name: Setup 4 Validators + 2 Observers Docker localnet
+  #       working-directory: ./docker/localnet
+  #       run: |
+  #         bash gen-network-config.sh
+  #         CHEQD_NODE_IMAGE=cheqd-node DOCKER_IMAGE_VERSION=latest docker compose up -d
+
+  #     - name: Check all Docker localnet nodes are active
+  #       run: bash ./tests/tools/wait-for-chain.sh
+
+  #     - name: Import keys
+  #       working-directory: ./docker/localnet
+  #       run: |
+  #         bash import_keys.sh
+
+  #     - name: Run tests
+  #       working-directory: ./tests/e2e-bash
+  #       run: |
+  #         bash run_all.sh
+
+  # node-upgrade-test:
+  #   name: "Run positive case for upgrade"
+  #   runs-on: ubuntu-latest
+  #   env:
+  #     VERSION: ${{ inputs.VERSION }}
+
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #       with:
+  #         fetch-depth: 0
+
+  #     - name: Download cheqd-cli Docker image
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: cheqd-node-image.tar
+
+  #     - name: Load cheqd-cli Docker image
+  #       run: docker load -i cheqd-node-image.tar
+
+  #     - name: Give current user ownership
+  #       run: sudo chown "$USER":"$USER" .
+
+  #     - name: Prepare nodes for upgrade
+  #       working-directory: ./tests/e2e-complex/upgrade
+  #       run: bash prepare.sh
+
+  #     - name: Initiate upgrade
+  #       working-directory: ./tests/e2e-complex/upgrade
+  #       run: bash initiate_upgrade.sh
+
+  #     - name: Check for successful upgrade
+  #       working-directory: ./tests/e2e-complex/upgrade
+  #       run: bash upgrade_and_check.sh
+
+  # node-cosmovisor-upgrade-test:
+  #   name: "Run positive case for upgrade with Cosmovisor installed"
+  #   runs-on: ubuntu-latest
+  #   env:
+  #     NODE_CONFIGS_BASE: "/home/runner/work/cheqd-node/cheqd-node/tests/e2e-complex/upgrade/node_configs"
+
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #       with:
+  #         fetch-depth: 0
+
+  #     - name: Download cheqd-cli Docker image
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: cheqd-node-image.tar
+
+  #     - name: Load cheqd-cli Docker image
+  #       run: docker load -i cheqd-node-image.tar
+
+  #     - name: Install cheqd-noded binary
+  #       working-directory: ./tests/e2e-complex/upgrade/cosmovisor
+  #       run: sudo sh -c 'python3 ../../../../installer/installer.py 1 < .answers'
+
+  #     - name: Give current user ownership
+  #       run: sudo chown "$USER":"$USER" .
+
+  #     - name: Prepare nodes for upgrade
+  #       working-directory: ./tests/e2e-complex/upgrade
+  #       run: bash prepare.sh
+
+  #     - name: Add observer with Cosmovisor
+  #       working-directory: ./tests/e2e-complex/upgrade/cosmovisor
+  #       run: bash add-observer.sh
+
+  #     - name: Initiate upgrade
+  #       id: initiate-upgrade
+  #       working-directory: ./tests/e2e-complex/upgrade
+  #       run: |
+  #         START_HEIGHT=$(printf '%d' "$(cheqd-noded status 2>&1 | jq ".SyncInfo.latest_block_height" | tr -d '"')")
+  #         echo ::set-output name=START_HEIGHT::"$START_HEIGHT"
+  #         START_HEIGHT=$START_HEIGHT bash initiate_upgrade.sh
+
+  #     - name: Check for successful upgrade
+  #       working-directory: ./tests/e2e-complex/upgrade
+  #       run: START_HEIGHT=${{ steps.initiate-upgrade.outputs.START_HEIGHT }} bash upgrade_and_check.sh
+
+  #     - name: Check that node with Cosmovisor was upgraded
+  #       working-directory: ./tests/e2e-complex/upgrade/cosmovisor
+  #       run: START_HEIGHT=${{ steps.initiate-upgrade.outputs.START_HEIGHT }} bash check_upgrade.sh
 
diff --git a/x/cheqd/utils/crypto_test.go b/x/cheqd/utils/crypto_test.go
index c8feb4f08..fdd7afb75 100644
--- a/x/cheqd/utils/crypto_test.go
+++ b/x/cheqd/utils/crypto_test.go
@@ -1,60 +1,83 @@
-package utils
+package utils_test
 
 import (
-	"testing"
+	// "testing"
 
 	"github.com/multiformats/go-multibase"
-	"github.com/stretchr/testify/require"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
 )
 
-func TestValidateEd25519PubKey(t *testing.T) {
-	cases := []struct {
-		name     string
-		key      string
-		valid    bool
-		errorMsg string
-	}{
-		{"Valid: General Ed25519 public key", "zF1hVGXXK9rmx5HhMTpGnGQJiab9qrFJbQXBRhSmYjQWX", true, ""},
-		{"Valid: General Ed25519 public key", "zF1hVGXXK9rmx5HhMTpGnGQJiab9qr1111111111111", false, "ed25519: bad public key length: 31"},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			_, keyBytes, _ := multibase.Decode(tc.key)
-			err := ValidateEd25519PubKey(keyBytes)
-
-			if tc.valid {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-				require.Contains(t, err.Error(), tc.errorMsg)
-			}
+var _ = Describe("Utils", func() {
+	Describe("ValidateEd25519PubKey", func() {
+		Context("Valid: General Ed25519 public key", func() {
+			It("should return no error", func() {
+				_, keyBytes, _ := multibase.Decode("zF1hVGXXK9rmx5HhMTpGnGQJiab9qrFJbQXBRhSmYjQWX")	
+				err := ValidateEd25519PubKey(keyBytes)
+				Expect(err).To(BeNil())
+			})
 		})
-	}
-}
-
-func TestValidateJwk(t *testing.T) {
-	cases := []struct {
-		name     string
-		key      string
-		valid    bool
-		errorMsg string
-	}{
-		{"positive ed25519", "{\"crv\":\"Ed25519\",\"kty\":\"OKP\",\"x\":\"9Ov80OqMlNrILAUG8DBBlYQ1rUhp7wDomr2I5muzpTc\"}", true, ""},
-		{"positive ecdsa", "{\"crv\":\"P-256\",\"kty\":\"EC\",\"x\":\"tcEgxIPyYMiyR2_Vh_YMYG6Grg7axhK2N8JjWta5C0g\",\"y\":\"imiXD9ahVA_MKY066TrNA9r6l35lRrerP6JRey5SryQ\"}", true, ""},
-		{"positive rsa", "{\"e\":\"AQAB\",\"kty\":\"RSA\",\"n\":\"skKXRn44WN2DpXDwm4Ip25kIAGRA8y3iXlaoAhPmFiuSDkx97lXcJYrjxX0wSfehgCiSoZOBv6mFzgSVv0_pXQ6zI35xi2dsbexrc87m7Q24q2chpG33ttnVwQkoXrrm0zDzSX32EVxYQyTu9aWp-zxUdAWcrWUarT24RmgjU78v8JmUzkLmwbzsEImnIZ8Hce2ruisAmuAQBVVA4bWwQm_x1KPoQW-TP5_UR3gGugvf0XrQfMJaVpcxcJ9tduMUw6ffZOsqgbvAiZYnrezxSIjnd5lFTFBIEYdGR6ZgjYZoWvQB7U72o_TJoka-zfSODOUbxNBvxvFhA3uhoo3ZKw\"}", true, ""},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := ValidateJWK(tc.key)
-
-			if tc.valid {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-				require.Contains(t, err.Error(), tc.errorMsg)
-			}
+		
+		Context("NotValid: Bad Ed25519 public key length", func() {
+			It("should return error", func() {
+				_, keyBytes, _ := multibase.Decode("zF1hVGXXK9rmx5HhMTpGnGQJiab9qr1111111111111")	
+				err := ValidateEd25519PubKey(keyBytes)
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("ed25519: bad public key length: 31"))
+			})
 		})
-	}
-}
+	})
+})
+
+// func TestValidateEd25519PubKey(t *testing.T) {
+// 	cases := []struct {
+// 		name     string
+// 		key      string
+// 		valid    bool
+// 		errorMsg string
+// 	}{
+// 		{"Valid: General Ed25519 public key", "zF1hVGXXK9rmx5HhMTpGnGQJiab9qrFJbQXBRhSmYjQWX", true, ""},
+// 		{"Valid: General Ed25519 public key", "zF1hVGXXK9rmx5HhMTpGnGQJiab9qr1111111111111", false, "ed25519: bad public key length: 31"},
+// 	}
+
+// 	for _, tc := range cases {
+// 		t.Run(tc.name, func(t *testing.T) {
+// 			_, keyBytes, _ := multibase.Decode(tc.key)
+// 			err := ValidateEd25519PubKey(keyBytes)
+
+// 			if tc.valid {
+// 				require.NoError(t, err)
+// 			} else {
+// 				require.Error(t, err)
+// 				require.Contains(t, err.Error(), tc.errorMsg)
+// 			}
+// 		})
+// 	}
+// }
+
+// func TestValidateJwk(t *testing.T) {
+// 	cases := []struct {
+// 		name     string
+// 		key      string
+// 		valid    bool
+// 		errorMsg string
+// 	}{
+// 		{"positive ed25519", "{\"crv\":\"Ed25519\",\"kty\":\"OKP\",\"x\":\"9Ov80OqMlNrILAUG8DBBlYQ1rUhp7wDomr2I5muzpTc\"}", true, ""},
+// 		{"positive ecdsa", "{\"crv\":\"P-256\",\"kty\":\"EC\",\"x\":\"tcEgxIPyYMiyR2_Vh_YMYG6Grg7axhK2N8JjWta5C0g\",\"y\":\"imiXD9ahVA_MKY066TrNA9r6l35lRrerP6JRey5SryQ\"}", true, ""},
+// 		{"positive rsa", "{\"e\":\"AQAB\",\"kty\":\"RSA\",\"n\":\"skKXRn44WN2DpXDwm4Ip25kIAGRA8y3iXlaoAhPmFiuSDkx97lXcJYrjxX0wSfehgCiSoZOBv6mFzgSVv0_pXQ6zI35xi2dsbexrc87m7Q24q2chpG33ttnVwQkoXrrm0zDzSX32EVxYQyTu9aWp-zxUdAWcrWUarT24RmgjU78v8JmUzkLmwbzsEImnIZ8Hce2ruisAmuAQBVVA4bWwQm_x1KPoQW-TP5_UR3gGugvf0XrQfMJaVpcxcJ9tduMUw6ffZOsqgbvAiZYnrezxSIjnd5lFTFBIEYdGR6ZgjYZoWvQB7U72o_TJoka-zfSODOUbxNBvxvFhA3uhoo3ZKw\"}", true, ""},
+// 	}
+
+// 	for _, tc := range cases {
+// 		t.Run(tc.name, func(t *testing.T) {
+// 			err := ValidateJWK(tc.key)
+
+// 			if tc.valid {
+// 				require.NoError(t, err)
+// 			} else {
+// 				require.Error(t, err)
+// 				require.Contains(t, err.Error(), tc.errorMsg)
+// 			}
+// 		})
+// 	}
+// }
diff --git a/x/cheqd/utils/utils_suite_test.go b/x/cheqd/utils/utils_suite_test.go
new file mode 100644
index 000000000..c731605ec
--- /dev/null
+++ b/x/cheqd/utils/utils_suite_test.go
@@ -0,0 +1,13 @@
+package utils_test
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+func TestUtils(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Utils Suite")
+}
\ No newline at end of file

From 92271e94990944cbd9878f1e19dbdc9d5a4142dd Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@evernym.com>
Date: Wed, 17 Aug 2022 15:18:54 +0300
Subject: [PATCH 02/76] Add go.mod changes

---
 go.mod |  9 ++++++---
 go.sum | 13 +++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 16610166f..1a42d535b 100644
--- a/go.mod
+++ b/go.mod
@@ -67,6 +67,7 @@ require (
 	github.com/gogo/gateway v1.1.0 // indirect
 	github.com/golang/snappy v0.0.3 // indirect
 	github.com/google/btree v1.0.0 // indirect
+	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/google/orderedcode v0.0.1 // indirect
 	github.com/gorilla/handlers v1.5.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
@@ -102,6 +103,8 @@ require (
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/multiformats/go-base32 v0.0.3 // indirect
 	github.com/multiformats/go-base36 v0.1.0 // indirect
+	github.com/onsi/ginkgo/v2 v2.1.4 // indirect
+	github.com/onsi/gomega v1.20.0 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
@@ -127,11 +130,11 @@ require (
 	github.com/zondax/hid v0.9.0 // indirect
 	go.etcd.io/bbolt v1.3.6 // indirect
 	golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect
-	golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect
-	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
+	golang.org/x/net v0.0.0-20220812174116-3211cb980234 // indirect
+	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/go.sum b/go.sum
index 621d895f6..c9c416b2b 100644
--- a/go.sum
+++ b/go.sum
@@ -368,6 +368,7 @@ github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5Nq
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
@@ -469,6 +470,7 @@ github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -776,12 +778,16 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k
 github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
 github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY=
+github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
 github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
+github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q=
+github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
@@ -1232,6 +1238,8 @@ golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su
 golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e h1:TsQ7F31D3bUCLeqPT0u+yjp1guoArKaNKmCr22PYgTQ=
 golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E=
+golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1372,6 +1380,8 @@ golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
@@ -1458,6 +1468,7 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1621,6 +1632,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

From 71598d16368e6a1d93db91287bdca2152b7f8203 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@evernym.com>
Date: Wed, 17 Aug 2022 15:39:07 +0300
Subject: [PATCH 03/76] Disable lint

---
 .github/workflows/dispatch.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index 0aa8557d0..fcdc91294 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -7,13 +7,13 @@ concurrency:
 
 jobs:
 
-  call-lint:
-    name: "Lint"
-    uses: ./.github/workflows/lint.yml
+  # call-lint:
+  #   name: "Lint"
+  #   uses: ./.github/workflows/lint.yml
 
   call-build:
     name: "Build"
-    needs: call-lint
+    # needs: call-lint
     uses: ./.github/workflows/build.yml
     secrets: inherit
   

From 979b2f25a379280ed6805937b497446555e0a61f Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@evernym.com>
Date: Wed, 17 Aug 2022 16:12:09 +0300
Subject: [PATCH 04/76] Enable tests

---
 .github/workflows/dispatch.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index fcdc91294..30eb541c8 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -17,10 +17,10 @@ jobs:
     uses: ./.github/workflows/build.yml
     secrets: inherit
   
-  # call-test:
-  #   name: "Test"
-  #   needs: call-build
-  #   uses: ./.github/workflows/test.yml
+  call-test:
+    name: "Test"
+    needs: call-build
+    uses: ./.github/workflows/test.yml
 
   call-release:
     name: "Release"

From 28a8637fd3b09d1a3902f7e948bc6d5b380dd457 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@evernym.com>
Date: Wed, 17 Aug 2022 16:46:50 +0300
Subject: [PATCH 05/76] Add tests with DescribeTable functionality

---
 .github/workflows/dispatch.yml |   2 +-
 .github/workflows/test.yml     |   2 +-
 go.mod                         |   6 +-
 go.sum                         |  19 ++--
 x/cheqd/utils/crypto_test.go   |   2 +-
 x/cheqd/utils/did_url_test.go  | 194 ++++++++++++++++++---------------
 6 files changed, 128 insertions(+), 97 deletions(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index 30eb541c8..849d97413 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -24,7 +24,7 @@ jobs:
 
   call-release:
     name: "Release"
-    # needs: [call-test, call-build]
+    needs: [call-test, call-build]
     needs: call-build
     if: ${{ github.ref_protected == true }}
     uses: ./.github/workflows/release.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3630f7b54..ecfb30084 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,7 +33,7 @@ jobs:
           go get github.com/onsi/gomega/...
 
       - name: Run Ginkgo tests
-        run: ginkego -v ./...
+        run: ginkgo -v ./...
 
   # test-new-node-setup:
   #   name: "New node setup"
diff --git a/go.mod b/go.mod
index 1a42d535b..f3e700d22 100644
--- a/go.mod
+++ b/go.mod
@@ -16,6 +16,8 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/lestrrat-go/jwx v1.2.25
 	github.com/multiformats/go-multibase v0.1.1
+	github.com/onsi/ginkgo v1.16.4
+	github.com/onsi/gomega v1.20.0
 	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cast v1.5.0
 	github.com/spf13/cobra v1.5.0
@@ -103,8 +105,7 @@ require (
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/multiformats/go-base32 v0.0.3 // indirect
 	github.com/multiformats/go-base36 v0.1.0 // indirect
-	github.com/onsi/ginkgo/v2 v2.1.4 // indirect
-	github.com/onsi/gomega v1.20.0 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
@@ -136,6 +137,7 @@ require (
 	golang.org/x/text v0.3.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/ini.v1 v1.66.4 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	nhooyr.io/websocket v1.8.6 // indirect
diff --git a/go.sum b/go.sum
index c9c416b2b..14adf811f 100644
--- a/go.sum
+++ b/go.sum
@@ -368,7 +368,6 @@ github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5Nq
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
@@ -468,9 +467,9 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -778,14 +777,16 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k
 github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
 github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY=
 github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
 github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
 github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q=
 github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
@@ -1051,6 +1052,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8=
 github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
@@ -1122,6 +1124,7 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f h1:OeJjE6G4dgCY4PIXvIRQbE8+RX+uXZyGhUy/ksMGJoc=
@@ -1169,6 +1172,7 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
+golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1228,6 +1232,7 @@ golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211208012354-db4efeb81f4b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
@@ -1236,7 +1241,6 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su
 golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e h1:TsQ7F31D3bUCLeqPT0u+yjp1guoArKaNKmCr22PYgTQ=
 golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E=
 golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
@@ -1367,6 +1371,7 @@ golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1375,10 +1380,11 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1468,7 +1474,7 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
+golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1630,7 +1636,6 @@ google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX7
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
diff --git a/x/cheqd/utils/crypto_test.go b/x/cheqd/utils/crypto_test.go
index fdd7afb75..027d276be 100644
--- a/x/cheqd/utils/crypto_test.go
+++ b/x/cheqd/utils/crypto_test.go
@@ -9,7 +9,7 @@ import (
 	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
 )
 
-var _ = Describe("Utils", func() {
+var _ = Describe("Crypto", func() {
 	Describe("ValidateEd25519PubKey", func() {
 		Context("Valid: General Ed25519 public key", func() {
 			It("should return no error", func() {
diff --git a/x/cheqd/utils/did_url_test.go b/x/cheqd/utils/did_url_test.go
index 0d1f1e4df..bbea28e67 100644
--- a/x/cheqd/utils/did_url_test.go
+++ b/x/cheqd/utils/did_url_test.go
@@ -1,93 +1,117 @@
-package utils
+package utils_test
 
 import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
+	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
 )
 
-func TestIsDidURL(t *testing.T) {
-	cases := []struct {
-		name   string
-		valid  bool
-		didUrl string
-	}{
-		// Path: all the possible symbols
-		{"Valid: the whole alphabet for path", true, "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"},
-		{"Valid: several paths", true, "did:cheqd:testnet:123456789abcdefg/path/to/some/other/place/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff/"},
-		{"Valid: the whole alphabet with query", true, "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query"},
-		{"Valid: the whole alphabet with query and fragment", true, "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query#fragment"},
-		{"Valid: each possible symbols as a path", true, "did:cheqd:testnet:123456789abcdefg/12/ab/AB/-/./_/~/!/$/&/'/(/)/*/+/,/;/=/:/@/%20/%ff"},
-		{"Valid: empty path", true, "did:cheqd:testnet:123456789abcdefg/"},
-		// Query: all the possible variants
-		{"Valid: the whole alphabet for query", true, "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"},
-		{"Valid: the whole alphabet for query and another query", true, "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query=2?query=3/query=%A4"},
-		// Fragment:
-		{"Valid: the whole alphabet for fragment", true, "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"},
-		{"Valid: the whole alphabet with query and apth", true, "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"},
-		{"Valid: only fragment", true, "did:cheqd:testnet:123456789abcdefg#fragment"},
-		{"Valid: only query", true, "did:cheqd:testnet:123456789abcdefg?query"},
-		// Wrong cases
-		{"Not valid: wrong HEXDIG for path (pct-encoded phrase)", false, "did:cheqd:testnet:123456789abcdefg/path%20%zz"},
-		{"Not valid: wrong HEXDIG for query (pct-encoded phrase)", false, "did:cheqd:testnet:123456789abcdefg/path?query%20%zz"},
-		{"Not valid: wrong HEXDIG for fragment (pct-encoded phrase)", false, "did:cheqd:testnet:123456789abcdefg/path?query#fragment%20%zz"},
-		// Wrong splitting (^did:([^:]+?)(:([^:]+?))?:([^:]+)$)
-		{"Not valid: starts with not 'did'", false, "did123:cheqd:::123456789abcdefg/path?query#fragment"},
-		{"Not valid: empty namespace", false, "did:cheqd::123456789abcdefg/path?query#fragment"},
-		{"Not valid: a lot of ':'", false, "did:cheqd:::123456789abcdefg/path?query#fragment"},
-		{"Not valid: two DIDs in one", false, "did:cheqd:testnet:123456789abcdefg:did:cheqd:testnet:123456789abcdefg/path?query#fragment"},
-		// Wrong namespace (^[a-zA-Z0-9]*)
-		{"Not valid:  / - is not allowed for namespace", false, "did:cheqd:testnet/:123456789abcdefg/path?query#fragment"},
-		{"Not valid: _  - is not allowed for namespace", false, "did:cheqd:testnet_:123456789abcdefg/path?query#fragment"},
-		{"Not valid: % - is not allowed for namespace", false, "did:cheqd:testnet%:123456789abcdefg/path?query#fragment"},
-		{"Not valid: * - is not allowed for namespace", false, "did:cheqd:testnet*:123456789abcdefg/path?query#fragment"},
-		{"Not valid: & - is not allowed for namespace", false, "did:cheqd:testnet&:123456789abcdefg/path?query#fragment"},
-		{"Not valid: @ - is not allowed for namespace", false, "did:cheqd:testnet@/:123456789abcdefg/path?query#fragment"},
-		// Base58 checks (^[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]*$)
-		{"Not valid: O - is not allowed for base58", false, "did:cheqd:testnet:123456789abcdefO/path?query#fragment"},
-		{"Not valid: I - is not allowed for base58", false, "did:cheqd:testnet:123456789abcdefI/path?query#fragment"},
-		{"Not valid: l - is not allowed for base58", false, "did:cheqd:testnet:123456789abcdefl/path?query#fragment"},
-		{"Not valid: 0 - is not allowed for base58", false, "did:cheqd:testnet:123456789abcdef0/path?query#fragment"},
-		// Length checks (should be exactly 16 or 32)
-		{"Not valid: UniqueID less then 16 symbols", false, "did:cheqd:testnet:123/path?query#fragment"},
-		{"Not valid: UniqueID more then 16 symbols but less then 32", false, "did:cheqd:testnet:123456789abcdefgABCDEF/path?query#fragment"},
-		{"Not valid: UniqueID more then 32 symbols", false, "did:cheqd:testnet:123456789abcdefg123456789abcdefgABCDEF/path?query#fragment"},
-		{"Not valid: Split should return error", false, "qwerty"},
-	}
+// func TestIsDidURL(t *testing.T) {
+// 	cases := []struct {
+// 		name   string
+// 		valid  bool
+// 		didUrl string
+// 	}{
+// 		// Path: all the possible symbols
+// 		{"Valid: the whole alphabet for path", true, "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"},
+// 		{"Valid: several paths", true, "did:cheqd:testnet:123456789abcdefg/path/to/some/other/place/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff/"},
+// 		{"Valid: the whole alphabet with query", true, "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query"},
+// 		{"Valid: the whole alphabet with query and fragment", true, "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query#fragment"},
+// 		{"Valid: each possible symbols as a path", true, "did:cheqd:testnet:123456789abcdefg/12/ab/AB/-/./_/~/!/$/&/'/(/)/*/+/,/;/=/:/@/%20/%ff"},
+// 		{"Valid: empty path", true, "did:cheqd:testnet:123456789abcdefg/"},
+// 		// Query: all the possible variants
+// 		{"Valid: the whole alphabet for query", true, "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"},
+// 		{"Valid: the whole alphabet for query and another query", true, "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query=2?query=3/query=%A4"},
+// 		// Fragment:
+// 		{"Valid: the whole alphabet for fragment", true, "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"},
+// 		{"Valid: the whole alphabet with query and apth", true, "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"},
+// 		{"Valid: only fragment", true, "did:cheqd:testnet:123456789abcdefg#fragment"},
+// 		{"Valid: only query", true, "did:cheqd:testnet:123456789abcdefg?query"},
+// 		// Wrong cases
+// 		{"Not valid: wrong HEXDIG for path (pct-encoded phrase)", false, "did:cheqd:testnet:123456789abcdefg/path%20%zz"},
+// 		{"Not valid: wrong HEXDIG for query (pct-encoded phrase)", false, "did:cheqd:testnet:123456789abcdefg/path?query%20%zz"},
+// 		{"Not valid: wrong HEXDIG for fragment (pct-encoded phrase)", false, "did:cheqd:testnet:123456789abcdefg/path?query#fragment%20%zz"},
+// 		// Wrong splitting (^did:([^:]+?)(:([^:]+?))?:([^:]+)$)
+// 		{"Not valid: starts with not 'did'", false, "did123:cheqd:::123456789abcdefg/path?query#fragment"},
+// 		{"Not valid: empty namespace", false, "did:cheqd::123456789abcdefg/path?query#fragment"},
+// 		{"Not valid: a lot of ':'", false, "did:cheqd:::123456789abcdefg/path?query#fragment"},
+// 		{"Not valid: two DIDs in one", false, "did:cheqd:testnet:123456789abcdefg:did:cheqd:testnet:123456789abcdefg/path?query#fragment"},
+// 		// Wrong namespace (^[a-zA-Z0-9]*)
+// 		{"Not valid:  / - is not allowed for namespace", false, "did:cheqd:testnet/:123456789abcdefg/path?query#fragment"},
+// 		{"Not valid: _  - is not allowed for namespace", false, "did:cheqd:testnet_:123456789abcdefg/path?query#fragment"},
+// 		{"Not valid: % - is not allowed for namespace", false, "did:cheqd:testnet%:123456789abcdefg/path?query#fragment"},
+// 		{"Not valid: * - is not allowed for namespace", false, "did:cheqd:testnet*:123456789abcdefg/path?query#fragment"},
+// 		{"Not valid: & - is not allowed for namespace", false, "did:cheqd:testnet&:123456789abcdefg/path?query#fragment"},
+// 		{"Not valid: @ - is not allowed for namespace", false, "did:cheqd:testnet@/:123456789abcdefg/path?query#fragment"},
+// 		// Base58 checks (^[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]*$)
+// 		{"Not valid: O - is not allowed for base58", false, "did:cheqd:testnet:123456789abcdefO/path?query#fragment"},
+// 		{"Not valid: I - is not allowed for base58", false, "did:cheqd:testnet:123456789abcdefI/path?query#fragment"},
+// 		{"Not valid: l - is not allowed for base58", false, "did:cheqd:testnet:123456789abcdefl/path?query#fragment"},
+// 		{"Not valid: 0 - is not allowed for base58", false, "did:cheqd:testnet:123456789abcdef0/path?query#fragment"},
+// 		// Length checks (should be exactly 16 or 32)
+// 		{"Not valid: UniqueID less then 16 symbols", false, "did:cheqd:testnet:123/path?query#fragment"},
+// 		{"Not valid: UniqueID more then 16 symbols but less then 32", false, "did:cheqd:testnet:123456789abcdefgABCDEF/path?query#fragment"},
+// 		{"Not valid: UniqueID more then 32 symbols", false, "did:cheqd:testnet:123456789abcdefg123456789abcdefgABCDEF/path?query#fragment"},
+// 		{"Not valid: Split should return error", false, "qwerty"},
+// 	}
+
+// 	for _, tc := range cases {
+// 		t.Run(tc.name, func(t *testing.T) {
+// 			isDid := IsValidDIDUrl(tc.didUrl, "", []string{})
+
+// 			if tc.valid {
+// 				require.True(t, isDid)
+// 			} else {
+// 				require.False(t, isDid)
+// 			}
+// 		})
+// 	}
+// }
 
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			isDid := IsValidDIDUrl(tc.didUrl, "", []string{})
+var _ = Describe("DID-URL tests", func() {
+	DescribeTable("Check the DID-URL join functionality (without functionality)",
 
-			if tc.valid {
-				require.True(t, isDid)
-			} else {
-				require.False(t, isDid)
-			}
-		})
-	}
-}
+	func(did_url string) {
+		did, path, query, fragment := MustSplitDIDUrl(did_url)
+		joined_did_url := JoinDIDUrl(did, path, query, fragment)
+		Expect(joined_did_url).To(Equal(did_url))
+	},
+	Entry("All symbols", "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"),
+	Entry("All symbols for path", "did:cheqd:testnet:123456789abcdefg/path/to/some/other/place/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff/"),
+	Entry("All symbols for path and query", "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query"),
+	Entry("All symbols for path and query and fragment", "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query#fragment"),
+	Entry("All variants for path", "did:cheqd:testnet:123456789abcdefg/12/ab/AB/-/./_/~/!/$/&/'/(/)/*/+/,/;/=/:/@/%20/%ff"),
+	Entry("Empty path", "did:cheqd:testnet:123456789abcdefg/"),
+	Entry("All symbols for query", "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"),
+	Entry("All symbols for query and a lot of queries", "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query=2?query=3/query=%A4"),
+	Entry("All symbols for fragment", "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"),
+	Entry("All symbols for fragment and query", "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"),
+	Entry("Just fragment", "did:cheqd:testnet:123456789abcdefg#fragment"),
+	Entry("Just query", "did:cheqd:testnet:123456789abcdefg?query"),
+	)
+})
 
-func TestDidURLJoin(t *testing.T) {
-	cases := []string{
-		"did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff",
-		"did:cheqd:testnet:123456789abcdefg/path/to/some/other/place/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff/",
-		"did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query",
-		"did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query#fragment",
-		"did:cheqd:testnet:123456789abcdefg/12/ab/AB/-/./_/~/!/$/&/'/(/)/*/+/,/;/=/:/@/%20/%ff",
-		"did:cheqd:testnet:123456789abcdefg/",
-		"did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?",
-		"did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query=2?query=3/query=%A4",
-		"did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff",
-		"did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?",
-		"did:cheqd:testnet:123456789abcdefg#fragment",
-		"did:cheqd:testnet:123456789abcdefg?query",
-	}
+// func TestDidURLJoin(t *testing.T) {
+// 	cases := []string{
+// 		"did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff",
+// 		"did:cheqd:testnet:123456789abcdefg/path/to/some/other/place/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff/",
+// 		"did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query",
+// 		"did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query#fragment",
+// 		"did:cheqd:testnet:123456789abcdefg/12/ab/AB/-/./_/~/!/$/&/'/(/)/*/+/,/;/=/:/@/%20/%ff",
+// 		"did:cheqd:testnet:123456789abcdefg/",
+// 		"did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?",
+// 		"did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query=2?query=3/query=%A4",
+// 		"did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff",
+// 		"did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?",
+// 		"did:cheqd:testnet:123456789abcdefg#fragment",
+// 		"did:cheqd:testnet:123456789abcdefg?query",
+// 	}
 
-	for _, tc := range cases {
-		t.Run("split/join"+tc, func(t *testing.T) {
-			did, path, query, fragment := MustSplitDIDUrl(tc)
-			require.Equal(t, tc, JoinDIDUrl(did, path, query, fragment))
-		})
-	}
-}
+// 	for _, tc := range cases {
+// 		t.Run("split/join"+tc, func(t *testing.T) {
+// 			did, path, query, fragment := MustSplitDIDUrl(tc)
+// 			require.Equal(t, tc, JoinDIDUrl(did, path, query, fragment))
+// 		})
+// 	}
+// }

From 2e9e5eb1bd5c2fa28d84e050192b082ecb90540d Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@evernym.com>
Date: Wed, 17 Aug 2022 16:50:16 +0300
Subject: [PATCH 06/76] Fix dispatch yml

---
 .github/workflows/dispatch.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index 849d97413..75e231fe5 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -25,7 +25,7 @@ jobs:
   call-release:
     name: "Release"
     needs: [call-test, call-build]
-    needs: call-build
+    # needs: call-build
     if: ${{ github.ref_protected == true }}
     uses: ./.github/workflows/release.yml
     secrets: inherit

From 756c1051d69968caf5cf5b34e559b7dad72efb50 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@evernym.com>
Date: Wed, 17 Aug 2022 17:15:31 +0300
Subject: [PATCH 07/76] Fix ginko calling and add another couple of tests

---
 .github/workflows/test.yml    |   2 +-
 x/cheqd/utils/did_url_test.go | 102 +++++++++++++++++++++++++---------
 2 files changed, 77 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ecfb30084..f49c354d8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,7 +33,7 @@ jobs:
           go get github.com/onsi/gomega/...
 
       - name: Run Ginkgo tests
-        run: ginkgo -v ./...
+        run: ginkgo -r --race --randomizeAllSpecs --randomizeSuites -v
 
   # test-new-node-setup:
   #   name: "New node setup"
diff --git a/x/cheqd/utils/did_url_test.go b/x/cheqd/utils/did_url_test.go
index bbea28e67..1cd51e5f3 100644
--- a/x/cheqd/utils/did_url_test.go
+++ b/x/cheqd/utils/did_url_test.go
@@ -7,6 +7,79 @@ import (
 	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
 )
 
+var _ = Describe("DID-URL tests", func() {
+	DescribeTable("Check the DID-URL join functionality (without functionality)",
+
+	func(did_url string) {
+		did, path, query, fragment := MustSplitDIDUrl(did_url)
+		joined_did_url := JoinDIDUrl(did, path, query, fragment)
+		Expect(joined_did_url).To(Equal(did_url))
+	},
+	Entry("All symbols", "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"),
+	Entry("All symbols for path", "did:cheqd:testnet:123456789abcdefg/path/to/some/other/place/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff/"),
+	Entry("All symbols for path and query", "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query"),
+	Entry("All symbols for path and query and fragment", "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query#fragment"),
+	Entry("All variants for path", "did:cheqd:testnet:123456789abcdefg/12/ab/AB/-/./_/~/!/$/&/'/(/)/*/+/,/;/=/:/@/%20/%ff"),
+	Entry("Empty path", "did:cheqd:testnet:123456789abcdefg/"),
+	Entry("All symbols for query", "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"),
+	Entry("All symbols for query and a lot of queries", "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query=2?query=3/query=%A4"),
+	Entry("All symbols for fragment", "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"),
+	Entry("All symbols for fragment and query", "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"),
+	Entry("Just fragment", "did:cheqd:testnet:123456789abcdefg#fragment"),
+	Entry("Just query", "did:cheqd:testnet:123456789abcdefg?query"),
+	)
+
+	DescribeTable("Check the DID-URL Validation",
+
+	func(expected bool, did_url string) {
+		isValid := IsValidDIDUrl(did_url, "", []string{})
+
+		Expect(isValid).To(Equal(expected))
+	},
+		// Path: all the possible symbols
+		Entry("Valid: the whole alphabet for path", true, "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"),
+		Entry("Valid: several paths", true, "did:cheqd:testnet:123456789abcdefg/path/to/some/other/place/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff/"),
+		Entry("Valid: the whole alphabet with query", true, "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query"),
+		Entry("Valid: the whole alphabet with query and fragment", true, "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query#fragment"),
+		Entry("Valid: each possible symbols as a path", true, "did:cheqd:testnet:123456789abcdefg/12/ab/AB/-/./_/~/!/$/&/'/(/)/*/+/,/;/=/:/@/%20/%ff"),
+		Entry("Valid: empty path", true, "did:cheqd:testnet:123456789abcdefg/"),
+		// Query: all the possible variants
+		Entry("Valid: the whole alphabet for query", true, "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"),
+		Entry("Valid: the whole alphabet for query and another query", true, "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query=2?query=3/query=%A4"),
+		// Fragment:
+		Entry("Valid: the whole alphabet for fragment", true, "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"),
+		Entry("Valid: the whole alphabet with query and apth", true, "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"),
+		Entry("Valid: only fragment", true, "did:cheqd:testnet:123456789abcdefg#fragment"),
+		Entry("Valid: only query", true, "did:cheqd:testnet:123456789abcdefg?query"),
+		// Wrong cases
+		Entry("Not valid: wrong HEXDIG for path (pct-encoded phrase)", false, "did:cheqd:testnet:123456789abcdefg/path%20%zz"),
+		Entry("Not valid: wrong HEXDIG for query (pct-encoded phrase)", false, "did:cheqd:testnet:123456789abcdefg/path?query%20%zz"),
+		Entry("Not valid: wrong HEXDIG for fragment (pct-encoded phrase)", false, "did:cheqd:testnet:123456789abcdefg/path?query#fragment%20%zz"),
+		// Wrong splitting (^did:([^:]+?)(:([^:]+?))?:([^:]+)$)
+		Entry("Not valid: starts with not 'did'", false, "did123:cheqd:::123456789abcdefg/path?query#fragment"),
+		Entry("Not valid: empty namespace", false, "did:cheqd::123456789abcdefg/path?query#fragment"),
+		Entry("Not valid: a lot of ':'", false, "did:cheqd:::123456789abcdefg/path?query#fragment"),
+		Entry("Not valid: two DIDs in one", false, "did:cheqd:testnet:123456789abcdefg:did:cheqd:testnet:123456789abcdefg/path?query#fragment"),
+		// Wrong namespace (^[a-zA-Z0-9]*)
+		Entry("Not valid:  / - is not allowed for namespace", false, "did:cheqd:testnet/:123456789abcdefg/path?query#fragment"),
+		Entry("Not valid: _  - is not allowed for namespace", false, "did:cheqd:testnet_:123456789abcdefg/path?query#fragment"),
+		Entry("Not valid: % - is not allowed for namespace", false, "did:cheqd:testnet%:123456789abcdefg/path?query#fragment"),
+		Entry("Not valid: * - is not allowed for namespace", false, "did:cheqd:testnet*:123456789abcdefg/path?query#fragment"),
+		Entry("Not valid: & - is not allowed for namespace", false, "did:cheqd:testnet&:123456789abcdefg/path?query#fragment"),
+		Entry("Not valid: @ - is not allowed for namespace", false, "did:cheqd:testnet@/:123456789abcdefg/path?query#fragment"),
+		// Base58 checks (^[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]*$)
+		Entry("Not valid: O - is not allowed for base58", false, "did:cheqd:testnet:123456789abcdefO/path?query#fragment"),
+		Entry("Not valid: I - is not allowed for base58", false, "did:cheqd:testnet:123456789abcdefI/path?query#fragment"),
+		Entry("Not valid: l - is not allowed for base58", false, "did:cheqd:testnet:123456789abcdefl/path?query#fragment"),
+		Entry("Not valid: 0 - is not allowed for base58", false, "did:cheqd:testnet:123456789abcdef0/path?query#fragment"),
+		// Length checks (should be exactly 16 or 32)
+		Entry("Not valid: UniqueID less then 16 symbols", false, "did:cheqd:testnet:123/path?query#fragment"),
+		Entry("Not valid: UniqueID more then 16 symbols but less then 32", false, "did:cheqd:testnet:123456789abcdefgABCDEF/path?query#fragment"),
+		Entry("Not valid: UniqueID more then 32 symbols", false, "did:cheqd:testnet:123456789abcdefg123456789abcdefgABCDEF/path?query#fragment"),
+		Entry("Not valid: Split should return error", false, "qwerty"),
+	)
+})
+
 // func TestIsDidURL(t *testing.T) {
 // 	cases := []struct {
 // 		name   string
@@ -69,31 +142,8 @@ import (
 // 	}
 // }
 
-var _ = Describe("DID-URL tests", func() {
-	DescribeTable("Check the DID-URL join functionality (without functionality)",
-
-	func(did_url string) {
-		did, path, query, fragment := MustSplitDIDUrl(did_url)
-		joined_did_url := JoinDIDUrl(did, path, query, fragment)
-		Expect(joined_did_url).To(Equal(did_url))
-	},
-	Entry("All symbols", "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"),
-	Entry("All symbols for path", "did:cheqd:testnet:123456789abcdefg/path/to/some/other/place/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff/"),
-	Entry("All symbols for path and query", "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query"),
-	Entry("All symbols for path and query and fragment", "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query#fragment"),
-	Entry("All variants for path", "did:cheqd:testnet:123456789abcdefg/12/ab/AB/-/./_/~/!/$/&/'/(/)/*/+/,/;/=/:/@/%20/%ff"),
-	Entry("Empty path", "did:cheqd:testnet:123456789abcdefg/"),
-	Entry("All symbols for query", "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"),
-	Entry("All symbols for query and a lot of queries", "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query=2?query=3/query=%A4"),
-	Entry("All symbols for fragment", "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"),
-	Entry("All symbols for fragment and query", "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"),
-	Entry("Just fragment", "did:cheqd:testnet:123456789abcdefg#fragment"),
-	Entry("Just query", "did:cheqd:testnet:123456789abcdefg?query"),
-	)
-})
-
-// func TestDidURLJoin(t *testing.T) {
-// 	cases := []string{
+// func TestDidURLJoin(t *testing.T) Entry("", 
+// 	cases := []stringEntry("", 
 // 		"did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff",
 // 		"did:cheqd:testnet:123456789abcdefg/path/to/some/other/place/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff/",
 // 		"did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query",
@@ -108,7 +158,7 @@ var _ = Describe("DID-URL tests", func() {
 // 		"did:cheqd:testnet:123456789abcdefg?query",
 // 	}
 
-// 	for _, tc := range cases {
+// 	for _, tc := range cases Entry("", 
 // 		t.Run("split/join"+tc, func(t *testing.T) {
 // 			did, path, query, fragment := MustSplitDIDUrl(tc)
 // 			require.Equal(t, tc, JoinDIDUrl(did, path, query, fragment))

From 10e9c9f3c1dc9f99de328cbc033e666c82220d5e Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@evernym.com>
Date: Wed, 17 Aug 2022 17:50:26 +0300
Subject: [PATCH 08/76] Get rid of depricated options

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f49c354d8..9b00e17c7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,7 +33,7 @@ jobs:
           go get github.com/onsi/gomega/...
 
       - name: Run Ginkgo tests
-        run: ginkgo -r --race --randomizeAllSpecs --randomizeSuites -v
+        run: ginkgo -r --race --randomize-all --randomize-suites -v
 
   # test-new-node-setup:
   #   name: "New node setup"

From e66736bb9e7889a68a9b7b21a7d41fbccb5341e6 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@evernym.com>
Date: Wed, 17 Aug 2022 18:27:48 +0300
Subject: [PATCH 09/76] Move to v2 for ginkgo

---
 go.mod                            |  4 +++
 go.sum                            | 15 +++------
 x/cheqd/utils/crypto_test.go      | 10 +++---
 x/cheqd/utils/did_url_test.go     | 53 +++++++++++++++----------------
 x/cheqd/utils/utils_suite_test.go |  4 +--
 5 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/go.mod b/go.mod
index f3e700d22..4aff31ac2 100644
--- a/go.mod
+++ b/go.mod
@@ -64,6 +64,7 @@ require (
 	github.com/go-kit/log v0.2.0 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
 	github.com/goccy/go-json v0.9.7 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/gateway v1.1.0 // indirect
@@ -71,6 +72,7 @@ require (
 	github.com/google/btree v1.0.0 // indirect
 	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/google/orderedcode v0.0.1 // indirect
+	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
 	github.com/gorilla/handlers v1.5.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -106,6 +108,7 @@ require (
 	github.com/multiformats/go-base32 v0.0.3 // indirect
 	github.com/multiformats/go-base36 v0.1.0 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/onsi/ginkgo/v2 v2.1.4 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
@@ -135,6 +138,7 @@ require (
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/tools v0.1.10 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
diff --git a/go.sum b/go.sum
index 14adf811f..86db6d4ec 100644
--- a/go.sum
+++ b/go.sum
@@ -368,6 +368,7 @@ github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5Nq
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
@@ -467,9 +468,9 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -777,15 +778,15 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k
 github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
 github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
-github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY=
 github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
 github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
-github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
 github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q=
 github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo=
@@ -1052,7 +1053,6 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8=
 github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
@@ -1124,7 +1124,6 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f h1:OeJjE6G4dgCY4PIXvIRQbE8+RX+uXZyGhUy/ksMGJoc=
@@ -1172,7 +1171,6 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
-golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1232,7 +1230,6 @@ golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211208012354-db4efeb81f4b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
@@ -1371,7 +1368,6 @@ golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1380,10 +1376,8 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
@@ -1474,6 +1468,7 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
 golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/x/cheqd/utils/crypto_test.go b/x/cheqd/utils/crypto_test.go
index 027d276be..d29055a26 100644
--- a/x/cheqd/utils/crypto_test.go
+++ b/x/cheqd/utils/crypto_test.go
@@ -3,25 +3,25 @@ package utils_test
 import (
 	// "testing"
 
+	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
 	"github.com/multiformats/go-multibase"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
 )
 
 var _ = Describe("Crypto", func() {
 	Describe("ValidateEd25519PubKey", func() {
 		Context("Valid: General Ed25519 public key", func() {
 			It("should return no error", func() {
-				_, keyBytes, _ := multibase.Decode("zF1hVGXXK9rmx5HhMTpGnGQJiab9qrFJbQXBRhSmYjQWX")	
+				_, keyBytes, _ := multibase.Decode("zF1hVGXXK9rmx5HhMTpGnGQJiab9qrFJbQXBRhSmYjQWX")
 				err := ValidateEd25519PubKey(keyBytes)
 				Expect(err).To(BeNil())
 			})
 		})
-		
+
 		Context("NotValid: Bad Ed25519 public key length", func() {
 			It("should return error", func() {
-				_, keyBytes, _ := multibase.Decode("zF1hVGXXK9rmx5HhMTpGnGQJiab9qr1111111111111")	
+				_, keyBytes, _ := multibase.Decode("zF1hVGXXK9rmx5HhMTpGnGQJiab9qr1111111111111")
 				err := ValidateEd25519PubKey(keyBytes)
 				Expect(err).To(HaveOccurred())
 				Expect(err.Error()).To(ContainSubstring("ed25519: bad public key length: 31"))
diff --git a/x/cheqd/utils/did_url_test.go b/x/cheqd/utils/did_url_test.go
index 1cd51e5f3..6946f7f40 100644
--- a/x/cheqd/utils/did_url_test.go
+++ b/x/cheqd/utils/did_url_test.go
@@ -1,41 +1,40 @@
 package utils_test
 
 import (
-	. "github.com/onsi/ginkgo/extensions/table"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
 	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("DID-URL tests", func() {
 	DescribeTable("Check the DID-URL join functionality (without functionality)",
 
-	func(did_url string) {
-		did, path, query, fragment := MustSplitDIDUrl(did_url)
-		joined_did_url := JoinDIDUrl(did, path, query, fragment)
-		Expect(joined_did_url).To(Equal(did_url))
-	},
-	Entry("All symbols", "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"),
-	Entry("All symbols for path", "did:cheqd:testnet:123456789abcdefg/path/to/some/other/place/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff/"),
-	Entry("All symbols for path and query", "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query"),
-	Entry("All symbols for path and query and fragment", "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query#fragment"),
-	Entry("All variants for path", "did:cheqd:testnet:123456789abcdefg/12/ab/AB/-/./_/~/!/$/&/'/(/)/*/+/,/;/=/:/@/%20/%ff"),
-	Entry("Empty path", "did:cheqd:testnet:123456789abcdefg/"),
-	Entry("All symbols for query", "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"),
-	Entry("All symbols for query and a lot of queries", "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query=2?query=3/query=%A4"),
-	Entry("All symbols for fragment", "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"),
-	Entry("All symbols for fragment and query", "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"),
-	Entry("Just fragment", "did:cheqd:testnet:123456789abcdefg#fragment"),
-	Entry("Just query", "did:cheqd:testnet:123456789abcdefg?query"),
+		func(did_url string) {
+			did, path, query, fragment := MustSplitDIDUrl(did_url)
+			joined_did_url := JoinDIDUrl(did, path, query, fragment)
+			Expect(joined_did_url).To(Equal(did_url))
+		},
+		Entry("All symbols", "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"),
+		Entry("All symbols for path", "did:cheqd:testnet:123456789abcdefg/path/to/some/other/place/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff/"),
+		Entry("All symbols for path and query", "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query"),
+		Entry("All symbols for path and query and fragment", "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query#fragment"),
+		Entry("All variants for path", "did:cheqd:testnet:123456789abcdefg/12/ab/AB/-/./_/~/!/$/&/'/(/)/*/+/,/;/=/:/@/%20/%ff"),
+		Entry("Empty path", "did:cheqd:testnet:123456789abcdefg/"),
+		Entry("All symbols for query", "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"),
+		Entry("All symbols for query and a lot of queries", "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query=2?query=3/query=%A4"),
+		Entry("All symbols for fragment", "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"),
+		Entry("All symbols for fragment and query", "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"),
+		Entry("Just fragment", "did:cheqd:testnet:123456789abcdefg#fragment"),
+		Entry("Just query", "did:cheqd:testnet:123456789abcdefg?query"),
 	)
 
 	DescribeTable("Check the DID-URL Validation",
 
-	func(expected bool, did_url string) {
-		isValid := IsValidDIDUrl(did_url, "", []string{})
+		func(expected bool, did_url string) {
+			isValid := IsValidDIDUrl(did_url, "", []string{})
 
-		Expect(isValid).To(Equal(expected))
-	},
+			Expect(isValid).To(Equal(expected))
+		},
 		// Path: all the possible symbols
 		Entry("Valid: the whole alphabet for path", true, "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"),
 		Entry("Valid: several paths", true, "did:cheqd:testnet:123456789abcdefg/path/to/some/other/place/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff/"),
@@ -142,8 +141,8 @@ var _ = Describe("DID-URL tests", func() {
 // 	}
 // }
 
-// func TestDidURLJoin(t *testing.T) Entry("", 
-// 	cases := []stringEntry("", 
+// func TestDidURLJoin(t *testing.T) Entry("",
+// 	cases := []stringEntry("",
 // 		"did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff",
 // 		"did:cheqd:testnet:123456789abcdefg/path/to/some/other/place/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff/",
 // 		"did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query",
@@ -158,7 +157,7 @@ var _ = Describe("DID-URL tests", func() {
 // 		"did:cheqd:testnet:123456789abcdefg?query",
 // 	}
 
-// 	for _, tc := range cases Entry("", 
+// 	for _, tc := range cases Entry("",
 // 		t.Run("split/join"+tc, func(t *testing.T) {
 // 			did, path, query, fragment := MustSplitDIDUrl(tc)
 // 			require.Equal(t, tc, JoinDIDUrl(did, path, query, fragment))
diff --git a/x/cheqd/utils/utils_suite_test.go b/x/cheqd/utils/utils_suite_test.go
index c731605ec..feade1121 100644
--- a/x/cheqd/utils/utils_suite_test.go
+++ b/x/cheqd/utils/utils_suite_test.go
@@ -1,7 +1,7 @@
 package utils_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"
@@ -10,4 +10,4 @@ import (
 func TestUtils(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Utils Suite")
-}
\ No newline at end of file
+}

From 7454e88a39208ed2e83fec07b3f961dbfdb310b3 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@evernym.com>
Date: Tue, 23 Aug 2022 12:23:41 +0300
Subject: [PATCH 10/76] Another portion of tests with ginkgo

---
 x/cheqd/utils/did_test.go      | 181 +++++++++++++---------------
 x/cheqd/utils/did_url_test.go  |  86 --------------
 x/cheqd/utils/encoding_test.go | 112 +++++++-----------
 x/cheqd/utils/proto_test.go    |  19 ++-
 x/cheqd/utils/str_test.go      | 208 +++++++++++++++------------------
 5 files changed, 227 insertions(+), 379 deletions(-)

diff --git a/x/cheqd/utils/did_test.go b/x/cheqd/utils/did_test.go
index 39bad227a..13186fd49 100644
--- a/x/cheqd/utils/did_test.go
+++ b/x/cheqd/utils/did_test.go
@@ -1,123 +1,100 @@
-package utils
+package utils_test
 
 import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
 )
 
-func TestIsId(t *testing.T) {
-	cases := []struct {
-		valid bool
-		id    string
-	}{
-		{true, "123456789abcdefg"},
-		{true, "123456789abcdefg123456789abcdefg"},
-		{true, "3b9b8eec-5b5d-4382-86d8-9185126ff130"},
-		{false, "sdf"},
-		{false, "sdf:sdf"},
-		{false, "12345"},
-	}
+var _ = Describe("DID checks", func() {
+	DescribeTable("Check is valid ID (for example did:cheqD:testnet:123456789abcdefg and ID is 123456789abcdefg)",
 
-	for _, tc := range cases {
-		t.Run(tc.id, func(t *testing.T) {
-			isDid := IsValidID(tc.id)
+		func(expected bool, did string) {
+			Expect(IsValidID(did)).To(Equal(expected))			
+		},
+		Entry("Valid base58, 16 symbols", true, "123456789abcdefg"),
+		Entry("Valid base58, 32 symbols", true, "123456789abcdefg123456789abcdefg"),
+		Entry("Valid UUID", true, "3b9b8eec-5b5d-4382-86d8-9185126ff130"),
+		Entry("Not valid, not base58 symbols", false, "12345678abcdIlO0"),
+		Entry("Not valid, length", false, "sdf"),
+		Entry("Not valid, length and format", false, "sdf:sdf"),
+		Entry("Not valid, length", false, "12345"),
+	)
 
-			if tc.valid {
-				require.True(t, isDid)
-			} else {
-				require.False(t, isDid)
-			}
-		})
-	}
-}
+	DescribeTable("DID validation",
 
-func TestIsDid(t *testing.T) {
-	cases := []struct {
-		name      string
-		valid     bool
-		did       string
-		method    string
-		allowedNS []string
-	}{
-		{"Valid: Inputs: Method and namespace are set", true, "did:cheqd:testnet:123456789abcdefg", "cheqd", []string{"testnet"}},
-		{"Valid: Inputs: Method and namespaces are set", true, "did:cheqd:testnet:123456789abcdefg", "cheqd", []string{"testnet", "mainnet"}},
-		{"Valid: Inputs: Method not set", true, "did:cheqd:testnet:123456789abcdefg", "", []string{"testnet"}},
-		{"Valid: Inputs: Method and namespaces are empty", true, "did:cheqd:testnet:123456789abcdefg", "", []string{}},
-		{"Valid: Namespace is absent in DID", true, "did:cheqd:123456789abcdefg", "", []string{}},
+		func(expected bool, did string, method string, allowedNamespaces []string) {
+			Expect(IsValidDID(did, method, allowedNamespaces)).To(Equal(expected))			
+		},
+
+		Entry("Valid: Inputs: Method and namespace are set", true, "did:cheqd:testnet:123456789abcdefg", "cheqd", []string{"testnet"}),
+		Entry("Valid: Inputs: Method and namespaces are set", true, "did:cheqd:testnet:123456789abcdefg", "cheqd", []string{"testnet", "mainnet"}),
+		Entry("Valid: Inputs: Method not set", true, "did:cheqd:testnet:123456789abcdefg", "", []string{"testnet"}),
+		Entry("Valid: Inputs: Method and namespaces are empty", true, "did:cheqd:testnet:123456789abcdefg", "", []string{}),
+		Entry("Valid: Namespace is absent in DID", true, "did:cheqd:123456789abcdefg", "", []string{}),
 		// Generic method validation
-		{"Valid: Inputs: Method is not set and passed for NOTcheqd", true, "did:NOTcheqd:123456789abcdefg", "", []string{}},
-		{"Valid: Inputs: Method and Namespaces are not set and passed for NOTcheqd", true, "did:NOTcheqd:123456789abcdefg123456789abcdefg", "", []string{}},
+		Entry("Valid: Inputs: Method is not set and passed for NOTcheqd", true, "did:NOTcheqd:123456789abcdefg", "", []string{}),
+		Entry("Valid: Inputs: Method and Namespaces are not set and passed for NOTcheqd", true, "did:NOTcheqd:123456789abcdefg123456789abcdefg", "", []string{}),
 
-		{"Valid: Inputs: Order of namespaces changed", true, "did:cheqd:testnet:123456789abcdefg", "cheqd", []string{"mainnet", "testnet"}},
+		Entry("Valid: Inputs: Order of namespaces changed", true, "did:cheqd:testnet:123456789abcdefg", "cheqd", []string{"mainnet", "testnet"}),
 		// Wrong splitting (^did:([^:]+?)(:([^:]+?))?:([^:]+)$)
-		{"Not valid: DID is not started from 'did'", false, "did123:cheqd:::123456789abcdefg", "cheqd", []string{"testnet"}},
-		{"Not valid: empty namespace", false, "did:cheqd::123456789abcdefg", "cheqd", []string{"testnet"}},
-		{"Not valid: a lot of ':'", false, "did:cheqd:::123456789abcdefg", "cheqd", []string{"testnet"}},
-		{"Not valid: several DIDs in one string", false, "did:cheqd:testnet:123456789abcdefg:did:cheqd:testnet:123456789abcdefg", "cheqd", []string{"testnet"}},
+		Entry("Not valid: DID is not started from 'did'", false, "did123:cheqd:::123456789abcdefg", "cheqd", []string{"testnet"}),
+		Entry("Not valid: empty namespace", false, "did:cheqd::123456789abcdefg", "cheqd", []string{"testnet"}),
+		Entry("Not valid: a lot of ':'", false, "did:cheqd:::123456789abcdefg", "cheqd", []string{"testnet"}),
+		Entry("Not valid: several DIDs in one string", false, "did:cheqd:testnet:123456789abcdefg:did:cheqd:testnet:123456789abcdefg", "cheqd", []string{"testnet"}),
 		// Wrong method
-		{"Not valid: method in DID is not the same as from Inputs", false, "did:NOTcheqd:testnet:123456789abcdefg", "cheqd", []string{"mainnet", "testnet"}},
-		{"Not valid: method in Inputs is not the same as from DID", false, "did:cheqd:testnet:123456789abcdefg", "NOTcheqd", []string{"mainnet", "testnet"}},
+		Entry("Not valid: method in DID is not the same as from Inputs", false, "did:NOTcheqd:testnet:123456789abcdefg", "cheqd", []string{"mainnet", "testnet"}),
+		Entry("Not valid: method in Inputs is not the same as from DID", false, "did:cheqd:testnet:123456789abcdefg", "NOTcheqd", []string{"mainnet", "testnet"}),
 		// Wrong namespace (^[a-zA-Z0-9]*)
-		{"Not valid: / is not allowed for namespace", false, "did:cheqd:testnet/:123456789abcdefg", "cheqd", []string{}},
-		{"Not valid: _ is not allowed for namespace", false, "did:cheqd:testnet_:123456789abcdefg", "cheqd", []string{}},
-		{"Not valid: % is not allowed for namespace", false, "did:cheqd:testnet%:123456789abcdefg", "cheqd", []string{}},
-		{"Not valid: * is not allowed for namespace", false, "did:cheqd:testnet*:123456789abcdefg", "cheqd", []string{}},
-		{"Not valid: & is not allowed for namespace", false, "did:cheqd:testnet&:123456789abcdefg", "cheqd", []string{}},
-		{"Not valid: @ is not allowed for namespace", false, "did:cheqd:testnet@:123456789abcdefg", "cheqd", []string{}},
-		{"Not valid: namespace from Inputs is not the same as from DID", false, "did:cheqd:testnet:123456789abcdefg", "cheqd", []string{"not_testnet"}},
+		Entry("Not valid: / is not allowed for namespace", false, "did:cheqd:testnet/:123456789abcdefg", "cheqd", []string{}),
+		Entry("Not valid: _ is not allowed for namespace", false, "did:cheqd:testnet_:123456789abcdefg", "cheqd", []string{}),
+		Entry("Not valid: % is not allowed for namespace", false, "did:cheqd:testnet%:123456789abcdefg", "cheqd", []string{}),
+		Entry("Not valid: * is not allowed for namespace", false, "did:cheqd:testnet*:123456789abcdefg", "cheqd", []string{}),
+		Entry("Not valid: & is not allowed for namespace", false, "did:cheqd:testnet&:123456789abcdefg", "cheqd", []string{}),
+		Entry("Not valid: @ is not allowed for namespace", false, "did:cheqd:testnet@:123456789abcdefg", "cheqd", []string{}),
+		Entry("Not valid: namespace from Inputs is not the same as from DID", false, "did:cheqd:testnet:123456789abcdefg", "cheqd", []string{"not_testnet"}),
 		// Base58 checks (^[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]*$)
-		{"Not valid: O - is not allowed for UniqueID", false, "did:cheqd:testnet:123456789abcdefO", "cheqd", []string{}},
-		{"Not valid: I - is not allowed for UniqueID", false, "did:cheqd:testnet:123456789abcdefI", "cheqd", []string{}},
-		{"Not valid: l - is not allowed for UniqueID", false, "did:cheqd:testnet:123456789abcdefl", "cheqd", []string{}},
-		{"Not valid: 0 - is not allowed for UniqueID", false, "did:cheqd:testnet:123456789abcdef0", "cheqd", []string{}},
+		Entry("Not valid: O - is not allowed for UniqueID", false, "did:cheqd:testnet:123456789abcdefO", "cheqd", []string{}),
+		Entry("Not valid: I - is not allowed for UniqueID", false, "did:cheqd:testnet:123456789abcdefI", "cheqd", []string{}),
+		Entry("Not valid: l - is not allowed for UniqueID", false, "did:cheqd:testnet:123456789abcdefl", "cheqd", []string{}),
+		Entry("Not valid: 0 - is not allowed for UniqueID", false, "did:cheqd:testnet:123456789abcdef0", "cheqd", []string{}),
 		// Length checks (should be exactly 16 or 32)
-		{"Not valid: UniqueID less then 16 symbols", false, "did:cheqd:testnet:123", "cheqd", []string{}},
-		{"Not valid: UniqueID more then 16 symbols but less then 32", false, "did:cheqd:testnet:123456789abcdefgABCDEF", "cheqd", []string{}},
-		{"Not valid: UniqueID more then 32 symbols", false, "did:cheqd:testnet:123456789abcdefg123456789abcdefgABCDEF", "cheqd", []string{}},
-	}
+		Entry("Not valid: UniqueID less then 16 symbols", false, "did:cheqd:testnet:123", "cheqd", []string{}),
+		Entry("Not valid: UniqueID more then 16 symbols but less then 32", false, "did:cheqd:testnet:123456789abcdefgABCDEF", "cheqd", []string{}),
+		Entry("Not valid: UniqueID more then 32 symbols", false, "did:cheqd:testnet:123456789abcdefg123456789abcdefgABCDEF", "cheqd", []string{}),
+	)
 
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			isDid := IsValidDID(tc.did, tc.method, tc.allowedNS)
+	// The next test will check more functionality aspects. This one is for testing corner cases
+	Describe("Check splitting functionality", func() {
 
-			if tc.valid {
-				require.True(t, isDid)
-			} else {
-				require.False(t, isDid)
-			}
+		Context("Valid DID", func() {
+			It("should return expected method, namespace and DID", func() {
+				method, namespace, id := MustSplitDID("did:cheqd:mainnet:qqqqqqqqqqqqqqqq")
+				Expect(method).To(Equal("cheqd"))
+				Expect(namespace).To(Equal("mainnet"))
+				Expect(id).To(Equal("qqqqqqqqqqqqqqqq"))
+			})
 		})
-	}
-}
-
-func TestSplitJoin(t *testing.T) {
-	cases := []string{
-		"did:cheqd:testnet:123456789abcdefg",
-		"did:cheqd:testnet:123456789abcdefg",
-		"did:cheqd:testnet:123456789abcdefg",
-		"did:cheqd:testnet:123456789abcdefg",
-		"did:cheqd:123456789abcdefg",
-		"did:NOTcheqd:123456789abcdefg",
-		"did:NOTcheqd:123456789abcdefg123456789abcdefg",
-		"did:cheqd:testnet:123456789abcdefg",
-	}
 
-	for _, tc := range cases {
-		// Test split/join
-		t.Run("split/join "+tc, func(t *testing.T) {
-			method, namespace, id := MustSplitDID(tc)
-			require.Equal(t, tc, JoinDID(method, namespace, id))
+		Context("Not valid DID string at all", func() {
+			It("should panic", func() {
+				panicDID := "Not 	"
+				Expect(func (){
+					MustSplitDID(panicDID)
+					}).To(Panic())
+			})
 		})
-	}
-}
+	})
 
-func TestMustSplitDID(t *testing.T) {
-	require.Panicsf(t, func() {
-		MustSplitDID("not did")
-	}, "must panic")
+	DescribeTable("Check DID splitting and joining",
 
-	method, namespace, id := MustSplitDID("did:cheqd:mainnet:qqqqqqqqqqqqqqqq")
-	require.Equal(t, "cheqd", method)
-	require.Equal(t, "mainnet", namespace)
-	require.Equal(t, "qqqqqqqqqqqqqqqq", id)
-}
+	func(did string) {
+		method, namespace, id := MustSplitDID(did)
+		Expect(did).To(Equal(JoinDID(method, namespace, id)))
+	},
+		Entry("Full DID", "did:cheqd:testnet:123456789abcdefg"),
+		Entry("Without namespace", "did:cheqd:123456789abcdefg"),
+		Entry("Not cheqd method", "did:NOTcheqd:123456789abcdefg"),
+		Entry("32-symbols ID", "did:NOTcheqd:123456789abcdefg123456789abcdefg"),
+	)
+})
diff --git a/x/cheqd/utils/did_url_test.go b/x/cheqd/utils/did_url_test.go
index 6946f7f40..874c0d1c4 100644
--- a/x/cheqd/utils/did_url_test.go
+++ b/x/cheqd/utils/did_url_test.go
@@ -78,89 +78,3 @@ var _ = Describe("DID-URL tests", func() {
 		Entry("Not valid: Split should return error", false, "qwerty"),
 	)
 })
-
-// func TestIsDidURL(t *testing.T) {
-// 	cases := []struct {
-// 		name   string
-// 		valid  bool
-// 		didUrl string
-// 	}{
-// 		// Path: all the possible symbols
-// 		{"Valid: the whole alphabet for path", true, "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"},
-// 		{"Valid: several paths", true, "did:cheqd:testnet:123456789abcdefg/path/to/some/other/place/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff/"},
-// 		{"Valid: the whole alphabet with query", true, "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query"},
-// 		{"Valid: the whole alphabet with query and fragment", true, "did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query#fragment"},
-// 		{"Valid: each possible symbols as a path", true, "did:cheqd:testnet:123456789abcdefg/12/ab/AB/-/./_/~/!/$/&/'/(/)/*/+/,/;/=/:/@/%20/%ff"},
-// 		{"Valid: empty path", true, "did:cheqd:testnet:123456789abcdefg/"},
-// 		// Query: all the possible variants
-// 		{"Valid: the whole alphabet for query", true, "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"},
-// 		{"Valid: the whole alphabet for query and another query", true, "did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query=2?query=3/query=%A4"},
-// 		// Fragment:
-// 		{"Valid: the whole alphabet for fragment", true, "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff"},
-// 		{"Valid: the whole alphabet with query and apth", true, "did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?"},
-// 		{"Valid: only fragment", true, "did:cheqd:testnet:123456789abcdefg#fragment"},
-// 		{"Valid: only query", true, "did:cheqd:testnet:123456789abcdefg?query"},
-// 		// Wrong cases
-// 		{"Not valid: wrong HEXDIG for path (pct-encoded phrase)", false, "did:cheqd:testnet:123456789abcdefg/path%20%zz"},
-// 		{"Not valid: wrong HEXDIG for query (pct-encoded phrase)", false, "did:cheqd:testnet:123456789abcdefg/path?query%20%zz"},
-// 		{"Not valid: wrong HEXDIG for fragment (pct-encoded phrase)", false, "did:cheqd:testnet:123456789abcdefg/path?query#fragment%20%zz"},
-// 		// Wrong splitting (^did:([^:]+?)(:([^:]+?))?:([^:]+)$)
-// 		{"Not valid: starts with not 'did'", false, "did123:cheqd:::123456789abcdefg/path?query#fragment"},
-// 		{"Not valid: empty namespace", false, "did:cheqd::123456789abcdefg/path?query#fragment"},
-// 		{"Not valid: a lot of ':'", false, "did:cheqd:::123456789abcdefg/path?query#fragment"},
-// 		{"Not valid: two DIDs in one", false, "did:cheqd:testnet:123456789abcdefg:did:cheqd:testnet:123456789abcdefg/path?query#fragment"},
-// 		// Wrong namespace (^[a-zA-Z0-9]*)
-// 		{"Not valid:  / - is not allowed for namespace", false, "did:cheqd:testnet/:123456789abcdefg/path?query#fragment"},
-// 		{"Not valid: _  - is not allowed for namespace", false, "did:cheqd:testnet_:123456789abcdefg/path?query#fragment"},
-// 		{"Not valid: % - is not allowed for namespace", false, "did:cheqd:testnet%:123456789abcdefg/path?query#fragment"},
-// 		{"Not valid: * - is not allowed for namespace", false, "did:cheqd:testnet*:123456789abcdefg/path?query#fragment"},
-// 		{"Not valid: & - is not allowed for namespace", false, "did:cheqd:testnet&:123456789abcdefg/path?query#fragment"},
-// 		{"Not valid: @ - is not allowed for namespace", false, "did:cheqd:testnet@/:123456789abcdefg/path?query#fragment"},
-// 		// Base58 checks (^[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]*$)
-// 		{"Not valid: O - is not allowed for base58", false, "did:cheqd:testnet:123456789abcdefO/path?query#fragment"},
-// 		{"Not valid: I - is not allowed for base58", false, "did:cheqd:testnet:123456789abcdefI/path?query#fragment"},
-// 		{"Not valid: l - is not allowed for base58", false, "did:cheqd:testnet:123456789abcdefl/path?query#fragment"},
-// 		{"Not valid: 0 - is not allowed for base58", false, "did:cheqd:testnet:123456789abcdef0/path?query#fragment"},
-// 		// Length checks (should be exactly 16 or 32)
-// 		{"Not valid: UniqueID less then 16 symbols", false, "did:cheqd:testnet:123/path?query#fragment"},
-// 		{"Not valid: UniqueID more then 16 symbols but less then 32", false, "did:cheqd:testnet:123456789abcdefgABCDEF/path?query#fragment"},
-// 		{"Not valid: UniqueID more then 32 symbols", false, "did:cheqd:testnet:123456789abcdefg123456789abcdefgABCDEF/path?query#fragment"},
-// 		{"Not valid: Split should return error", false, "qwerty"},
-// 	}
-
-// 	for _, tc := range cases {
-// 		t.Run(tc.name, func(t *testing.T) {
-// 			isDid := IsValidDIDUrl(tc.didUrl, "", []string{})
-
-// 			if tc.valid {
-// 				require.True(t, isDid)
-// 			} else {
-// 				require.False(t, isDid)
-// 			}
-// 		})
-// 	}
-// }
-
-// func TestDidURLJoin(t *testing.T) Entry("",
-// 	cases := []stringEntry("",
-// 		"did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff",
-// 		"did:cheqd:testnet:123456789abcdefg/path/to/some/other/place/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff/",
-// 		"did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query",
-// 		"did:cheqd:testnet:123456789abcdefg/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query#fragment",
-// 		"did:cheqd:testnet:123456789abcdefg/12/ab/AB/-/./_/~/!/$/&/'/(/)/*/+/,/;/=/:/@/%20/%ff",
-// 		"did:cheqd:testnet:123456789abcdefg/",
-// 		"did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?",
-// 		"did:cheqd:testnet:123456789abcdefg/path?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?query=2?query=3/query=%A4",
-// 		"did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff",
-// 		"did:cheqd:testnet:123456789abcdefg/path?query#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~!$&'()*+,;=:@%20%ff?",
-// 		"did:cheqd:testnet:123456789abcdefg#fragment",
-// 		"did:cheqd:testnet:123456789abcdefg?query",
-// 	}
-
-// 	for _, tc := range cases Entry("",
-// 		t.Run("split/join"+tc, func(t *testing.T) {
-// 			did, path, query, fragment := MustSplitDIDUrl(tc)
-// 			require.Equal(t, tc, JoinDIDUrl(did, path, query, fragment))
-// 		})
-// 	}
-// }
diff --git a/x/cheqd/utils/encoding_test.go b/x/cheqd/utils/encoding_test.go
index d06f74dda..f6ec66f15 100644
--- a/x/cheqd/utils/encoding_test.go
+++ b/x/cheqd/utils/encoding_test.go
@@ -1,11 +1,10 @@
-package utils
+package utils_test
 
 import (
 	"encoding/json"
-	"testing"
-
-	"github.com/multiformats/go-multibase"
-	"github.com/stretchr/testify/require"
+	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 )
 
 type TestJWKKey struct {
@@ -40,76 +39,53 @@ var (
 	NotValidJWKByte, _ = json.Marshal(NotValidJWKKey)
 )
 
-func TestValidateMultibase(t *testing.T) {
-	cases := []struct {
-		name     string
-		data     string
-		encoding multibase.Encoding
-		valid    bool
-	}{
-		{"Valid: General pmbkey", "zABCDEFG123456789", multibase.Base58BTC, true},
-		{"Not Valid: cannot be empty", "", multibase.Base58BTC, false},
-		{"Not Valid: without z but base58", "ABCDEFG123456789", multibase.Base58BTC, false},
-		{"Not Valid: without z and not base58", "OIl0ABCDEFG123456789", multibase.Base58BTC, false},
-		{"Not Valid: with z but not base58", "zOIl0ABCDEFG123456789", multibase.Base58BTC, false},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := ValidateMultibase(tc.data)
+var _ = Describe("Encoding checks", func() {
+	DescribeTable("Is valid multibase key",
 
-			if tc.valid {
-				require.NoError(t, err)
+		func(data string, isValid bool) {
+			_err := ValidateMultibase(data)
+			if isValid {
+				Ω(_err).ShouldNot(HaveOccurred())
 			} else {
-				require.Error(t, err)
+				Ω(_err).Should(HaveOccurred())
 			}
-		})
-	}
-}
+		},
 
-func TestValidateBase58(t *testing.T) {
-	cases := []struct {
-		name  string
-		data  string
-		valid bool
-	}{
-		{"Valid: General pmbkey", "ABCDEFG123456789", true},
-		{"Not Valid: cannot be empty", "", false},
-		{"Not Valid: not base58", "OIl0ABCDEFG123456789", false},
-	}
+		Entry("Valid: General pmbkey", "zABCDEFG123456789",  true),
+		Entry("Not Valid: cannot be empty", "", false),
+		Entry("Not Valid: without z but base58", "ABCDEFG123456789", false),
+		Entry("Not Valid: without z and not base58", "OIl0ABCDEFG123456789", false),
+		Entry("Not Valid: with z but not base58", "zOIl0ABCDEFG123456789", false),
+	)
 
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := ValidateBase58(tc.data)
+	DescribeTable("Validate Base58",
 
-			if tc.valid {
-				require.NoError(t, err)
+		func(data string, isValid bool) {
+			_err := ValidateBase58(data)
+			if isValid {
+				Ω(_err).ShouldNot(HaveOccurred())
 			} else {
-				require.Error(t, err)
-			}
-		})
-	}
-}
+				Ω(_err).Should(HaveOccurred())
+			}			
+		},
 
-func TestValidateJWK(t *testing.T) {
-	cases := []struct {
-		name  string
-		data  string
-		valid bool
-	}{
-		{"Valid: General jwk", string(ValidJWKByte), true},
-		{"Not Valid: Bad jwk", string(NotValidJWKByte), false},
-	}
+		Entry("Valid: General pmbkey", "ABCDEFG123456789", true),
+		Entry("Not Valid: cannot be empty", "", false),
+		Entry("Not Valid: not base58", "OIl0ABCDEFG123456789", false),
+	)
 
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := ValidateJWK(tc.data)
+	DescribeTable("Validate JWK",
 
-			if tc.valid {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-			}
-		})
-	}
-}
+	func(data string, isValid bool) {
+		_err := ValidateJWK(data)
+		if isValid {
+			Ω(_err).ShouldNot(HaveOccurred())
+		} else {
+			Ω(_err).Should(HaveOccurred())
+		}
+	},
+
+	Entry("Valid: General jwk", string(ValidJWKByte), true),
+	Entry("Not Valid: Bad jwk", string(NotValidJWKByte), false),
+)
+})
diff --git a/x/cheqd/utils/proto_test.go b/x/cheqd/utils/proto_test.go
index d62252a9b..11d4f7a02 100644
--- a/x/cheqd/utils/proto_test.go
+++ b/x/cheqd/utils/proto_test.go
@@ -1,12 +1,19 @@
-package utils
+package utils_test
 
 import (
-	"testing"
+	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 
 	bank_types "github.com/cosmos/cosmos-sdk/x/bank/types"
-	"github.com/stretchr/testify/assert"
 )
 
-func Test_MsgTypeUrl(t *testing.T) {
-	assert.Equal(t, "/cosmos.bank.v1beta1.DenomUnit", MsgTypeURL(&bank_types.DenomUnit{}))
-}
+var _ = Describe("Proto", func() {
+	Describe("Check that DenomUnit from bank type has expected value", func() {
+		Context("Denom Unit from cosmos-sdk" ,func ()  {
+			It("should return expected value", func() {
+				Expect(MsgTypeURL(&bank_types.DenomUnit{})).To(Equal("/cosmos.bank.v1beta1.DenomUnit"))
+			})
+		})
+	})
+})
diff --git a/x/cheqd/utils/str_test.go b/x/cheqd/utils/str_test.go
index 80a91eb4f..cb3b5d64e 100644
--- a/x/cheqd/utils/str_test.go
+++ b/x/cheqd/utils/str_test.go
@@ -1,122 +1,96 @@
-package utils
+package utils_test
 
 import (
+	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	"sort"
-	"testing"
-
-	"github.com/stretchr/testify/require"
 )
 
-func TestIndexOf(t *testing.T) {
-	cases := []struct {
-		array          []string
-		searchElement  string
-		fromIndex      int
-		expectedResult int
-	}{
-		{[]string{}, "", 0, -1},
-		{nil, "", 0, -1},
-		{[]string{"1", "2"}, "1", 0, 0},
-		{[]string{"1", "2", "3"}, "3", 0, 2},
-		{[]string{"1", "2", "3"}, "4", 0, -1},
-		{[]string{"4", "1", "6", "2", "3", "4"}, "4", 0, 0},
-		{[]string{"4", "1", "6", "2", "3", "4"}, "4", 1, 5},
-		{[]string{"4", "1", "6", "2", "3", "4"}, "4", 3, 5},
-	}
-
-	for _, tc := range cases {
-		actual := IndexOf(tc.array, tc.searchElement, tc.fromIndex)
-		require.Equal(t, tc.expectedResult, actual)
-	}
-}
-
-func TestContains(t *testing.T) {
-	cases := []struct {
-		array          []string
-		searchElement  string
-		expectedResult bool
-	}{
-		{[]string{}, "", false},
-		{nil, "", false},
-		{[]string{"1", "2"}, "1", true},
-		{[]string{"1", "2", "3"}, "2", true},
-		{[]string{"1", "2", "3"}, "3", true},
-		{[]string{"1", "2", "3"}, "123", false},
-	}
-
-	for _, tc := range cases {
-		actual := Contains(tc.array, tc.searchElement)
-		require.Equal(t, tc.expectedResult, actual)
-	}
-}
-
-func TestSubtract(t *testing.T) {
-	cases := []struct {
-		first    []string
-		second   []string
-		expected []string
-	}{
-		{[]string{}, []string{}, []string{}},
-		{nil, []string{}, []string{}},
-		{nil, nil, []string{}},
-		{[]string{"1", "2"}, []string{"1", "2"}, []string{}},
-		{[]string{"1", "2", "3"}, []string{}, []string{"1", "2", "3"}},
-		{[]string{"1", "2", "3"}, nil, []string{"1", "2", "3"}},
-		{[]string{"1", "2", "3"}, []string{"4", "5", "6"}, []string{"1", "2", "3"}},
-		{[]string{"1", "2", "3"}, []string{"1", "5", "2"}, []string{"3"}},
-		{[]string{"4", "1", "6", "2", "3"}, []string{"1", "5", "2"}, []string{"3", "4", "6"}},
-	}
-
-	for _, tc := range cases {
-		actual := Subtract(tc.first, tc.second)
-		// We can't compare arrays directly cause result of `subtract` is not deterministic
-		sort.Strings(actual)
-		require.Equal(t, tc.expected, actual)
-	}
-}
-
-func TestUnique(t *testing.T) {
-	cases := []struct {
-		array    []string
-		expected []string
-	}{
-		{[]string{}, []string{}},
-		{nil, []string{}},
-		{[]string{"1", "2"}, []string{"1", "2"}},
-		{[]string{"1", "3", "2"}, []string{"1", "2", "3"}},
-		{[]string{"4", "1", "6", "2", "3", "1", "3", "1"}, []string{"1", "2", "3", "4", "6"}},
-	}
-
-	for _, tc := range cases {
-		actual := Unique(tc.array)
-		// We can't compare arrays directly cause result of `unique` is not deterministic
-		sort.Strings(actual)
-		require.Equal(t, tc.expected, actual)
-	}
-}
-
-func TestReplaceInList(t *testing.T) {
-	list := []string{"1", "2", "3", "2"}
-	ReplaceInSlice(list, "2", "3")
-
-	require.Equal(t, []string{"1", "3", "3", "3"}, list)
-}
-
-func TestUniqueSorted(t *testing.T) {
-	cases := []struct {
-		name   string
-		input  []string
-		output []string
-	}{
-		{"General alphabet list", []string{"aa", "bb"}, []string{"aa", "bb"}},
-		{"General alphabet reverse list", []string{"bb", "aa"}, []string{"aa", "bb"}},
-		{"General number list", []string{"22", "11"}, []string{"11", "22"}},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			res := UniqueSorted(tc.input)
-			require.Equal(t, res, tc.output)
-		})
-	}
-}
+var _ = Describe("Str utils functionality", func() {
+	DescribeTable("IndexOf function",
+
+		func(array []string, searchElement string, fromIndex int, expectedResult int) {
+			actual := IndexOf(array, searchElement, fromIndex)
+			Expect(actual).To(Equal(expectedResult))
+		},
+
+		Entry("Emty array, Empty element, Expected: -1", []string{}, "", 0, -1),
+		Entry("Nil as array, Empty element, Expected: -1", nil, "", 0, -1),
+		Entry("Desired element is the first. Expected: 0", []string{"1", "2"}, "1", 0, 0),
+		Entry("Desired element is the latest one. Expected: 2", []string{"1", "2", "3"}, "3", 0, 2),
+		Entry("Desired element is absent. Expected: -1", []string{"1", "2", "3"}, "4", 0, -1),
+		Entry("There are more then 1 such elements but search should be started from the beginning. Expected: 0", []string{"4", "1", "6", "2", "3", "4"}, "4", 0, 0),
+		Entry("There are more then 1 such elements but search should be started from the index 1. Expected: 5", []string{"4", "1", "6", "2", "3", "4"}, "4", 1, 5),
+		Entry("There are more then 1 such elements but search should be started from the index 3. Expected: 5", []string{"4", "1", "6", "2", "3", "4"}, "4", 3, 5),
+	)
+
+	DescribeTable("Contains function",
+
+		func(array []string, searchElement string, doesContain bool) {
+			Expect(Contains(array, searchElement)).To(Equal(doesContain))
+		},
+		Entry("Emty array, Empty element, Expected: false", []string{}, "", false),
+		Entry("Nil as array, Empty element, Expected: false", nil, "", false),
+		Entry("Desired element exists at the position 1. Expected: true", []string{"1", "2"}, "1", true),
+		Entry("Desired element exists at the position 2. Expected: true", []string{"1", "2", "3"}, "2", true),
+		Entry("Desired element exists at the position 3. Expected: true", []string{"1", "2", "3"}, "3", true),
+		Entry("Desired element is absent. Expected: false", []string{"1", "2", "3"}, "123", false),
+
+	)
+
+	DescribeTable("Substract function",
+
+		func(first []string, second []string, expected []string) {
+			actual := Subtract(first, second)
+			// We can't compare arrays directly cause result of `subtract` is not deterministic
+			sort.Strings(actual)
+			Expect(expected).To(Equal(actual))
+		},
+		Entry("Empty first and empty second. Expected empty list", []string{}, []string{}, []string{}),
+		Entry("nil as the first and the empty second. Expected empty list", nil, []string{}, []string{}),
+		Entry("nil as the first and nil as the second. Expected empty list", nil, nil, []string{}),
+		Entry("The same lists. Expected empty list", []string{"1", "2"}, []string{"1", "2"}, []string{}),
+		Entry("Substract with empty list. Exected: first array", []string{"1", "2", "3"}, []string{}, []string{"1", "2", "3"}),
+		Entry("Substract with nil as the second. Exected: first array", []string{"1", "2", "3"}, nil, []string{"1", "2", "3"}),
+		Entry("Substract with totally different list. Expected: first array", []string{"1", "2", "3"}, []string{"4", "5", "6"}, []string{"1", "2", "3"}),
+		Entry("Substract. General case. Expected: [1, 2]", []string{"1", "2", "3"}, []string{"1", "5", "2"}, []string{"3"}),
+		Entry("Substract. General case. Expected: [3, 4, 6]", []string{"4", "1", "6", "2", "3"}, []string{"1", "5", "2"}, []string{"3", "4", "6"}),
+	)
+
+	DescribeTable("Unique function",
+
+		func(array []string, expected []string) {
+			actual := Unique(array)
+			// We can't compare arrays directly cause result of `unique` is not deterministic
+			sort.Strings(actual)
+			Expect(expected).To(Equal(actual))
+		},
+		Entry("Empty array. Expected empty list", []string{}, []string{}),
+		Entry("nil as array. Expected empty list", nil, []string{}),
+		Entry("Unique array. Expected the same array", []string{"1", "2"}, []string{"1", "2"}),
+		Entry("Unique array with length 3. Expected the same array", []string{"1", "3", "2"}, []string{"1", "2", "3"}),
+		Entry("General case. Expeceted array with unique elements", []string{"4", "1", "6", "2", "3", "1", "3", "1"}, []string{"1", "2", "3", "4", "6"}),
+	)
+
+	DescribeTable("ReplaceInList function",
+
+		func(list []string, oldVal string, newVal string, expected []string) {
+			ReplaceInSlice(list, "2", "3")
+			Expect(expected).To(Equal(list))
+		},
+		Entry("Replace 2 with 3", []string{"1", "2", "3", "2"}, "2", "3", []string{"1", "3", "3", "3"}),
+	)
+
+
+	DescribeTable("UniqueSorted function",
+
+		func(input []string, expected []string) {
+			Expect(UniqueSorted(input)).To(Equal(expected))
+		},
+		Entry("General alphabet list", []string{"aa", "bb"}, []string{"aa", "bb"}),
+		Entry("General alphabet reverse list", []string{"bb", "aa"}, []string{"aa", "bb"}),
+		Entry("General number list", []string{"22", "11"}, []string{"11", "22"}),
+	)
+
+})

From d2164214437c659d61ec554352b0f87ab4c38b66 Mon Sep 17 00:00:00 2001
From: drgomesp <drgomesp@gmail.com>
Date: Wed, 14 Sep 2022 11:56:03 -0300
Subject: [PATCH 11/76] Added test reporting (testing)

---
 .github/workflows/dispatch.yml | 20 ++++++++++----------
 .github/workflows/test.yml     | 33 ++++++++++++++++++++++++++++-----
 go.mod                         | 11 +++--------
 go.sum                         | 31 ++++++++++++++++++++++---------
 x/cheqd/utils/crypto_test.go   |  5 +++--
 5 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index 75e231fe5..853556039 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -11,21 +11,21 @@ jobs:
   #   name: "Lint"
   #   uses: ./.github/workflows/lint.yml
 
-  call-build:
-    name: "Build"
-    # needs: call-lint
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
-  
+#  call-build:
+#    name: "Build"
+#    # needs: call-lint
+#    uses: ./.github/workflows/build.yml
+#    secrets: inherit
+
   call-test:
     name: "Test"
-    needs: call-build
+#    needs: call-build
     uses: ./.github/workflows/test.yml
 
   call-release:
     name: "Release"
-    needs: [call-test, call-build]
-    # needs: call-build
+#    needs: [call-test, call-build]
+    needs: call-test
     if: ${{ github.ref_protected == true }}
     uses: ./.github/workflows/release.yml
-    secrets: inherit
+    secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9b00e17c7..2d8150b17 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,5 +1,16 @@
 name: "Test"
 on:
+  pull_request_target:
+    branches:
+      - main
+      - develop
+    types:
+      - opened
+      - reopened
+      - edited
+      - synchronize
+      - ready_for_review
+      - review_requested
   workflow_call:
     inputs:
       VERSION:
@@ -11,8 +22,9 @@ defaults:
 env:
   NODE_CONFIGS_BASE: "/home/runner/work/cheqd-node/cheqd-node/docker/localnet/network-config"
 permissions:
+  id-token: write
   contents: write
-  packages: read
+  checks: write
 
 jobs:
   ginkgo-tests:
@@ -31,11 +43,23 @@ jobs:
         run: |
           go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo
           go get github.com/onsi/gomega/...
+          go install github.com/jstemmer/go-junit-report/v2@latest
 
       - name: Run Ginkgo tests
-        run: ginkgo -r --race --randomize-all --randomize-suites -v
+        run: |
+          go test -v github.com/cheqd/cheqd-node/x/cheqd/utils 2>&1 | go-junit-report -parser gotest > report.xml
+#
+      - uses: dorny/test-reporter@v1
+        if: success() || failure()        # run this step even if previous step failed
+        with:
+          name: JEST Tests                  # Name of the check run which will be created
+          path: report.xml                     # Path to test results (inside artifact .zip)
+          reporter: java-junit              # Format of test results
+          max-annotations: '50'
+          fail-on-error: false
 
-  # test-new-node-setup:
+
+    # test-new-node-setup:
   #   name: "New node setup"
   #   runs-on: ubuntu-latest
   #   env:
@@ -277,5 +301,4 @@ jobs:
 
   #     - name: Check that node with Cosmovisor was upgraded
   #       working-directory: ./tests/e2e-complex/upgrade/cosmovisor
-  #       run: START_HEIGHT=${{ steps.initiate-upgrade.outputs.START_HEIGHT }} bash check_upgrade.sh
-
+  #       run: START_HEIGHT=${{ steps.initiate-upgrade.outputs.START_HEIGHT }} bash check_upgrade.sh
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 4aff31ac2..135f45a84 100644
--- a/go.mod
+++ b/go.mod
@@ -16,8 +16,8 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/lestrrat-go/jwx v1.2.25
 	github.com/multiformats/go-multibase v0.1.1
-	github.com/onsi/ginkgo v1.16.4
-	github.com/onsi/gomega v1.20.0
+	github.com/onsi/ginkgo/v2 v2.1.6
+	github.com/onsi/gomega v1.20.1
 	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cast v1.5.0
 	github.com/spf13/cobra v1.5.0
@@ -64,7 +64,6 @@ require (
 	github.com/go-kit/log v0.2.0 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
-	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
 	github.com/goccy/go-json v0.9.7 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/gateway v1.1.0 // indirect
@@ -72,7 +71,6 @@ require (
 	github.com/google/btree v1.0.0 // indirect
 	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/google/orderedcode v0.0.1 // indirect
-	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
 	github.com/gorilla/handlers v1.5.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -107,8 +105,7 @@ require (
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/multiformats/go-base32 v0.0.3 // indirect
 	github.com/multiformats/go-base36 v0.1.0 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/onsi/ginkgo/v2 v2.1.4 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
@@ -138,10 +135,8 @@ require (
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/tools v0.1.10 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/ini.v1 v1.66.4 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	nhooyr.io/websocket v1.8.6 // indirect
diff --git a/go.sum b/go.sum
index 86db6d4ec..b635b4121 100644
--- a/go.sum
+++ b/go.sum
@@ -368,7 +368,6 @@ github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5Nq
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
@@ -468,9 +467,9 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -776,20 +775,22 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
-github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
-github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
+github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU=
+github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
 github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
-github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw=
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
-github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q=
-github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo=
+github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q=
+github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
@@ -1053,6 +1054,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8=
 github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
@@ -1124,6 +1127,7 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f h1:OeJjE6G4dgCY4PIXvIRQbE8+RX+uXZyGhUy/ksMGJoc=
@@ -1171,6 +1175,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
+golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1230,6 +1236,7 @@ golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211208012354-db4efeb81f4b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
@@ -1239,6 +1246,7 @@ golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su
 golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E=
 golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -1273,6 +1281,7 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1368,6 +1377,7 @@ golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1376,10 +1386,13 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
@@ -1468,8 +1481,8 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
 golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/x/cheqd/utils/crypto_test.go b/x/cheqd/utils/crypto_test.go
index d29055a26..7d9dd06fb 100644
--- a/x/cheqd/utils/crypto_test.go
+++ b/x/cheqd/utils/crypto_test.go
@@ -3,17 +3,18 @@ package utils_test
 import (
 	// "testing"
 
-	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
 	"github.com/multiformats/go-multibase"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
+	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
 )
 
 var _ = Describe("Crypto", func() {
 	Describe("ValidateEd25519PubKey", func() {
 		Context("Valid: General Ed25519 public key", func() {
 			It("should return no error", func() {
-				_, keyBytes, _ := multibase.Decode("zF1hVGXXK9rmx5HhMTpGnGQJiab9qrFJbQXBRhSmYjQWX")
+				_, keyBytes, _ := multibase.Decode("zF1hVGXXK9rmx5HhMTpGnGQJiab9qrFJbQXBRhSmYjQWXforcingwrong")
 				err := ValidateEd25519PubKey(keyBytes)
 				Expect(err).To(BeNil())
 			})

From 4b0dce97fb18277175d58a02dfdd2695a6b78ffe Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Wed, 5 Oct 2022 17:04:22 +0300
Subject: [PATCH 12/76] Finish tests for utils

Signed-off-by: Andrew Nikitin <andrew.nikitin@cheqd.io>
---
 x/cheqd/utils/crypto_test.go | 74 +++++++++++-------------------------
 x/cheqd/utils/uri_test.go    | 43 +++++++++------------
 x/cheqd/utils/uuid_test.go   | 47 ++++++++++-------------
 3 files changed, 61 insertions(+), 103 deletions(-)

diff --git a/x/cheqd/utils/crypto_test.go b/x/cheqd/utils/crypto_test.go
index 7d9dd06fb..6cc5eb869 100644
--- a/x/cheqd/utils/crypto_test.go
+++ b/x/cheqd/utils/crypto_test.go
@@ -1,7 +1,6 @@
 package utils_test
 
 import (
-	// "testing"
 
 	"github.com/multiformats/go-multibase"
 	. "github.com/onsi/ginkgo/v2"
@@ -14,7 +13,7 @@ var _ = Describe("Crypto", func() {
 	Describe("ValidateEd25519PubKey", func() {
 		Context("Valid: General Ed25519 public key", func() {
 			It("should return no error", func() {
-				_, keyBytes, _ := multibase.Decode("zF1hVGXXK9rmx5HhMTpGnGQJiab9qrFJbQXBRhSmYjQWXforcingwrong")
+				_, keyBytes, _ := multibase.Decode("zF1hVGXXK9rmx5HhMTpGnGQJiab9qrFJbQXBRhSmYjQWX")
 				err := ValidateEd25519PubKey(keyBytes)
 				Expect(err).To(BeNil())
 			})
@@ -29,56 +28,27 @@ var _ = Describe("Crypto", func() {
 			})
 		})
 	})
-})
-
-// func TestValidateEd25519PubKey(t *testing.T) {
-// 	cases := []struct {
-// 		name     string
-// 		key      string
-// 		valid    bool
-// 		errorMsg string
-// 	}{
-// 		{"Valid: General Ed25519 public key", "zF1hVGXXK9rmx5HhMTpGnGQJiab9qrFJbQXBRhSmYjQWX", true, ""},
-// 		{"Valid: General Ed25519 public key", "zF1hVGXXK9rmx5HhMTpGnGQJiab9qr1111111111111", false, "ed25519: bad public key length: 31"},
-// 	}
-
-// 	for _, tc := range cases {
-// 		t.Run(tc.name, func(t *testing.T) {
-// 			_, keyBytes, _ := multibase.Decode(tc.key)
-// 			err := ValidateEd25519PubKey(keyBytes)
 
-// 			if tc.valid {
-// 				require.NoError(t, err)
-// 			} else {
-// 				require.Error(t, err)
-// 				require.Contains(t, err.Error(), tc.errorMsg)
-// 			}
-// 		})
-// 	}
-// }
-
-// func TestValidateJwk(t *testing.T) {
-// 	cases := []struct {
-// 		name     string
-// 		key      string
-// 		valid    bool
-// 		errorMsg string
-// 	}{
-// 		{"positive ed25519", "{\"crv\":\"Ed25519\",\"kty\":\"OKP\",\"x\":\"9Ov80OqMlNrILAUG8DBBlYQ1rUhp7wDomr2I5muzpTc\"}", true, ""},
-// 		{"positive ecdsa", "{\"crv\":\"P-256\",\"kty\":\"EC\",\"x\":\"tcEgxIPyYMiyR2_Vh_YMYG6Grg7axhK2N8JjWta5C0g\",\"y\":\"imiXD9ahVA_MKY066TrNA9r6l35lRrerP6JRey5SryQ\"}", true, ""},
-// 		{"positive rsa", "{\"e\":\"AQAB\",\"kty\":\"RSA\",\"n\":\"skKXRn44WN2DpXDwm4Ip25kIAGRA8y3iXlaoAhPmFiuSDkx97lXcJYrjxX0wSfehgCiSoZOBv6mFzgSVv0_pXQ6zI35xi2dsbexrc87m7Q24q2chpG33ttnVwQkoXrrm0zDzSX32EVxYQyTu9aWp-zxUdAWcrWUarT24RmgjU78v8JmUzkLmwbzsEImnIZ8Hce2ruisAmuAQBVVA4bWwQm_x1KPoQW-TP5_UR3gGugvf0XrQfMJaVpcxcJ9tduMUw6ffZOsqgbvAiZYnrezxSIjnd5lFTFBIEYdGR6ZgjYZoWvQB7U72o_TJoka-zfSODOUbxNBvxvFhA3uhoo3ZKw\"}", true, ""},
-// 	}
+	Describe("ValidateJWKKey", func() {
+		Context("Positive ed25519", func() {
+			It("should return no error", func() {
+				err := ValidateJWK("{\"crv\":\"Ed25519\",\"kty\":\"OKP\",\"x\":\"9Ov80OqMlNrILAUG8DBBlYQ1rUhp7wDomr2I5muzpTc\"}")
+				Expect(err).To(BeNil())
+			})
+		})
 
-// 	for _, tc := range cases {
-// 		t.Run(tc.name, func(t *testing.T) {
-// 			err := ValidateJWK(tc.key)
+		Context("Positive ecdsa", func() {
+			It("should return no error", func() {
+				err := ValidateJWK("{\"crv\":\"P-256\",\"kty\":\"EC\",\"x\":\"tcEgxIPyYMiyR2_Vh_YMYG6Grg7axhK2N8JjWta5C0g\",\"y\":\"imiXD9ahVA_MKY066TrNA9r6l35lRrerP6JRey5SryQ\"}")
+				Expect(err).To(BeNil())
+			})
+		})
 
-// 			if tc.valid {
-// 				require.NoError(t, err)
-// 			} else {
-// 				require.Error(t, err)
-// 				require.Contains(t, err.Error(), tc.errorMsg)
-// 			}
-// 		})
-// 	}
-// }
+		Context("Positive rsa", func() {
+			It("should return no error", func() {
+				err := ValidateJWK("{\"e\":\"AQAB\",\"kty\":\"RSA\",\"n\":\"skKXRn44WN2DpXDwm4Ip25kIAGRA8y3iXlaoAhPmFiuSDkx97lXcJYrjxX0wSfehgCiSoZOBv6mFzgSVv0_pXQ6zI35xi2dsbexrc87m7Q24q2chpG33ttnVwQkoXrrm0zDzSX32EVxYQyTu9aWp-zxUdAWcrWUarT24RmgjU78v8JmUzkLmwbzsEImnIZ8Hce2ruisAmuAQBVVA4bWwQm_x1KPoQW-TP5_UR3gGugvf0XrQfMJaVpcxcJ9tduMUw6ffZOsqgbvAiZYnrezxSIjnd5lFTFBIEYdGR6ZgjYZoWvQB7U72o_TJoka-zfSODOUbxNBvxvFhA3uhoo3ZKw\"}")
+				Expect(err).To(BeNil())
+			})
+		})
+	})
+})
diff --git a/x/cheqd/utils/uri_test.go b/x/cheqd/utils/uri_test.go
index 9e7de26bc..ad6db5a1a 100644
--- a/x/cheqd/utils/uri_test.go
+++ b/x/cheqd/utils/uri_test.go
@@ -1,32 +1,25 @@
-package utils
+package utils_test
 
 import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
+	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 )
 
-func TestValidateURI(t *testing.T) {
-	cases := []struct {
-		name  string
-		valid bool
-		URI   string
-	}{
-		// Path: all the possible symbols
-		{"Valid: General http URI path", true, "http://a.com/a/b/c/d/?query=123#fragment=another_part"},
-		{"Valid: General https URI path", true, "https://a.com/a/b/c/d/?query=123#fragment=another_part"},
-		{"Valid: only alphabet symbols", true, "SomeAnotherPath"},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			err_ := ValidateURI(tc.URI)
+var _ = Describe("URI validation", func() {
+	DescribeTable("ValidateURI",
 
-			if tc.valid {
-				require.NoError(t, err_)
+		func(isValid bool, uri string) {
+			err_ := ValidateURI(uri)
+			if isValid {
+				Expect(err_).To(BeNil())
 			} else {
-				require.Error(t, err_)
+				Expect(err_).ToNot(BeNil())
 			}
-		})
-	}
-}
+		},
+
+		Entry("Valid: General http URI path", true, "http://a.com/a/b/c/d/?query=123#fragment=another_part"),
+		Entry("Valid: General https URI path", true, "https://a.com/a/b/c/d/?query=123#fragment=another_part"),
+		Entry("Valid: only alphabet symbols", true, "SomeAnotherPath"),
+	)
+})
diff --git a/x/cheqd/utils/uuid_test.go b/x/cheqd/utils/uuid_test.go
index 0b7ff983f..5e14c1100 100644
--- a/x/cheqd/utils/uuid_test.go
+++ b/x/cheqd/utils/uuid_test.go
@@ -1,33 +1,28 @@
-package utils
+package utils_test
 
 import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
+	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 )
 
-func TestValidateUUID(t *testing.T) {
-	cases := []struct {
-		uuid  string
-		valid bool
-	}{
-		{"42d9c704-ecb0-11ec-8ea0-0242ac120002", true},
-		{"not uuid", false},
-		{"e1cdbc10-858c-4d7d-8a4b-5d45e90a81b3", true},
-		{"{42d9c704-ecb0-11ec-8ea0-0242ac120002}", false},
-		{"urn:uuid:42d9c704-ecb0-11ec-8ea0-0242ac120002", false},
-		{"42d9c704ecb011ec8ea00242ac120002", false},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.uuid, func(t *testing.T) {
-			err_ := ValidateUUID(tc.uuid)
+var _ = Describe("UUID validation", func() {
+	DescribeTable("ValidateUUID",
 
-			if tc.valid {
-				require.NoError(t, err_)
+		func(uri string, isValid bool) {
+			err_ := ValidateUUID(uri)
+			if isValid {
+				Expect(err_).To(BeNil())
 			} else {
-				require.Error(t, err_)
+				Expect(err_).ToNot(BeNil())
 			}
-		})
-	}
-}
+		},
+
+		Entry("Valid: General UUID", "42d9c704-ecb0-11ec-8ea0-0242ac120002", true),
+		Entry("Not Valid: wrong format", "not uuid", false),
+		Entry("Valid: Another general UUID", "e1cdbc10-858c-4d7d-8a4b-5d45e90a81b3", true),
+		Entry("Not Valid: Unsupported symbol {", "{42d9c704-ecb0-11ec-8ea0-0242ac120002}", false),
+		Entry("Not Valid: Unexpeced prefix", "urn:uuid:42d9c704-ecb0-11ec-8ea0-0242ac120002", false),
+		Entry("Not Valid: Wrong format", "42d9c704ecb011ec8ea00242ac120002", false),
+	)
+})

From fd500cefee13da2d46d9bbb52df998e1cc11f9e5 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Thu, 6 Oct 2022 11:57:48 +0300
Subject: [PATCH 13/76] Move signature verification tests

Signed-off-by: Andrew Nikitin <andrew.nikitin@cheqd.io>
---
 x/cheqd/tests/signature_verification_test.go | 209 +++++++++----------
 1 file changed, 99 insertions(+), 110 deletions(-)

diff --git a/x/cheqd/tests/signature_verification_test.go b/x/cheqd/tests/signature_verification_test.go
index 88a8c9bea..ab371ac7c 100644
--- a/x/cheqd/tests/signature_verification_test.go
+++ b/x/cheqd/tests/signature_verification_test.go
@@ -5,138 +5,127 @@ import (
 	"crypto/rand"
 	"fmt"
 	"reflect"
-	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 
 	"github.com/btcsuite/btcutil/base58"
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
-	"github.com/stretchr/testify/require"
 )
 
-func TestDIDDocControllerChanged(t *testing.T) {
-	setup := Setup()
-
-	// Init did
-	aliceKeys, aliceDid, _ := setup.InitDid(AliceDID)
-	bobKeys, _, _ := setup.InitDid(BobDID)
-
-	updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-	updatedDidDoc.Controller = append(updatedDidDoc.Controller, BobDID)
-	receivedDid, _ := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(ConcatKeys(aliceKeys, bobKeys)))
-
-	// check
-	require.NotEqual(t, aliceDid.Controller, receivedDid.Controller)
-	require.NotEqual(t, []string{AliceDID, BobDID}, receivedDid.Controller)
-	require.Equal(t, []string{BobDID}, receivedDid.Controller)
-}
-
-func TestDIDDocVerificationMethodChangedWithoutOldSignature(t *testing.T) {
-	setup := Setup()
-
-	// Init did
-	_, aliceDid, _ := setup.InitDid(AliceDID)
-	bobKeys, _, _ := setup.InitDid(BobDID)
-
-	updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-	updatedDidDoc.VerificationMethod[0].Type = Ed25519VerificationKey2020
-	_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
+var _ = Describe("Signature Verification", func() {
+	var setup TestSetup
+	var aliceKeys, bobKeys map[string]ed25519.PrivateKey
+	var aliceDid *types.MsgCreateDidPayload
+	BeforeEach(func() {
+		setup = Setup()
+		aliceKeys, aliceDid, _ = setup.InitDid(AliceDID)
+		bobKeys, _, _ = setup.InitDid(BobDID)
+	})
 
-	// check
-	require.Error(t, err)
-	require.Equal(t, fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID), err.Error())
-}
+	It("should has changed DIDDoc controller", func() {
+		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
+		updatedDidDoc.Controller = append(updatedDidDoc.Controller, BobDID)
+		receivedDid, _ := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(ConcatKeys(aliceKeys, bobKeys)))
 
-func TestDIDDocVerificationMethodControllerChangedWithoutOldSignature(t *testing.T) {
-	setup := Setup()
+		Expect(aliceDid.Controller).To(Not(Equal(receivedDid.Controller)))
+		Expect([]string{AliceDID, BobDID}).To(Not(Equal(receivedDid.Controller)))
+		Expect([]string{BobDID}, receivedDid.Controller)
+	})
 
-	// Init did
-	_, aliceDid, _ := setup.InitDid(AliceDID)
-	bobKeys, _, _ := setup.InitDid(BobDID)
+	It("should fails cause we need old signature for changing verification method", func() {
+		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
+		updatedDidDoc.VerificationMethod[0].Type = Ed25519VerificationKey2020
+		_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
 
-	updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-	updatedDidDoc.VerificationMethod[0].Controller = BobDID
-	_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
+		// check
+		Expect(err).To(Not(BeNil()))
+		Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
+	})
 
-	// check
-	require.Error(t, err)
-	require.Equal(t, fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID), err.Error())
-}
+	It("should fails cause we need old signature for changing verification method controller", func() {
+		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
+		updatedDidDoc.VerificationMethod[0].Controller = BobDID
+		_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
 
-func TestDIDDocControllerChangedWithoutOldSignature(t *testing.T) {
-	setup := Setup()
+		// check
+		Expect(err).To(Not(BeNil()))
+		Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
+	})
 
-	// Init did
-	_, aliceDid, _ := setup.InitDid(AliceDID)
-	bobKeys, _, _ := setup.InitDid(BobDID)
+	It("should fails cause we need old signature for changing DIDDoc controller", func() {
+		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
+		updatedDidDoc.Controller = append(updatedDidDoc.Controller, BobDID)
+		_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
 
-	updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-	updatedDidDoc.Controller = append(updatedDidDoc.Controller, BobDID)
-	_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
+		// check
+		Expect(err).To(Not(BeNil()))
+		Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
+	})
+})
+
+var _ = Describe("Signature Verification. Remove signature/VM", func() {
+	var setup TestSetup
+	var ApubKey, BpubKey ed25519.PublicKey
+	var AprivKey, BprivKey ed25519.PrivateKey
+	var aliceDid, bobDid *types.MsgCreateDidPayload
+	var aliceKeys, bobKeys map[string]ed25519.PrivateKey
+
+	BeforeEach(func() {
+		setup = Setup()
+		// Generate keys
+		ApubKey, AprivKey, _ = ed25519.GenerateKey(rand.Reader)
+		BpubKey, BprivKey, _ = ed25519.GenerateKey(rand.Reader)
+
+		// Create dids
+		aliceDid = setup.CreateDid(ApubKey, AliceDID)
+		bobDid = setup.CreateDid(BpubKey, BobDID)
+		
+		// Collect private keys
+		aliceKeys = map[string]ed25519.PrivateKey{AliceKey1: AprivKey, BobKey1: BprivKey}
+		bobKeys = map[string]ed25519.PrivateKey{BobKey1: BprivKey}
+
+		// Add verification method
+		aliceDid.VerificationMethod = append(aliceDid.VerificationMethod, &types.VerificationMethod{
+			Id:                 AliceKey2,
+			Controller:         BobDID,
+			Type:               Ed25519VerificationKey2020,
+			PublicKeyMultibase: "z" + base58.Encode(BpubKey),
+		})
 
-	// check
-	require.Error(t, err)
-	require.Equal(t, fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID), err.Error())
-}
+	})
 
-func TestDIDDocVerificationMethodDeletedWithoutOldSignature(t *testing.T) {
-	setup := Setup()
+	It("should fails cause old signature is required for removing this signature", func() {
 
-	// Init did
+		// Send dids
+		_, _ = setup.SendCreateDid(bobDid, bobKeys)
+		_, _ = setup.SendCreateDid(aliceDid, aliceKeys)
 
-	ApubKey, AprivKey, _ := ed25519.GenerateKey(rand.Reader)
-	BpubKey, BprivKey, _ := ed25519.GenerateKey(rand.Reader)
-	aliceDid := setup.CreateDid(ApubKey, AliceDID)
-	bobDid := setup.CreateDid(BpubKey, BobDID)
+		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
+		updatedDidDoc.VerificationMethod = []*types.VerificationMethod{aliceDid.VerificationMethod[0]}
+		updatedDidDoc.Authentication = []string{aliceDid.Authentication[0]}
+		_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
 
-	aliceDid.VerificationMethod = append(aliceDid.VerificationMethod, &types.VerificationMethod{
-		Id:                 AliceKey2,
-		Controller:         BobDID,
-		Type:               Ed25519VerificationKey2020,
-		PublicKeyMultibase: "z" + base58.Encode(BpubKey),
+		// check
+		Expect(err).To(Not(BeNil()))
+		Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
 	})
 
-	aliceKeys := map[string]ed25519.PrivateKey{AliceKey1: AprivKey, BobKey1: BprivKey}
-	bobKeys := map[string]ed25519.PrivateKey{BobKey1: BprivKey}
-	_, _ = setup.SendCreateDid(bobDid, bobKeys)
-	_, _ = setup.SendCreateDid(aliceDid, aliceKeys)
-
-	updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-	updatedDidDoc.VerificationMethod = []*types.VerificationMethod{aliceDid.VerificationMethod[0]}
-	updatedDidDoc.Authentication = []string{aliceDid.Authentication[0]}
-	_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
+	It("should not fails while removing the whole verification method", func() {
+		aliceDid.Authentication = append(aliceDid.Authentication, AliceKey2)
 
-	// check
-	require.Error(t, err)
-	require.Equal(t, fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID), err.Error())
-}
+		// Send dids
+		_, _ = setup.SendCreateDid(bobDid, bobKeys)
+		_, _ = setup.SendCreateDid(aliceDid, aliceKeys)
 
-func TestDIDDocVerificationMethodDeleted(t *testing.T) {
-	setup := Setup()
+		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
+		updatedDidDoc.Authentication = []string{aliceDid.Authentication[0]}
+		updatedDidDoc.VerificationMethod = []*types.VerificationMethod{aliceDid.VerificationMethod[0]}
+		receivedDid, _ := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(ConcatKeys(aliceKeys, bobKeys)))
 
-	ApubKey, AprivKey, _ := ed25519.GenerateKey(rand.Reader)
-	BpubKey, BprivKey, _ := ed25519.GenerateKey(rand.Reader)
+			// check
+		Expect(len(aliceDid.VerificationMethod)).To(Not(Equal(len(receivedDid.VerificationMethod))))
+		Expect(reflect.DeepEqual(aliceDid.VerificationMethod[0], receivedDid.VerificationMethod[0])).To(BeTrue())
 
-	aliceDid := setup.CreateDid(ApubKey, AliceDID)
-	bobDid := setup.CreateDid(BpubKey, BobDID)
-
-	aliceDid.Authentication = append(aliceDid.Authentication, AliceKey2)
-	aliceDid.VerificationMethod = append(aliceDid.VerificationMethod, &types.VerificationMethod{
-		Id:                 AliceKey2,
-		Controller:         BobDID,
-		Type:               Ed25519VerificationKey2020,
-		PublicKeyMultibase: "z" + base58.Encode(BpubKey),
 	})
-
-	aliceKeys := map[string]ed25519.PrivateKey{AliceKey1: AprivKey, BobKey1: BprivKey}
-	bobKeys := map[string]ed25519.PrivateKey{BobKey1: BprivKey}
-	_, _ = setup.SendCreateDid(bobDid, bobKeys)
-	_, _ = setup.SendCreateDid(aliceDid, aliceKeys)
-
-	updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-	updatedDidDoc.Authentication = []string{aliceDid.Authentication[0]}
-	updatedDidDoc.VerificationMethod = []*types.VerificationMethod{aliceDid.VerificationMethod[0]}
-	receivedDid, _ := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(ConcatKeys(aliceKeys, bobKeys)))
-
-	// check
-	require.NotEqual(t, len(aliceDid.VerificationMethod), len(receivedDid.VerificationMethod))
-	require.True(t, reflect.DeepEqual(aliceDid.VerificationMethod[0], receivedDid.VerificationMethod[0]))
-}
+})

From 5dba69deee662d63a265646bf4d02349abc89da1 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Thu, 6 Oct 2022 20:28:38 +0300
Subject: [PATCH 14/76] Add Signature verification and Create DID tests

Signed-off-by: Andrew Nikitin <andrew.nikitin@cheqd.io>
---
 x/cheqd/tests/create_did_test.go             | 740 ++++++++++---------
 x/cheqd/tests/signature_verification_test.go |   3 +-
 x/cheqd/tests/utils.go                       |   8 +-
 3 files changed, 383 insertions(+), 368 deletions(-)

diff --git a/x/cheqd/tests/create_did_test.go b/x/cheqd/tests/create_did_test.go
index 32b510d17..bf7c5a383 100644
--- a/x/cheqd/tests/create_did_test.go
+++ b/x/cheqd/tests/create_did_test.go
@@ -1,403 +1,419 @@
-package tests
+package tests_test
 
 import (
 	"crypto/ed25519"
 	"fmt"
-	"testing"
+	// "testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	. "github.com/cheqd/cheqd-node/x/cheqd/tests"
 
 	"github.com/btcsuite/btcutil/base58"
 
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
 	"github.com/multiformats/go-multibase"
 
-	"github.com/stretchr/testify/require"
+	// "github.com/stretchr/testify/require"
 )
 
-func TestCreateDID(t *testing.T) {
+var _ = Describe("Create DID tests", func() {
+	// params for cases
+	var valid bool
+	var keys map[string]KeyPair
+	var signers []string
+	var msg *types.MsgCreateDidPayload
+	var errMsg = ""
+
+	var setup TestSetup
 	var err error
-	keys := GenerateTestKeys()
-	cases := []struct {
-		valid   bool
-		name    string
-		keys    map[string]KeyPair
-		signers []string
-		msg     *types.MsgCreateDidPayload
-		errMsg  string
-	}{
-		{
-			valid: true,
-			name:  "Valid: Works",
-			keys: map[string]KeyPair{
-				ImposterKey1: GenerateKeyPair(),
-			},
-			signers: []string{ImposterKey1},
-			msg: &types.MsgCreateDidPayload{
-				Id:             ImposterDID,
-				Authentication: []string{ImposterKey1},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         ImposterKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: ImposterDID,
-					},
+	var mainKeys = GenerateTestKeys()
+
+	BeforeEach(func() {
+		// setup
+		valid = false
+		keys = map[string]KeyPair{}
+		signers = []string{}
+		msg = &types.MsgCreateDidPayload{}
+		errMsg = ""
+	})
+
+	AfterEach(func() {
+		
+		setup = InitEnv(mainKeys)
+
+		for _, vm := range msg.VerificationMethod {
+			if vm.PublicKeyMultibase == "" {
+				vm.PublicKeyMultibase, err = multibase.Encode(multibase.Base58BTC, keys[vm.Id].PublicKey)
+			}
+			Expect(err).To(BeNil())
+		}
+
+		signerKeys := map[string]ed25519.PrivateKey{}
+		for _, signer := range signers {
+			signerKeys[signer] = keys[signer].PrivateKey
+		}
+
+		did, err := setup.SendCreateDid(msg, signerKeys)
+
+		if valid {
+			Expect(err).To(BeNil())
+			Expect(msg.Id).To(Equal(did.Id))
+			Expect(msg.Controller).To(Equal(did.Controller))
+			Expect(msg.VerificationMethod).To(Equal(did.VerificationMethod))
+			Expect(msg.Authentication).To(Equal(did.Authentication))
+			Expect(msg.AssertionMethod).To(Equal(did.AssertionMethod))
+			Expect(msg.CapabilityInvocation).To(Equal(did.CapabilityInvocation))
+			Expect(msg.CapabilityDelegation).To(Equal(did.CapabilityDelegation))
+			Expect(msg.KeyAgreement).To(Equal(did.KeyAgreement))
+			Expect(msg.AlsoKnownAs).To(Equal(did.AlsoKnownAs))
+			Expect(msg.Service).To(Equal(did.Service))
+			Expect(msg.Context).To(Equal(did.Context))
+		} else {
+			Expect(err).To(HaveOccurred())
+			Expect(errMsg).To(Equal(err.Error()))
+		}
+	})
+
+	It("Valid: Works", func() {
+		valid = true
+		keys = map[string]KeyPair{
+			ImposterKey1: GenerateKeyPair(),
+		}
+		signers = []string{ImposterKey1}
+		msg = &types.MsgCreateDidPayload{
+			Id:             ImposterDID,
+			Authentication: []string{ImposterKey1},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         ImposterKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: ImposterDID,
 				},
 			},
-		},
-		{
-			valid: true,
-			name:  "Valid: Works with Key Agreement",
-			keys: map[string]KeyPair{
-				ImposterKey1: GenerateKeyPair(),
-				AliceKey1:    keys[AliceKey1],
-			},
-			signers: []string{ImposterKey1, AliceKey1},
-			msg: &types.MsgCreateDidPayload{
-				Id:           ImposterDID,
-				KeyAgreement: []string{ImposterKey1},
-				Controller:   []string{AliceDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         ImposterKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: ImposterDID,
-					},
+		}
+	})
+
+	It("Valid: Works with Key Agreement", func() {
+		valid = true
+		keys = map[string]KeyPair{
+			ImposterKey1: GenerateKeyPair(),
+			AliceKey1:    mainKeys[AliceKey1],
+		}
+		signers = []string{ImposterKey1, AliceKey1}
+		msg = &types.MsgCreateDidPayload{
+			Id:           ImposterDID,
+			KeyAgreement: []string{ImposterKey1},
+			Controller:   []string{AliceDID},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         ImposterKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: ImposterDID,
 				},
 			},
-		},
-		{
-			valid: true,
-			name:  "Valid: Works with Assertion Method",
-			keys: map[string]KeyPair{
-				ImposterKey1: GenerateKeyPair(),
-				AliceKey1:    keys[AliceKey1],
-			},
-			signers: []string{AliceKey1, ImposterKey1},
-			msg: &types.MsgCreateDidPayload{
-				Id:              ImposterDID,
-				AssertionMethod: []string{ImposterKey1},
-				Controller:      []string{AliceDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         ImposterKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: ImposterDID,
-					},
+		}
+	})
+
+	It("Valid: Works with Assertion Method", func() {
+		valid = true
+		keys = map[string]KeyPair{
+			ImposterKey1: GenerateKeyPair(),
+			AliceKey1:    mainKeys[AliceKey1],
+		}
+		signers = []string{AliceKey1, ImposterKey1}
+		msg = &types.MsgCreateDidPayload{
+			Id:              ImposterDID,
+			AssertionMethod: []string{ImposterKey1},
+			Controller:      []string{AliceDID},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         ImposterKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: ImposterDID,
 				},
 			},
-		},
-		{
-			valid: true,
-			name:  "Valid: Works with Capability Delegation",
-			keys: map[string]KeyPair{
-				ImposterKey1: GenerateKeyPair(),
-				AliceKey1:    keys[AliceKey1],
-			},
-			signers: []string{AliceKey1, ImposterKey1},
-			msg: &types.MsgCreateDidPayload{
-				Id:                   ImposterDID,
-				CapabilityDelegation: []string{ImposterKey1},
-				Controller:           []string{AliceDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         ImposterKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: ImposterDID,
-					},
+		}
+	})
+
+	It("Valid: Works with Capability Delegation", func() {
+		valid = true
+		keys = map[string]KeyPair{
+			ImposterKey1: GenerateKeyPair(),
+			AliceKey1:    mainKeys[AliceKey1],
+		}
+		signers = []string{AliceKey1, ImposterKey1}
+		msg = &types.MsgCreateDidPayload{
+			Id:                   ImposterDID,
+			CapabilityDelegation: []string{ImposterKey1},
+			Controller:           []string{AliceDID},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         ImposterKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: ImposterDID,
 				},
 			},
-		},
-		{
-			valid: true,
-			name:  "Valid: Works with Capability Invocation",
-			keys: map[string]KeyPair{
-				ImposterKey1: GenerateKeyPair(),
-				AliceKey1:    keys[AliceKey1],
-			},
-			signers: []string{AliceKey1, ImposterKey1},
-			msg: &types.MsgCreateDidPayload{
-				Id:                   ImposterDID,
-				CapabilityInvocation: []string{ImposterKey1},
-				Controller:           []string{AliceDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         ImposterKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: ImposterDID,
-					},
+		}
+	})
+
+	It("Valid: Works with Capability Invocation", func() {
+		valid = true
+		keys = map[string]KeyPair{
+			ImposterKey1: GenerateKeyPair(),
+			AliceKey1:    mainKeys[AliceKey1],
+		}
+		signers = []string{AliceKey1, ImposterKey1}
+		msg= &types.MsgCreateDidPayload{
+			Id:                   ImposterDID,
+			CapabilityInvocation: []string{ImposterKey1},
+			Controller:           []string{AliceDID},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         ImposterKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: ImposterDID,
 				},
 			},
-		},
-		{
-			valid: true,
-			name:  "Valid: With controller works",
-			msg: &types.MsgCreateDidPayload{
-				Id:         ImposterDID,
-				Controller: []string{AliceDID, BobDID},
-			},
-			signers: []string{AliceKey1, BobKey3},
-			keys: map[string]KeyPair{
-				AliceKey1: keys[AliceKey1],
-				BobKey3:   keys[BobKey3],
-			},
-		},
-		{
-			valid: true,
-			name:  "Valid: Full message works",
-			keys: map[string]KeyPair{
-				"did:cheqd:test:yyyyyyyyyyyyyyyy#key-1": GenerateKeyPair(),
-				"did:cheqd:test:yyyyyyyyyyyyyyyy#key-2": GenerateKeyPair(),
-				"did:cheqd:test:yyyyyyyyyyyyyyyy#key-3": GenerateKeyPair(),
-				"did:cheqd:test:yyyyyyyyyyyyyyyy#key-4": GenerateKeyPair(),
-				"did:cheqd:test:yyyyyyyyyyyyyyyy#key-5": GenerateKeyPair(),
-				AliceKey1:                               keys[AliceKey1],
-				BobKey1:                                 keys[BobKey1],
-				BobKey2:                                 keys[BobKey2],
-				BobKey3:                                 keys[BobKey3],
-				CharlieKey1:                             keys[CharlieKey1],
-				CharlieKey2:                             keys[CharlieKey2],
-				CharlieKey3:                             keys[CharlieKey3],
-			},
-			signers: []string{
+		}
+	})
+
+	It("Valid: With controller works", func() {
+		valid = true
+		msg = &types.MsgCreateDidPayload{
+			Id:         ImposterDID,
+			Controller: []string{AliceDID, BobDID},
+		}
+		signers = []string{AliceKey1, BobKey3}
+		keys = map[string]KeyPair{
+			AliceKey1: mainKeys[AliceKey1],
+			BobKey3:   mainKeys[BobKey3],
+		}
+	})
+
+	It("Valid: Full message works", func() {
+		valid = true
+		keys = map[string]KeyPair{
+			"did:cheqd:test:yyyyyyyyyyyyyyyy#key-1": GenerateKeyPair(),
+			"did:cheqd:test:yyyyyyyyyyyyyyyy#key-2": GenerateKeyPair(),
+			"did:cheqd:test:yyyyyyyyyyyyyyyy#key-3": GenerateKeyPair(),
+			"did:cheqd:test:yyyyyyyyyyyyyyyy#key-4": GenerateKeyPair(),
+			"did:cheqd:test:yyyyyyyyyyyyyyyy#key-5": GenerateKeyPair(),
+			AliceKey1:                               mainKeys[AliceKey1],
+			BobKey1:                                 mainKeys[BobKey1],
+			BobKey2:                                 mainKeys[BobKey2],
+			BobKey3:                                 mainKeys[BobKey3],
+			CharlieKey1:                             mainKeys[CharlieKey1],
+			CharlieKey2:                             mainKeys[CharlieKey2],
+			CharlieKey3:                             mainKeys[CharlieKey3],
+		}
+		signers = []string{
+			"did:cheqd:test:yyyyyyyyyyyyyyyy#key-1",
+			"did:cheqd:test:yyyyyyyyyyyyyyyy#key-5",
+			AliceKey1,
+			BobKey1,
+			BobKey2,
+			BobKey3,
+			CharlieKey1,
+			CharlieKey2,
+			CharlieKey3,
+		}
+		msg = &types.MsgCreateDidPayload{
+			Id: "did:cheqd:test:yyyyyyyyyyyyyyyy",
+			Authentication: []string{
 				"did:cheqd:test:yyyyyyyyyyyyyyyy#key-1",
 				"did:cheqd:test:yyyyyyyyyyyyyyyy#key-5",
-				AliceKey1,
-				BobKey1,
-				BobKey2,
-				BobKey3,
-				CharlieKey1,
-				CharlieKey2,
-				CharlieKey3,
 			},
-			msg: &types.MsgCreateDidPayload{
-				Id: "did:cheqd:test:yyyyyyyyyyyyyyyy",
-				Authentication: []string{
-					"did:cheqd:test:yyyyyyyyyyyyyyyy#key-1",
-					"did:cheqd:test:yyyyyyyyyyyyyyyy#key-5",
-				},
-				Context:              []string{"abc", "de"},
-				CapabilityInvocation: []string{"did:cheqd:test:yyyyyyyyyyyyyyyy#key-2"},
-				CapabilityDelegation: []string{"did:cheqd:test:yyyyyyyyyyyyyyyy#key-3"},
-				KeyAgreement:         []string{"did:cheqd:test:yyyyyyyyyyyyyyyy#key-4"},
-				AlsoKnownAs:          []string{"SomeUri"},
-				Service: []*types.Service{
-					{
-						Id:              "did:cheqd:test:yyyyyyyyyyyyyyyy#service-1",
-						Type:            "DIDCommMessaging",
-						ServiceEndpoint: "ServiceEndpoint",
-					},
+			Context:              []string{"abc", "de"},
+			CapabilityInvocation: []string{"did:cheqd:test:yyyyyyyyyyyyyyyy#key-2"},
+			CapabilityDelegation: []string{"did:cheqd:test:yyyyyyyyyyyyyyyy#key-3"},
+			KeyAgreement:         []string{"did:cheqd:test:yyyyyyyyyyyyyyyy#key-4"},
+			AlsoKnownAs:          []string{"SomeUri"},
+			Service: []*types.Service{
+				{
+					Id:              "did:cheqd:test:yyyyyyyyyyyyyyyy#service-1",
+					Type:            "DIDCommMessaging",
+					ServiceEndpoint: "ServiceEndpoint",
 				},
-				Controller: []string{"did:cheqd:test:yyyyyyyyyyyyyyyy", AliceDID, BobDID, CharlieDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-1",
-						Type:       Ed25519VerificationKey2020,
-						Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
-					},
-					{
-						Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-2",
-						Type:       Ed25519VerificationKey2020,
-						Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
-					},
-					{
-						Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-3",
-						Type:       Ed25519VerificationKey2020,
-						Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
-					},
-					{
-						Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-4",
-						Type:       "Ed25519VerificationKey2020",
-						Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
-					},
-					{
-						Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-5",
-						Type:       "Ed25519VerificationKey2020",
-						Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
-					},
-				},
-			},
-		},
-		{
-			valid: false,
-			name:  "Not Valid: Second controller did not sign request",
-			msg: &types.MsgCreateDidPayload{
-				Id:         ImposterDID,
-				Controller: []string{AliceDID, BobDID},
-			},
-			signers: []string{AliceKey1},
-			keys: map[string]KeyPair{
-				AliceKey1: keys[AliceKey1],
 			},
-			errMsg: fmt.Sprintf("signer: %s: signature is required but not found", BobDID),
-		},
-		{
-			valid: false,
-			name:  "Not Valid: No signature",
-			msg: &types.MsgCreateDidPayload{
-				Id:         ImposterDID,
-				Controller: []string{AliceDID, BobDID},
-			},
-			errMsg: fmt.Sprintf("signer: %s: signature is required but not found", AliceDID),
-		},
-		{
-			valid: false,
-			name:  "Not Valid: Controller not found",
-			msg: &types.MsgCreateDidPayload{
-				Id:         ImposterDID,
-				Controller: []string{AliceDID, NotFounDID},
-			},
-			signers: []string{AliceKey1, ImposterKey1},
-			keys: map[string]KeyPair{
-				AliceKey1:    keys[AliceKey1],
-				ImposterKey1: GenerateKeyPair(),
-			},
-			errMsg: fmt.Sprintf("%s: DID Doc not found", NotFounDID),
-		},
-		{
-			valid: false,
-			name:  "Not Valid: Wrong signature",
-			msg: &types.MsgCreateDidPayload{
-				Id:         ImposterDID,
-				Controller: []string{AliceDID},
-			},
-			signers: []string{AliceKey1},
-			keys: map[string]KeyPair{
-				AliceKey1: keys[BobKey1],
-			},
-			errMsg: fmt.Sprintf("method id: %s: invalid signature detected", AliceKey1),
-		},
-		{
-			valid: false,
-			name:  "Not Valid: DID signed by wrong controller",
-			msg: &types.MsgCreateDidPayload{
-				Id:             ImposterDID,
-				Authentication: []string{ImposterKey1},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:                 ImposterKey1,
-						Type:               Ed25519VerificationKey2020,
-						Controller:         ImposterDID,
-						PublicKeyMultibase: "z" + base58.Encode(keys[ImposterKey1].PublicKey),
-					},
+			Controller: []string{"did:cheqd:test:yyyyyyyyyyyyyyyy", AliceDID, BobDID, CharlieDID},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-1",
+					Type:       Ed25519VerificationKey2020,
+					Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
 				},
-			},
-			signers: []string{AliceKey1},
-			keys: map[string]KeyPair{
-				AliceKey1: keys[AliceKey1],
-			},
-			errMsg: fmt.Sprintf("signer: %s: signature is required but not found", ImposterDID),
-		},
-		{
-			valid: false,
-			name:  "Not Valid: DID self-signed by not existing verification method",
-			msg: &types.MsgCreateDidPayload{
-				Id:             ImposterDID,
-				Authentication: []string{ImposterKey1},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:                 ImposterKey1,
-						Type:               Ed25519VerificationKey2020,
-						Controller:         ImposterDID,
-						PublicKeyMultibase: "z" + base58.Encode(keys[ImposterKey1].PublicKey),
-					},
+				{
+					Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-2",
+					Type:       Ed25519VerificationKey2020,
+					Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
 				},
-			},
-			signers: []string{ImposterKey2},
-			keys: map[string]KeyPair{
-				ImposterKey2: GenerateKeyPair(),
-			},
-			errMsg: fmt.Sprintf("%s: verification method not found", ImposterKey2),
-		},
-		{
-			valid: false,
-			name:  "Not Valid: Self-signature not found",
-			msg: &types.MsgCreateDidPayload{
-				Id:             ImposterDID,
-				Controller:     []string{AliceDID, ImposterDID},
-				Authentication: []string{ImposterKey1},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:                 ImposterKey1,
-						Type:               Ed25519VerificationKey2020,
-						Controller:         ImposterDID,
-						PublicKeyMultibase: "z" + base58.Encode(keys[ImposterKey1].PublicKey),
-					},
+				{
+					Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-3",
+					Type:       Ed25519VerificationKey2020,
+					Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
 				},
-			},
-			signers: []string{AliceKey1, ImposterKey2},
-			keys: map[string]KeyPair{
-				AliceKey1:    keys[AliceKey1],
-				ImposterKey2: GenerateKeyPair(),
-			},
-			errMsg: fmt.Sprintf("%s: verification method not found", ImposterKey2),
-		},
-		{
-			valid: false,
-			name:  "Not Valid: DID Doc already exists",
-			keys: map[string]KeyPair{
-				CharlieKey1: GenerateKeyPair(),
-			},
-			signers: []string{CharlieKey1},
-			msg: &types.MsgCreateDidPayload{
-				Id:             CharlieDID,
-				Authentication: []string{CharlieKey1},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         CharlieKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: CharlieDID,
-					},
+				{
+					Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-4",
+					Type:       "Ed25519VerificationKey2020",
+					Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
+				},
+				{
+					Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-5",
+					Type:       "Ed25519VerificationKey2020",
+					Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
 				},
 			},
-			errMsg: fmt.Sprintf("%s: DID Doc exists", CharlieDID),
-		},
-	}
+		}
+	})
 
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			msg := tc.msg
-			setup := InitEnv(t, keys)
+// ************************** 
+// ***** Negative cases *****
+// **************************
 
-			for _, vm := range msg.VerificationMethod {
-				if vm.PublicKeyMultibase == "" {
-					vm.PublicKeyMultibase, err = multibase.Encode(multibase.Base58BTC, tc.keys[vm.Id].PublicKey)
-				}
-				require.NoError(t, err)
-			}
+	It("Not Valid: Second controller did not sign request", func() {
+		valid = false
+		msg = &types.MsgCreateDidPayload{
+			Id:         ImposterDID,
+			Controller: []string{AliceDID, BobDID},
+		}
+		signers = []string{AliceKey1}
+		keys = map[string]KeyPair{
+			AliceKey1: mainKeys[AliceKey1],
+		}
+		errMsg = fmt.Sprintf("signer: %s: signature is required but not found", BobDID)
+	})
 
-			signerKeys := map[string]ed25519.PrivateKey{}
-			for _, signer := range tc.signers {
-				signerKeys[signer] = tc.keys[signer].PrivateKey
-			}
+	It("Not Valid: No signature", func(){
+		valid = false
+		msg = &types.MsgCreateDidPayload{
+			Id:         ImposterDID,
+			Controller: []string{AliceDID, BobDID},
+		}
+		errMsg = fmt.Sprintf("signer: %s: signature is required but not found", AliceDID)
+	})
+	
+	It("Not Valid: Controller not found", func(){
+		valid = false
+		msg = &types.MsgCreateDidPayload{
+			Id:         ImposterDID,
+			Controller: []string{AliceDID, NotFounDID},
+		}
+		signers = []string{AliceKey1, ImposterKey1}
+		keys = map[string]KeyPair{
+			AliceKey1:    mainKeys[AliceKey1],
+			ImposterKey1: GenerateKeyPair(),
+		}
+		errMsg = fmt.Sprintf("%s: DID Doc not found", NotFounDID)	
+	})
 
-			did, err := setup.SendCreateDid(msg, signerKeys)
+	It("Not Valid: Wrong signature", func(){
+		valid = false
+		msg = &types.MsgCreateDidPayload{
+			Id:         ImposterDID,
+			Controller: []string{AliceDID},
+		}
+		signers = []string{AliceKey1}
+		keys = map[string]KeyPair{
+			AliceKey1: mainKeys[BobKey1],
+		}
+		errMsg = fmt.Sprintf("method id: %s: invalid signature detected", AliceKey1)
+	})
 
-			if tc.valid {
-				require.Nil(t, err)
-				require.Equal(t, tc.msg.Id, did.Id)
-				require.Equal(t, tc.msg.Controller, did.Controller)
-				require.Equal(t, tc.msg.VerificationMethod, did.VerificationMethod)
-				require.Equal(t, tc.msg.Authentication, did.Authentication)
-				require.Equal(t, tc.msg.AssertionMethod, did.AssertionMethod)
-				require.Equal(t, tc.msg.CapabilityInvocation, did.CapabilityInvocation)
-				require.Equal(t, tc.msg.CapabilityDelegation, did.CapabilityDelegation)
-				require.Equal(t, tc.msg.KeyAgreement, did.KeyAgreement)
-				require.Equal(t, tc.msg.AlsoKnownAs, did.AlsoKnownAs)
-				require.Equal(t, tc.msg.Service, did.Service)
-				require.Equal(t, tc.msg.Context, did.Context)
-			} else {
-				require.Error(t, err)
-				require.Equal(t, tc.errMsg, err.Error())
-			}
-		})
-	}
-}
+	It("Not Valid: DID signed by wrong controller", func(){
+		valid =false
+		msg = &types.MsgCreateDidPayload{
+			Id:             ImposterDID,
+			Authentication: []string{ImposterKey1},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:                 ImposterKey1,
+					Type:               Ed25519VerificationKey2020,
+					Controller:         ImposterDID,
+					PublicKeyMultibase: "z" + base58.Encode(mainKeys[ImposterKey1].PublicKey),
+				},
+			},
+		}
+		signers = []string{AliceKey1}
+		keys = map[string]KeyPair{
+			AliceKey1: mainKeys[AliceKey1],
+		}
+		errMsg = fmt.Sprintf("signer: %s: signature is required but not found", ImposterDID)
+	})
+
+	It("Not Valid: DID self-signed by not existing verification method", func(){
+		valid = false
+		msg = &types.MsgCreateDidPayload{
+			Id:             ImposterDID,
+			Authentication: []string{ImposterKey1},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:                 ImposterKey1,
+					Type:               Ed25519VerificationKey2020,
+					Controller:         ImposterDID,
+					PublicKeyMultibase: "z" + base58.Encode(mainKeys[ImposterKey1].PublicKey),
+				},
+			},
+		}
+		signers = []string{ImposterKey2}
+		keys = map[string]KeyPair{
+			ImposterKey2: GenerateKeyPair(),
+		}
+		errMsg = fmt.Sprintf("%s: verification method not found", ImposterKey2)
+	})
+
+	It("Not Valid: Self-signature not found", func(){
+		valid = false
+		msg = &types.MsgCreateDidPayload{
+			Id:             ImposterDID,
+			Controller:     []string{AliceDID, ImposterDID},
+			Authentication: []string{ImposterKey1},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:                 ImposterKey1,
+					Type:               Ed25519VerificationKey2020,
+					Controller:         ImposterDID,
+					PublicKeyMultibase: "z" + base58.Encode(mainKeys[ImposterKey1].PublicKey),
+				},
+			},
+		}
+		signers = []string{AliceKey1, ImposterKey2}
+		keys = map[string]KeyPair{
+			AliceKey1:    mainKeys[AliceKey1],
+			ImposterKey2: GenerateKeyPair(),
+		}
+		errMsg = fmt.Sprintf("%s: verification method not found", ImposterKey2)
+	})
+
+	It("Not Valid: DID Doc already exists", func(){
+		valid = false
+		keys = map[string]KeyPair{
+			CharlieKey1: GenerateKeyPair(),
+		}
+		signers = []string{CharlieKey1}
+		msg = &types.MsgCreateDidPayload{
+			Id:             CharlieDID,
+			Authentication: []string{CharlieKey1},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         CharlieKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: CharlieDID,
+				},
+			},
+		}
+		errMsg = fmt.Sprintf("%s: DID Doc exists", CharlieDID)
+	})
+})
 
-func TestHandler_DidDocAlreadyExists(t *testing.T) {
-	setup := Setup()
+var _ = Describe("TestHandler", func() {
+	It("Fails cause DIDDoc is already exists", func() {
+		setup := Setup()
 
-	_, _, _ = setup.InitDid(AliceDID)
-	_, _, err := setup.InitDid(AliceDID)
+		_, _, _ = setup.InitDid(AliceDID)
+		_, _, err := setup.InitDid(AliceDID)
 
-	require.Error(t, err)
-	require.Equal(t, fmt.Sprintf("%s: DID Doc exists", AliceDID), err.Error())
-}
+		Expect(err).To(HaveOccurred())
+		Expect(err.Error()).To(Equal(fmt.Sprintf("%s: DID Doc exists", AliceDID)))
+	})
+})
diff --git a/x/cheqd/tests/signature_verification_test.go b/x/cheqd/tests/signature_verification_test.go
index ab371ac7c..9a8b53804 100644
--- a/x/cheqd/tests/signature_verification_test.go
+++ b/x/cheqd/tests/signature_verification_test.go
@@ -1,4 +1,4 @@
-package tests
+package tests_test
 
 import (
 	"crypto/ed25519"
@@ -8,6 +8,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	. "github.com/cheqd/cheqd-node/x/cheqd/tests"
 
 	"github.com/btcsuite/btcutil/base58"
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
diff --git a/x/cheqd/tests/utils.go b/x/cheqd/tests/utils.go
index 5ba9b0b97..ac0a3ef88 100644
--- a/x/cheqd/tests/utils.go
+++ b/x/cheqd/tests/utils.go
@@ -2,9 +2,7 @@ package tests
 
 import (
 	"math/rand"
-	"testing"
-
-	"github.com/stretchr/testify/require"
+	. "github.com/onsi/gomega"
 )
 
 var letters = []rune("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz")
@@ -40,9 +38,9 @@ func GenerateTestKeys() map[string]KeyPair {
 	}
 }
 
-func InitEnv(t *testing.T, keys map[string]KeyPair) TestSetup {
+func InitEnv(keys map[string]KeyPair) TestSetup {
 	setup := Setup()
 	err := setup.CreateTestDIDs(keys)
-	require.NoError(t, err)
+	Expect(err).To(BeNil())
 	return setup
 }

From c4a0762ef7ac5b2f4007b9242e64739976e370fe Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Fri, 7 Oct 2022 11:44:11 +0300
Subject: [PATCH 15/76] Add tests for UpdateDid

---
 x/cheqd/tests/create_did_test.go             |   6 +-
 x/cheqd/tests/signature_verification_test.go |   3 +-
 x/cheqd/tests/tests_suite_test.go            |  14 +
 x/cheqd/tests/update_did_test.go             | 863 ++++++++++---------
 4 files changed, 451 insertions(+), 435 deletions(-)
 create mode 100644 x/cheqd/tests/tests_suite_test.go

diff --git a/x/cheqd/tests/create_did_test.go b/x/cheqd/tests/create_did_test.go
index bf7c5a383..f4484fd6d 100644
--- a/x/cheqd/tests/create_did_test.go
+++ b/x/cheqd/tests/create_did_test.go
@@ -1,20 +1,16 @@
-package tests_test
+package tests
 
 import (
 	"crypto/ed25519"
 	"fmt"
-	// "testing"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	. "github.com/cheqd/cheqd-node/x/cheqd/tests"
 
 	"github.com/btcsuite/btcutil/base58"
 
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
 	"github.com/multiformats/go-multibase"
-
-	// "github.com/stretchr/testify/require"
 )
 
 var _ = Describe("Create DID tests", func() {
diff --git a/x/cheqd/tests/signature_verification_test.go b/x/cheqd/tests/signature_verification_test.go
index 9a8b53804..ab371ac7c 100644
--- a/x/cheqd/tests/signature_verification_test.go
+++ b/x/cheqd/tests/signature_verification_test.go
@@ -1,4 +1,4 @@
-package tests_test
+package tests
 
 import (
 	"crypto/ed25519"
@@ -8,7 +8,6 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	. "github.com/cheqd/cheqd-node/x/cheqd/tests"
 
 	"github.com/btcsuite/btcutil/base58"
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
diff --git a/x/cheqd/tests/tests_suite_test.go b/x/cheqd/tests/tests_suite_test.go
new file mode 100644
index 000000000..cd8579e57
--- /dev/null
+++ b/x/cheqd/tests/tests_suite_test.go
@@ -0,0 +1,14 @@
+package tests_test
+
+import (
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+func TestTestsGeneral(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "General Tests Suite")
+}
+
diff --git a/x/cheqd/tests/update_did_test.go b/x/cheqd/tests/update_did_test.go
index e4371f6c7..7ff264203 100644
--- a/x/cheqd/tests/update_did_test.go
+++ b/x/cheqd/tests/update_did_test.go
@@ -2,482 +2,489 @@ package tests
 
 import (
 	"fmt"
-	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 
 	"github.com/btcsuite/btcutil/base58"
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
 	"github.com/multiformats/go-multibase"
-	"github.com/stretchr/testify/require"
 )
 
-func TestUpdateDid(t *testing.T) {
+var _ = Describe("Update DID tests", func() {
+	// params for cases
+	var valid bool
+	var signers []string
+	var signerKeys []SignerKey
+	var msg *types.MsgUpdateDidPayload
+	var errMsg = ""
+
+	var setup TestSetup
 	var err error
-	keys := map[string]KeyPair{
-		AliceKey1:    GenerateKeyPair(),
-		AliceKey2:    GenerateKeyPair(),
-		BobKey1:      GenerateKeyPair(),
-		BobKey2:      GenerateKeyPair(),
-		BobKey3:      GenerateKeyPair(),
-		BobKey4:      GenerateKeyPair(),
-		CharlieKey1:  GenerateKeyPair(),
-		CharlieKey2:  GenerateKeyPair(),
-		CharlieKey3:  GenerateKeyPair(),
-		CharlieKey4:  GenerateKeyPair(),
-		ImposterKey1: GenerateKeyPair(),
-	}
-
-	cases := []struct {
-		valid      bool
-		name       string
-		signerKeys []SignerKey
-		signers    []string
-		msg        *types.MsgUpdateDidPayload
-		errMsg     string
-	}{
-		{
-			valid: true,
-			name:  "Valid: Key rotation works",
-			signerKeys: []SignerKey{
+	var mainKeys = map[string]KeyPair{
+				AliceKey1:    GenerateKeyPair(),
+				AliceKey2:    GenerateKeyPair(),
+				BobKey1:      GenerateKeyPair(),
+				BobKey2:      GenerateKeyPair(),
+				BobKey3:      GenerateKeyPair(),
+				BobKey4:      GenerateKeyPair(),
+				CharlieKey1:  GenerateKeyPair(),
+				CharlieKey2:  GenerateKeyPair(),
+				CharlieKey3:  GenerateKeyPair(),
+				CharlieKey4:  GenerateKeyPair(),
+				ImposterKey1: GenerateKeyPair(),
+			}
+
+	BeforeEach(func() {
+		// setup
+		valid = false
+		signers = []string{}
+		signerKeys = []SignerKey{}
+		msg = &types.MsgUpdateDidPayload{}
+		errMsg = ""
+	})
+
+	AfterEach(func() {
+		
+		setup = InitEnv(mainKeys)
+		
+		for _, vm := range msg.VerificationMethod {
+			if vm.PublicKeyMultibase == "" {
+				vm.PublicKeyMultibase, err = multibase.Encode(multibase.Base58BTC, mainKeys[vm.Id].PublicKey)
+			}
+			Expect(err).To(BeNil())
+		}
+
+		compiledKeys := []SignerKey{}
+		if len(signerKeys) > 0 {
+			compiledKeys = signerKeys
+		} else {
+			for _, signer := range signers {
+				compiledKeys = append(compiledKeys, SignerKey{
+					signer: signer,
+					key:    mainKeys[signer].PrivateKey,
+				})
+			}
+		}
+
+		did, err := setup.SendUpdateDid(msg, compiledKeys)
+
+		if valid {
+			Expect(err).To(BeNil())
+			Expect(msg.Id).To(Equal(did.Id))
+			Expect(msg.Controller).To(Equal(did.Controller))
+			Expect(msg.VerificationMethod).To(Equal(did.VerificationMethod))
+			Expect(msg.Authentication).To(Equal(did.Authentication))
+			Expect(msg.AssertionMethod).To(Equal(did.AssertionMethod))
+			Expect(msg.CapabilityInvocation).To(Equal(did.CapabilityInvocation))
+			Expect(msg.CapabilityDelegation).To(Equal(did.CapabilityDelegation))
+			Expect(msg.KeyAgreement).To(Equal(did.KeyAgreement))
+			Expect(msg.AlsoKnownAs).To(Equal(did.AlsoKnownAs))
+			Expect(msg.Service).To(Equal(did.Service))
+			Expect(msg.Context).To(Equal(did.Context))
+		} else {
+			Expect(err).To(HaveOccurred())
+			Expect(errMsg).To(Equal(err.Error()))
+		}
+	})
+
+	It("Valid: Key rotation works", func() {
+		valid = true
+		signerKeys = []SignerKey{
+			{
+				signer: AliceKey1,
+				key:    mainKeys[AliceKey1].PrivateKey,
+			},
+			{
+				signer: AliceKey1,
+				key:    mainKeys[AliceKey2].PrivateKey,
+			},
+		}
+		msg = &types.MsgUpdateDidPayload{
+			Id: AliceDID,
+			VerificationMethod: []*types.VerificationMethod{
 				{
-					signer: AliceKey1,
-					key:    keys[AliceKey1].PrivateKey,
+					Id:                 AliceKey1,
+					Type:               Ed25519VerificationKey2020,
+					Controller:         AliceDID,
+					PublicKeyMultibase: "z" + base58.Encode(mainKeys[AliceKey2].PublicKey),
 				},
+			},
+		}
+	})
+
+	It("Not Valid: replacing controller and Verification method ID does not work without new sign", func() {
+		valid = false
+		signers = []string{AliceKey2, BobKey1, AliceKey1}
+		msg = &types.MsgUpdateDidPayload{
+			Id:         AliceDID,
+			Controller: []string{CharlieDID},
+			VerificationMethod: []*types.VerificationMethod{
 				{
-					signer: AliceKey1,
-					key:    keys[AliceKey2].PrivateKey,
+					Id:         AliceKey2,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
 			},
-			msg: &types.MsgUpdateDidPayload{
-				Id: AliceDID,
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:                 AliceKey1,
-						Type:               Ed25519VerificationKey2020,
-						Controller:         AliceDID,
-						PublicKeyMultibase: "z" + base58.Encode(keys[AliceKey2].PublicKey),
-					},
+		}
+		errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", CharlieDID)
+	})
+
+	It("Valid: replacing controller and Verification method ID works with all signatures", func() {
+		valid = true
+		signers = []string{AliceKey1, CharlieKey1, AliceKey2}
+		msg = &types.MsgUpdateDidPayload{
+			Id:         AliceDID,
+			Controller: []string{CharlieDID},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         AliceKey2,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
 			},
-		},
-		// VM and Controller replacing tests
-		{
-			valid:   false,
-			name:    "Not Valid: replacing controller and Verification method ID does not work without new sign",
-			signers: []string{AliceKey2, BobKey1, AliceKey1},
-			msg: &types.MsgUpdateDidPayload{
-				Id:         AliceDID,
-				Controller: []string{CharlieDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey2,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
+		}
+		errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", CharlieDID)
+	})
+
+	// Verification method's tests
+	// cases:
+	// - replacing VM controller works
+	// - replacing VM controller does not work without new signature
+	// - replacing VM controller does not work without old signature     ??????
+	// - replacing VM doesn't work without new signature
+	// - replacing VM doesn't work without old signature
+	// - replacing VM works with all signatures
+	// --- adding new VM works
+	// --- adding new VM without new signature
+	// --- adding new VM without old signature
+
+
+	It("Valid: Replacing VM controller works with one signature", func() {
+		valid = true
+		signers = []string{AliceKey1, BobKey1}
+		msg = &types.MsgUpdateDidPayload{
+			Id: AliceDID,
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         AliceKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: BobDID,
 				},
 			},
-			errMsg: fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", CharlieDID),
-		},
-		{
-			valid:   true,
-			name:    "Valid: replacing controller and Verification method ID works with all signatures",
-			signers: []string{AliceKey1, CharlieKey1, AliceKey2},
-			msg: &types.MsgUpdateDidPayload{
-				Id:         AliceDID,
-				Controller: []string{CharlieDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey2,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
+		}
+	})
+
+	It("Not Valid: Replacing VM controller does not work without new signature", func() {
+		valid =false
+		signers = []string{AliceKey1}
+		msg = &types.MsgUpdateDidPayload{
+			Id: AliceDID,
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         AliceKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: BobDID,
 				},
 			},
-			errMsg: fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", CharlieDID),
-		},
-		// Verification method's tests
-		// cases:
-		// - replacing VM controller works
-		// - replacing VM controller does not work without new signature
-		// - replacing VM controller does not work without old signature     ??????
-		// - replacing VM doesn't work without new signature
-		// - replacing VM doesn't work without old signature
-		// - replacing VM works with all signatures
-		// --- adding new VM works
-		// --- adding new VM without new signature
-		// --- adding new VM without old signature
-		{
-			valid:   true,
-			name:    "Valid: Replacing VM controller works with one signature",
-			signers: []string{AliceKey1, BobKey1},
-			msg: &types.MsgUpdateDidPayload{
-				Id: AliceDID,
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: BobDID,
-					},
+		}
+		errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)
+	})
+
+	It("Not Valid: Replacing VM does not work without new signature", func() {
+		valid = false
+		signers = []string{AliceKey1}
+		msg = &types.MsgUpdateDidPayload{
+			Id: AliceDID,
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         AliceKey2,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
 			},
-		},
-		{
-			valid:   false,
-			name:    "Not Valid: Replacing VM controller does not work without new signature",
-			signers: []string{AliceKey1},
-			msg: &types.MsgUpdateDidPayload{
-				Id: AliceDID,
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: BobDID,
-					},
+		}
+		errMsg = fmt.Sprintf("there should be at least one valid signature by %s (new version): invalid signature detected", AliceDID)
+	})
+	It("Not Valid: Replacing VM does not work without old signature", func() {
+		valid =false
+		signers = []string{AliceKey2}
+		msg = &types.MsgUpdateDidPayload{
+			Id: AliceDID,
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         AliceKey2,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
 			},
-			errMsg: fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID),
-		},
-		{
-			valid:   false,
-			name:    "Not Valid: Replacing VM does not work without new signature",
-			signers: []string{AliceKey1},
-			msg: &types.MsgUpdateDidPayload{
-				Id: AliceDID,
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey2,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
+		}
+		errMsg = fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", AliceDID)
+	})
+
+	It("Not Valid: Replacing VM works with all signatures", func() {
+		valid = true
+		signers = []string{AliceKey1, AliceKey2}
+		msg = &types.MsgUpdateDidPayload{
+			Id: AliceDID,
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         AliceKey2,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
 			},
-			errMsg: fmt.Sprintf("there should be at least one valid signature by %s (new version): invalid signature detected", AliceDID),
-		},
-		{
-			valid:   false,
-			name:    "Not Valid: Replacing VM does not work without old signature",
-			signers: []string{AliceKey2},
-			msg: &types.MsgUpdateDidPayload{
-				Id: AliceDID,
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey2,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
+		}
+	})
+
+	// Adding VM
+
+	It("Valid: Adding another verification method", func() {
+		valid = true
+		signers = []string{AliceKey1, BobKey1}
+		msg = &types.MsgUpdateDidPayload{
+			Id:         AliceDID,
+			Controller: []string{AliceDID},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         AliceKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
-			},
-			errMsg: fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", AliceDID),
-		},
-		{
-			valid:   true,
-			name:    "Not Valid: Replacing VM works with all signatures",
-			signers: []string{AliceKey1, AliceKey2},
-			msg: &types.MsgUpdateDidPayload{
-				Id: AliceDID,
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey2,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
+				{
+					Id:         AliceKey2,
+					Type:       Ed25519VerificationKey2020,
+					Controller: BobDID,
 				},
 			},
-		},
-		// Adding VM
-		{
-			valid:   true,
-			name:    "Valid: Adding another verification method",
-			signers: []string{AliceKey1, BobKey1},
-			msg: &types.MsgUpdateDidPayload{
-				Id:         AliceDID,
-				Controller: []string{AliceDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
-					{
-						Id:         AliceKey2,
-						Type:       Ed25519VerificationKey2020,
-						Controller: BobDID,
-					},
+		}
+	})
+
+	It("Not Valid: Adding another verification method without new sign", func() {
+		valid = false
+		signers = []string{AliceKey1}
+		msg = &types.MsgUpdateDidPayload{
+			Id:         AliceDID,
+			Controller: []string{AliceDID},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         AliceKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
-			},
-		},
-		{
-			valid:   false,
-			name:    "Not Valid: Adding another verification method without new sign",
-			signers: []string{AliceKey1},
-			msg: &types.MsgUpdateDidPayload{
-				Id:         AliceDID,
-				Controller: []string{AliceDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
-					{
-						Id:         AliceKey2,
-						Type:       Ed25519VerificationKey2020,
-						Controller: BobDID,
-					},
+				{
+					Id:         AliceKey2,
+					Type:       Ed25519VerificationKey2020,
+					Controller: BobDID,
 				},
 			},
-			errMsg: fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID),
-		},
-		{
-			valid:   false,
-			name:    "Not Valid: Adding another verification method without old sign",
-			signers: []string{AliceKey2},
-			msg: &types.MsgUpdateDidPayload{
-				Id:         AliceDID,
-				Controller: []string{AliceDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
-					{
-						Id:         AliceKey2,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
+		}
+		errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)
+	})
+
+	It("Not Valid: Adding another verification method without old sign", func() {
+		valid = false
+		signers = []string{AliceKey2}
+		msg = &types.MsgUpdateDidPayload{
+			Id:         AliceDID,
+			Controller: []string{AliceDID},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         AliceKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
-			},
-			errMsg: fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", AliceDID),
-		},
-
-		// Controller's tests
-		// cases:
-		// - replacing Controller works with all signatures
-		// - replacing Controller doesn't work without old signature
-		// - replacing Controller doesn't work without new signature
-		// --- adding Controller works with all signatures
-		// --- adding Controller doesn't work without old signature
-		// --- adding Controller doesn't work without new signature
-		{
-			valid:   true,
-			name:    "Valid: Replace controller works with all signatures",
-			signers: []string{BobKey1, AliceKey1},
-			msg: &types.MsgUpdateDidPayload{
-				Id:         AliceDID,
-				Controller: []string{BobDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
+				{
+					Id:         AliceKey2,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
 			},
-		},
-		{
-			valid:   false,
-			name:    "Not Valid: Replace controller doesn't work without old signatures",
-			signers: []string{BobKey1},
-			msg: &types.MsgUpdateDidPayload{
-				Id:         AliceDID,
-				Controller: []string{BobDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
+		}
+		errMsg = fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", AliceDID)
+	})
+
+	// Controller's tests
+	// cases:
+	// - replacing Controller works with all signatures
+	// - replacing Controller doesn't work without old signature
+	// - replacing Controller doesn't work without new signature
+	// --- adding Controller works with all signatures
+	// --- adding Controller doesn't work without old signature
+	// --- adding Controller doesn't work without new signature
+
+	It("Valid: Replace controller works with all signatures", func() {
+		valid = true
+		signers = []string{BobKey1, AliceKey1}
+		msg = &types.MsgUpdateDidPayload{
+			Id:         AliceDID,
+			Controller: []string{BobDID},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         AliceKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
 			},
-			errMsg: fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID),
-		},
-		{
-			valid:   false,
-			name:    "Not Valid: Replace controller doesn't work without new signatures",
-			signers: []string{AliceKey1},
-			msg: &types.MsgUpdateDidPayload{
-				Id:         AliceDID,
-				Controller: []string{BobDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
+		}
+	})
+
+	It("Not Valid: Replace controller doesn't work without old signatures", func() {
+		valid = false
+		signers = []string{BobKey1}
+		msg = &types.MsgUpdateDidPayload{
+			Id:         AliceDID,
+			Controller: []string{BobDID},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         AliceKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
 			},
-			errMsg: fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID),
-		},
-		// add Controller
-		{
-			valid:   true,
-			name:    "Valid: Adding second controller works",
-			signers: []string{AliceKey1, CharlieKey3},
-			msg: &types.MsgUpdateDidPayload{
-				Id:         AliceDID,
-				Controller: []string{AliceDID, CharlieDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
+		}
+		errMsg = fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)
+	})
+
+	It("Not Valid: Replace controller doesn't work without new signatures", func() {
+		valid = false
+		signers = []string{AliceKey1}
+		msg = &types.MsgUpdateDidPayload{
+			Id:         AliceDID,
+			Controller: []string{BobDID},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         AliceKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
 			},
-		},
-		{
-			valid:   false,
-			name:    "Not Valid: Adding controller without old signature",
-			signers: []string{BobKey1},
-			msg: &types.MsgUpdateDidPayload{
-				Id:         AliceDID,
-				Controller: []string{AliceDID, BobDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
+		}
+		errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)
+	})
+
+	// add controller
+
+	It("Valid: Adding second controller works", func() {
+		valid = true
+		signers = []string{AliceKey1, CharlieKey3}
+		msg = &types.MsgUpdateDidPayload{
+			Id:         AliceDID,
+			Controller: []string{AliceDID, CharlieDID},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         AliceKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
 			},
-			errMsg: fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID),
-		},
-		{
-			valid:   false,
-			name:    "Not Valid: Add controller without new signature doesn't work",
-			signers: []string{AliceKey1},
-			msg: &types.MsgUpdateDidPayload{
-				Id:         AliceDID,
-				Controller: []string{AliceDID, BobDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
+		}
+	})
+
+	It("Not Valid: Adding controller without old signature", func() {
+		valid = false
+		signers = []string{BobKey1}
+		msg = &types.MsgUpdateDidPayload{
+			Id:         AliceDID,
+			Controller: []string{AliceDID, BobDID},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         AliceKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
 			},
-			errMsg: fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID),
-		},
-
-		{
-			valid:   true,
-			name:    "Valid: Adding verification method with the same controller works",
-			signers: []string{AliceKey1, AliceKey2},
-			msg: &types.MsgUpdateDidPayload{
-				Id:         AliceDID,
-				Controller: []string{AliceDID},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey2,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
-					{
-						Id:         AliceKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
+		}
+		errMsg = fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)
+	})
+
+	It("Not Valid: Add controller without new signature doesn't work", func() {
+		valid = false
+		signers = []string{AliceKey1}
+		msg = &types.MsgUpdateDidPayload{
+			Id:         AliceDID,
+			Controller: []string{AliceDID, BobDID},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         AliceKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
 			},
-		},
-		{
-			valid:   true,
-			name:    "Valid: Keeping VM with controller different then subject untouched during update should not require Bob signature",
-			signers: []string{CharlieKey1},
-			msg: &types.MsgUpdateDidPayload{
-				Id: CharlieDID,
-				Authentication: []string{
-					CharlieKey1,
-					CharlieKey2,
-					CharlieKey3,
-				},
+		}
+		errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)
+	})
 
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         CharlieKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: BobDID,
-					},
-					{
-						Id:         CharlieKey2,
-						Type:       Ed25519VerificationKey2020,
-						Controller: BobDID,
-					},
-					{
-						Id:         CharlieKey3,
-						Type:       Ed25519VerificationKey2020,
-						Controller: BobDID,
-					},
-					{
-						Id:         CharlieKey4,
-						Type:       Ed25519VerificationKey2020,
-						Controller: CharlieDID,
-					},
+	It("Valid: Adding verification method with the same controller works", func() {
+		valid = true
+		signers = []string{AliceKey1, AliceKey2}
+		msg = &types.MsgUpdateDidPayload{
+			Id:         AliceDID,
+			Controller: []string{AliceDID},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         AliceKey2,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
-			},
-		},
-		{
-			valid:   true,
-			name:    "Valid: Removing verification method is possible with any kind of valid Bob's key",
-			signers: []string{BobKey1},
-			msg: &types.MsgUpdateDidPayload{
-				Id: BobDID,
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         BobKey1,
-						Type:       Ed25519VerificationKey2020,
-						Controller: BobDID,
-					},
+				{
+					Id:         AliceKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
 				},
 			},
-			errMsg: fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", BobDID),
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			setup := InitEnv(t, keys)
-			msg := tc.msg
-
-			for _, vm := range msg.VerificationMethod {
-				if vm.PublicKeyMultibase == "" {
-					vm.PublicKeyMultibase, err = multibase.Encode(multibase.Base58BTC, keys[vm.Id].PublicKey)
-				}
-				require.NoError(t, err)
-			}
+		}
+	})
 
-			signerKeys := []SignerKey{}
-			if tc.signerKeys != nil {
-				signerKeys = tc.signerKeys
-			} else {
-				for _, signer := range tc.signers {
-					signerKeys = append(signerKeys, SignerKey{
-						signer: signer,
-						key:    keys[signer].PrivateKey,
-					})
-				}
-			}
+	It("Valid: Keeping VM with controller different then subject untouched during update should not require Bob signature", func() {
+		valid = true
+		signers = []string{CharlieKey1}
+		msg = &types.MsgUpdateDidPayload{
+			Id: CharlieDID,
+			Authentication: []string{
+				CharlieKey1,
+				CharlieKey2,
+				CharlieKey3,
+			},
 
-			did, err := setup.SendUpdateDid(msg, signerKeys)
-
-			if tc.valid {
-				require.Nil(t, err)
-				require.Equal(t, tc.msg.Id, did.Id)
-				require.Equal(t, tc.msg.Controller, did.Controller)
-				require.Equal(t, tc.msg.VerificationMethod, did.VerificationMethod)
-				require.Equal(t, tc.msg.Authentication, did.Authentication)
-				require.Equal(t, tc.msg.AssertionMethod, did.AssertionMethod)
-				require.Equal(t, tc.msg.CapabilityInvocation, did.CapabilityInvocation)
-				require.Equal(t, tc.msg.CapabilityDelegation, did.CapabilityDelegation)
-				require.Equal(t, tc.msg.KeyAgreement, did.KeyAgreement)
-				require.Equal(t, tc.msg.AlsoKnownAs, did.AlsoKnownAs)
-				require.Equal(t, tc.msg.Service, did.Service)
-				require.Equal(t, tc.msg.Context, did.Context)
-			} else {
-				require.Error(t, err)
-				require.Equal(t, tc.errMsg, err.Error())
-			}
-		})
-	}
-}
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         CharlieKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: BobDID,
+				},
+				{
+					Id:         CharlieKey2,
+					Type:       Ed25519VerificationKey2020,
+					Controller: BobDID,
+				},
+				{
+					Id:         CharlieKey3,
+					Type:       Ed25519VerificationKey2020,
+					Controller: BobDID,
+				},
+				{
+					Id:         CharlieKey4,
+					Type:       Ed25519VerificationKey2020,
+					Controller: CharlieDID,
+				},
+			},
+		}		
+	})
+
+	It("Valid: Removing verification method is possible with any kind of valid Bob's key", func() {
+		valid = true
+		signers = []string{BobKey1}
+		msg = &types.MsgUpdateDidPayload{
+			Id: BobDID,
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         BobKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: BobDID,
+				},
+			},
+		}
+		errMsg = fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", BobDID)
+	})
+})

From 82feaf758abc609a359f380eb4f62c7209382f97 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Fri, 7 Oct 2022 17:50:50 +0300
Subject: [PATCH 16/76] Add tests for DID and Service validation

---
 x/cheqd/types/constant_test.go    |  51 ++++
 x/cheqd/types/did_did_test.go     | 406 +++++++++++++++---------------
 x/cheqd/types/did_service_test.go | 118 ++++-----
 x/cheqd/types/types_test.go       |  12 +
 4 files changed, 325 insertions(+), 262 deletions(-)
 create mode 100644 x/cheqd/types/constant_test.go
 create mode 100644 x/cheqd/types/types_test.go

diff --git a/x/cheqd/types/constant_test.go b/x/cheqd/types/constant_test.go
new file mode 100644
index 000000000..66aa6ec66
--- /dev/null
+++ b/x/cheqd/types/constant_test.go
@@ -0,0 +1,51 @@
+package types_test
+import (
+	"encoding/json"
+	. "github.com/cheqd/cheqd-node/x/cheqd/types"
+	
+)
+
+var (
+	ValidTestDID          = "did:cheqd:testnet:123456789abcdefg"
+	ValidTestDID2         = "did:cheqd:testnet:gfedcba987654321"
+	InvalidTestDID        = "badDid"
+	ValidEd25519PubKey    = "zF1hVGXXK9rmx5HhMTpGnGQJiab9qrFJbQXBRhSmYjQWX"
+	NotValidEd25519PubKey = "zF1hVGXXK9rmx5HhMTpGnGQJi"
+)
+
+type TestJWKKey struct {
+	Kty string `json:"kty"`
+	N   string `json:"n"`
+	Use string `json:"use"`
+	Alg string `json:"alg"`
+	E   string `json:"e"`
+	Kid string `json:"kid"`
+}
+
+var ValidJWKKey = TestJWKKey{
+	Kty: "RSA",
+	N:   "o76AudS2rsCvlz_3D47sFkpuz3NJxgLbXr1cHdmbo9xOMttPMJI97f0rHiSl9stltMi87KIOEEVQWUgMLaWQNaIZThgI1seWDAGRw59AO5sctgM1wPVZYt40fj2Qw4KT7m4RLMsZV1M5NYyXSd1lAAywM4FT25N0RLhkm3u8Hehw2Szj_2lm-rmcbDXzvjeXkodOUszFiOqzqBIS0Bv3c2zj2sytnozaG7aXa14OiUMSwJb4gmBC7I0BjPv5T85CH88VOcFDV51sO9zPJaBQnNBRUWNLh1vQUbkmspIANTzj2sN62cTSoxRhSdnjZQ9E_jraKYEW5oizE9Dtow4EvQ",
+	Use: "sig",
+	Alg: "RS256",
+	E:   "AQAB",
+	Kid: "6a8ba5652a7044121d4fedac8f14d14c54e4895b",
+}
+
+var NotValidJWKKey = TestJWKKey{
+	Kty: "SomeOtherKeyType",
+	N:   "o76AudS2rsCvlz_3D47sFkpuz3NJxgLbXr1cHdmbo9xOMttPMJI97f0rHiSl9stltMi87KIOEEVQWUgMLaWQNaIZThgI1seWDAGRw59AO5sctgM1wPVZYt40fj2Qw4KT7m4RLMsZV1M5NYyXSd1lAAywM4FT25N0RLhkm3u8Hehw2Szj_2lm-rmcbDXzvjeXkodOUszFiOqzqBIS0Bv3c2zj2sytnozaG7aXa14OiUMSwJb4gmBC7I0BjPv5T85CH88VOcFDV51sO9zPJaBQnNBRUWNLh1vQUbkmspIANTzj2sN62cTSoxRhSdnjZQ9E_jraKYEW5oizE9Dtow4EvQ",
+	Use: "sig",
+	Alg: "RS256",
+	E:   "AQAB",
+	Kid: "6a8ba5652a7044121d4fedac8f14d14c54e4895b",
+}
+
+var (
+	ValidJWKByte, _    = json.Marshal(ValidJWKKey)
+	NotValidJWKByte, _ = json.Marshal(NotValidJWKKey)
+)
+
+var (
+	ValidPublicKeyJWK    = JSONToPubKeyJWK(string(ValidJWKByte))
+	NotValidPublicKeyJWK = JSONToPubKeyJWK(string(NotValidJWKByte))
+)
\ No newline at end of file
diff --git a/x/cheqd/types/did_did_test.go b/x/cheqd/types/did_did_test.go
index ad6ebbfde..eda878553 100644
--- a/x/cheqd/types/did_did_test.go
+++ b/x/cheqd/types/did_did_test.go
@@ -1,234 +1,230 @@
-package types
+package types_test
 
 import (
 	"fmt"
-	"testing"
 
-	"github.com/stretchr/testify/require"
-)
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 
-var (
-	ValidTestDID          = "did:cheqd:testnet:123456789abcdefg"
-	ValidTestDID2         = "did:cheqd:testnet:gfedcba987654321"
-	InvalidTestDID        = "badDid"
-	ValidEd25519PubKey    = "zF1hVGXXK9rmx5HhMTpGnGQJiab9qrFJbQXBRhSmYjQWX"
-	NotValidEd25519PubKey = "zF1hVGXXK9rmx5HhMTpGnGQJi"
+	. "github.com/cheqd/cheqd-node/x/cheqd/types"
 )
 
-func TestDidValidation(t *testing.T) {
-	cases := []struct {
-		name              string
-		struct_           *Did
-		allowedNamespaces []string
-		isValid           bool
-		errorMsg          string
-	}{
-		{
-			name: "Valid: Id: allowed DID",
-			struct_: &Did{
-				Id: ValidTestDID,
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyJwk:       nil,
-						PublicKeyMultibase: ValidEd25519PubKey,
-					},
+var _ = Describe("DID Validation tests", func() {
+
+	var struct_           *Did
+	var allowedNamespaces []string
+	var isValid           bool
+	var errorMsg          string
+
+	BeforeEach(func() {
+		struct_ = &Did{}
+		allowedNamespaces = []string{}
+		isValid = false
+		errorMsg = ""
+	})
+
+	AfterEach(func() {
+		err := struct_.Validate(allowedNamespaces)
+
+			if isValid {
+				Expect(err).To(BeNil())
+			} else {
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring(errorMsg))
+			}
+	})
+
+	It("Valid: Id: allowed DID", func() {
+		struct_ = &Did{
+			Id: ValidTestDID,
+			VerificationMethod: []*VerificationMethod{
+				{
+					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+					Type:               "Ed25519VerificationKey2020",
+					Controller:         ValidTestDID,
+					PublicKeyJwk:       nil,
+					PublicKeyMultibase: ValidEd25519PubKey,
 				},
 			},
-			isValid:  true,
-			errorMsg: "",
-		},
-		{
-			name: "Not valid: Id: not allowed DID",
-			struct_: &Did{
-				Id: InvalidTestDID,
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyJwk:       nil,
-						PublicKeyMultibase: ValidEd25519PubKey,
-					},
+		}
+		isValid =  true
+		errorMsg = ""
+	})
+
+	It("Not valid: Id: not allowed DID", func() {
+		struct_ = &Did{
+			Id: InvalidTestDID,
+			VerificationMethod: []*VerificationMethod{
+				{
+					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+					Type:               "Ed25519VerificationKey2020",
+					Controller:         ValidTestDID,
+					PublicKeyJwk:       nil,
+					PublicKeyMultibase: ValidEd25519PubKey,
 				},
 			},
-			isValid:  false,
-			errorMsg: "id: unable to split did into method, namespace and id; verification_method: (0: (id: must have prefix: badDid.).).",
-		},
-		{
-			name: "Valid: Verification Method: all is fine with type Ed25519VerificationKey2020",
-			struct_: &Did{
-				Id: ValidTestDID,
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyJwk:       nil,
-						PublicKeyMultibase: ValidEd25519PubKey,
-					},
+		}
+		isValid = false
+		errorMsg = "id: unable to split did into method, namespace and id; verification_method: (0: (id: must have prefix: badDid.).)."
+	})
+
+	It("Valid: Verification Method: all is fine with type Ed25519VerificationKey2020", func() {
+		struct_ = &Did{
+			Id: ValidTestDID,
+			VerificationMethod: []*VerificationMethod{
+				{
+					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+					Type:               "Ed25519VerificationKey2020",
+					Controller:         ValidTestDID,
+					PublicKeyJwk:       nil,
+					PublicKeyMultibase: ValidEd25519PubKey,
 				},
 			},
-			isValid:  true,
-			errorMsg: "",
-		},
-		{
-			name: "Valid: Verification Method: all is fine with type jwk",
-			struct_: &Did{
-				Id: ValidTestDID,
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "JsonWebKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyJwk:       ValidPublicKeyJWK,
-						PublicKeyMultibase: "",
-					},
+		}
+		isValid = true
+		errorMsg = ""
+	})
+
+	It("Valid: Verification Method: all is fine with type jwk", func() {
+		struct_ = &Did{
+			Id: ValidTestDID,
+			VerificationMethod: []*VerificationMethod{
+				{
+					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+					Type:               "JsonWebKey2020",
+					Controller:         ValidTestDID,
+					PublicKeyJwk:       ValidPublicKeyJWK,
+					PublicKeyMultibase: "",
 				},
 			},
-			isValid:  true,
-			errorMsg: "",
-		},
-		{
-			name: "Not valid: Verification Method: Wrong id",
-			struct_: &Did{
-				Id: ValidTestDID,
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 InvalidTestDID,
-						Type:               "JsonWebKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyJwk:       ValidPublicKeyJWK,
-						PublicKeyMultibase: "",
-					},
+		}
+		isValid = true
+		errorMsg = ""
+	})
+
+	It("Not valid: Verification Method: Wrong id", func() {
+		struct_ = &Did{
+			Id: ValidTestDID,
+			VerificationMethod: []*VerificationMethod{
+				{
+					Id:                 InvalidTestDID,
+					Type:               "JsonWebKey2020",
+					Controller:         ValidTestDID,
+					PublicKeyJwk:       ValidPublicKeyJWK,
+					PublicKeyMultibase: "",
 				},
 			},
-			isValid:  false,
-			errorMsg: "verification_method: (0: (id: unable to split did into method, namespace and id.).).",
-		},
-		{
-			name: "Not valid: Verification Method: Wrong controller",
-			struct_: &Did{
-				Id: ValidTestDID,
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "JsonWebKey2020",
-						Controller:         InvalidTestDID,
-						PublicKeyJwk:       ValidPublicKeyJWK,
-						PublicKeyMultibase: "",
-					},
+		}
+		isValid = false
+		errorMsg = "verification_method: (0: (id: unable to split did into method, namespace and id.).)."
+	})
+
+	It("Not valid: Verification Method: Wrong controller", func() {
+		struct_ = &Did{
+			Id: ValidTestDID,
+			VerificationMethod: []*VerificationMethod{
+				{
+					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+					Type:               "JsonWebKey2020",
+					Controller:         InvalidTestDID,
+					PublicKeyJwk:       ValidPublicKeyJWK,
+					PublicKeyMultibase: "",
 				},
 			},
-			isValid:  false,
-			errorMsg: "verification_method: (0: (controller: unable to split did into method, namespace and id.).).",
-		},
-		{
-			name: "Valid: Controller: List of DIDs allowed",
-			struct_: &Did{
-				Id:         ValidTestDID,
-				Controller: []string{ValidTestDID, ValidTestDID2},
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyMultibase: ValidEd25519PubKey,
-					},
+		}
+		isValid = false
+		errorMsg = "verification_method: (0: (controller: unable to split did into method, namespace and id.).)."
+	})
+
+	It("Valid: Controller: List of DIDs allowed", func() {
+		struct_ = &Did{
+			Id:         ValidTestDID,
+			Controller: []string{ValidTestDID, ValidTestDID2},
+			VerificationMethod: []*VerificationMethod{
+				{
+					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+					Type:               "Ed25519VerificationKey2020",
+					Controller:         ValidTestDID,
+					PublicKeyMultibase: ValidEd25519PubKey,
 				},
 			},
-			isValid:  true,
-			errorMsg: "",
-		},
-		{
-			name: "Not valid: Controller: List of DIDs is not allowed",
-			struct_: &Did{
-				Context:    nil,
-				Id:         ValidTestDID,
-				Controller: []string{ValidTestDID, InvalidTestDID},
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyMultibase: ValidEd25519PubKey,
-					},
+		}
+		isValid = true
+		errorMsg = ""
+	})
+
+	It("Not valid: Controller: List of DIDs is not allowed", func() {
+		struct_ = &Did{
+			Context:    nil,
+			Id:         ValidTestDID,
+			Controller: []string{ValidTestDID, InvalidTestDID},
+			VerificationMethod: []*VerificationMethod{
+				{
+					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+					Type:               "Ed25519VerificationKey2020",
+					Controller:         ValidTestDID,
+					PublicKeyMultibase: ValidEd25519PubKey,
 				},
 			},
-			isValid:  false,
-			errorMsg: "controller: (1: unable to split did into method, namespace and id.).",
-		},
-		{
-			name: "Allowed namespaces: Negative",
-			struct_: &Did{
-				Id:         ValidTestDID,
-				Controller: []string{ValidTestDID},
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyMultibase: ValidEd25519PubKey,
-					},
+		}
+		isValid = false
+		errorMsg = "controller: (1: unable to split did into method, namespace and id.)."
+	})
+
+	It("Allowed namespaces: Negative", func() {
+		struct_ = &Did{
+			Id:         ValidTestDID,
+			Controller: []string{ValidTestDID},
+			VerificationMethod: []*VerificationMethod{
+				{
+					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+					Type:               "Ed25519VerificationKey2020",
+					Controller:         ValidTestDID,
+					PublicKeyMultibase: ValidEd25519PubKey,
 				},
 			},
-			allowedNamespaces: []string{"mainnet"},
-			isValid:           false,
-			errorMsg:          "controller: (0: did namespace must be one of: mainnet.); id: did namespace must be one of: mainnet; verification_method: (0: (controller: did namespace must be one of: mainnet; id: did namespace must be one of: mainnet.).).",
-		},
-		{
-			name: "Controller duplicated: negative",
-			struct_: &Did{
-				Id:         ValidTestDID,
-				Controller: []string{ValidTestDID, ValidTestDID},
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyMultibase: ValidEd25519PubKey,
-					},
+		}
+		allowedNamespaces = []string{"mainnet"}
+		isValid = false
+		errorMsg = "controller: (0: did namespace must be one of: mainnet.); id: did namespace must be one of: mainnet; verification_method: (0: (controller: did namespace must be one of: mainnet; id: did namespace must be one of: mainnet.).)."
+	})
+
+	It("Controller duplicated: negative", func() {
+		struct_ = &Did{
+			Id:         ValidTestDID,
+			Controller: []string{ValidTestDID, ValidTestDID},
+			VerificationMethod: []*VerificationMethod{
+				{
+					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+					Type:               "Ed25519VerificationKey2020",
+					Controller:         ValidTestDID,
+					PublicKeyMultibase: ValidEd25519PubKey,
 				},
 			},
-			isValid:  false,
-			errorMsg: "controller: there should be no duplicates.",
-		},
-		{
-			name: "VM duplicated: negative",
-			struct_: &Did{
-				Id: ValidTestDID,
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyMultibase: ValidEd25519PubKey,
-					},
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyMultibase: ValidEd25519PubKey,
-					},
+		}
+		isValid = false
+		errorMsg = "controller: there should be no duplicates."
+	})
+
+	It("VM duplicated: negative", func() {
+		struct_ = &Did{
+			Id: ValidTestDID,
+			VerificationMethod: []*VerificationMethod{
+				{
+					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+					Type:               "Ed25519VerificationKey2020",
+					Controller:         ValidTestDID,
+					PublicKeyMultibase: ValidEd25519PubKey,
+				},
+				{
+					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+					Type:               "Ed25519VerificationKey2020",
+					Controller:         ValidTestDID,
+					PublicKeyMultibase: ValidEd25519PubKey,
 				},
 			},
-			isValid:  false,
-			errorMsg: "verification_method: there are verification method duplicates.",
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := tc.struct_.Validate(tc.allowedNamespaces)
-
-			if tc.isValid {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-				require.Contains(t, err.Error(), tc.errorMsg)
-			}
-		})
-	}
-}
+		}
+		isValid = false
+		errorMsg = "verification_method: there are verification method duplicates."
+	})
+})
diff --git a/x/cheqd/types/did_service_test.go b/x/cheqd/types/did_service_test.go
index a7475e471..ce854a72d 100644
--- a/x/cheqd/types/did_service_test.go
+++ b/x/cheqd/types/did_service_test.go
@@ -1,66 +1,70 @@
-package types
+package types_test
 
 import (
-	"testing"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 
-	"github.com/stretchr/testify/require"
+	. "github.com/cheqd/cheqd-node/x/cheqd/types"
 )
 
-func TestServiceValidation(t *testing.T) {
-	cases := []struct {
-		name              string
-		struct_           Service
-		baseDid           string
-		allowedNamespaces []string
-		isValid           bool
-		errorMsg          string
-	}{
-		{
-			name: "positive",
-			struct_: Service{
-				Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
-				Type:            "DIDCommMessaging",
-				ServiceEndpoint: "endpoint",
-			},
-			baseDid:           "did:cheqd:aaaaaaaaaaaaaaaa",
-			allowedNamespaces: []string{""},
-			isValid:           true,
-			errorMsg:          "",
-		},
-		{
-			name: "negative: namespace",
-			struct_: Service{
-				Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
-				Type:            "DIDCommMessaging",
-				ServiceEndpoint: "endpoint",
-			},
-			allowedNamespaces: []string{"mainnet"},
-			isValid:           false,
-			errorMsg:          "id: did namespace must be one of: mainnet.",
-		},
-		{
-			name: "negative: base did",
-			struct_: Service{
-				Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
-				Type:            "DIDCommMessaging",
-				ServiceEndpoint: "endpoint",
-			},
-			baseDid:  "did:cheqd:baaaaaaaaaaaaaab",
-			isValid:  false,
-			errorMsg: "id: must have prefix: did:cheqd:baaaaaaaaaaaaaab.",
-		},
-	}
+var _ = Describe("DID Validation tests", func() {
 
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := tc.struct_.Validate(tc.baseDid, tc.allowedNamespaces)
+	var struct_           Service
+	var baseDid           string
+	var allowedNamespaces []string
+	var isValid           bool
+	var errorMsg          string
 
-			if tc.isValid {
-				require.NoError(t, err)
+	BeforeEach(func() {
+		struct_ = Service{}
+		baseDid = ""
+		allowedNamespaces = []string{}
+		isValid = false
+		errorMsg = ""
+	})
+
+	AfterEach(func() {
+		err := struct_.Validate(baseDid, allowedNamespaces)
+
+			if isValid {
+				Expect(err).To(BeNil())
 			} else {
-				require.Error(t, err)
-				require.Equal(t, err.Error(), tc.errorMsg)
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring(errorMsg))
 			}
-		})
-	}
-}
+	})
+
+	It("Positive case", func() {
+		struct_ = Service{
+			Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
+			Type:            "DIDCommMessaging",
+			ServiceEndpoint: "endpoint",
+		}
+		baseDid = "did:cheqd:aaaaaaaaaaaaaaaa"
+		allowedNamespaces = []string{""}
+		isValid = true
+		errorMsg = ""
+	})
+
+	It("Negative: namespace", func() {
+		struct_ = Service{
+			Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
+			Type:            "DIDCommMessaging",
+			ServiceEndpoint: "endpoint",
+		}
+		allowedNamespaces = []string{"mainnet"}
+		isValid = false
+		errorMsg = "id: did namespace must be one of: mainnet."
+	})
+
+	It("Negative: Base did", func() {
+		struct_ = Service{
+			Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
+			Type:            "DIDCommMessaging",
+			ServiceEndpoint: "endpoint",
+		}
+		baseDid = "did:cheqd:baaaaaaaaaaaaaab"
+		isValid = false
+		errorMsg = "id: must have prefix: did:cheqd:baaaaaaaaaaaaaab."
+	})
+})
diff --git a/x/cheqd/types/types_test.go b/x/cheqd/types/types_test.go
new file mode 100644
index 000000000..550174758
--- /dev/null
+++ b/x/cheqd/types/types_test.go
@@ -0,0 +1,12 @@
+package types_test
+
+import (
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	"testing"
+)
+
+func TestUtils(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Types Tests Suite")
+}

From 10fef06dcc65979d85dea03625affd2da1bc7e4e Mon Sep 17 00:00:00 2001
From: Tasos <50984242+Eengineer1@users.noreply.github.com>
Date: Fri, 7 Oct 2022 22:05:18 +0300
Subject: [PATCH 17/76] Switched `x/resource` tests to Ginkgo suite

---
 go.mod                                        |   3 +
 go.sum                                        |   3 +
 x/cheqd/tests/create_did_test.go              |  33 ++-
 x/cheqd/tests/signature_verification_test.go  |   7 +-
 x/cheqd/tests/tests_suite_test.go             |   5 +-
 x/cheqd/tests/update_did_test.go              |  38 ++-
 x/cheqd/tests/utils.go                        |   1 +
 x/cheqd/utils/crypto_test.go                  |   1 -
 x/cheqd/utils/did_test.go                     |  19 +-
 x/cheqd/utils/encoding_test.go                |  27 +-
 x/cheqd/utils/proto_test.go                   |   2 +-
 x/cheqd/utils/str_test.go                     |   6 +-
 x/cheqd/utils/utils_suite_test.go             |   4 +-
 .../keeper/msg_server_create_resource.go      |   4 +-
 x/resource/tests/constants.go                 |   4 +-
 x/resource/tests/create_resource_test.go      | 244 +++++++++---------
 .../tests/query_all_resource_versions_test.go | 168 ++++++------
 .../tests/query_collection_resources_test.go  | 119 +++++----
 x/resource/tests/query_resource_test.go       | 153 +++++------
 x/resource/tests/setup.go                     |   8 +-
 x/resource/tests/tests_suite_test.go          |  13 +
 .../tx_msg_create_resource_payload_test.go    |  79 +++---
 x/resource/types/types_suite_test.go          |  13 +
 x/resource/utils/media_type_test.go           |  48 ++--
 x/resource/utils/testdata/resource.png        | Bin 0 -> 98198 bytes
 x/resource/utils/utils_suite_test.go          |  13 +
 26 files changed, 521 insertions(+), 494 deletions(-)
 create mode 100644 x/resource/tests/tests_suite_test.go
 create mode 100644 x/resource/types/types_suite_test.go
 create mode 100644 x/resource/utils/testdata/resource.png
 create mode 100644 x/resource/utils/utils_suite_test.go

diff --git a/go.mod b/go.mod
index 135f45a84..e42355e07 100644
--- a/go.mod
+++ b/go.mod
@@ -64,6 +64,7 @@ require (
 	github.com/go-kit/log v0.2.0 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
 	github.com/goccy/go-json v0.9.7 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/gateway v1.1.0 // indirect
@@ -71,6 +72,7 @@ require (
 	github.com/google/btree v1.0.0 // indirect
 	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/google/orderedcode v0.0.1 // indirect
+	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
 	github.com/gorilla/handlers v1.5.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -135,6 +137,7 @@ require (
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/tools v0.1.12 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/go.sum b/go.sum
index b635b4121..a3a58eaa0 100644
--- a/go.sum
+++ b/go.sum
@@ -368,6 +368,7 @@ github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5Nq
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
@@ -470,6 +471,7 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -1482,6 +1484,7 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
+golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/x/cheqd/tests/create_did_test.go b/x/cheqd/tests/create_did_test.go
index f4484fd6d..3c60d01cb 100644
--- a/x/cheqd/tests/create_did_test.go
+++ b/x/cheqd/tests/create_did_test.go
@@ -19,11 +19,11 @@ var _ = Describe("Create DID tests", func() {
 	var keys map[string]KeyPair
 	var signers []string
 	var msg *types.MsgCreateDidPayload
-	var errMsg = ""
+	errMsg := ""
 
 	var setup TestSetup
 	var err error
-	var mainKeys = GenerateTestKeys()
+	mainKeys := GenerateTestKeys()
 
 	BeforeEach(func() {
 		// setup
@@ -35,7 +35,6 @@ var _ = Describe("Create DID tests", func() {
 	})
 
 	AfterEach(func() {
-		
 		setup = InitEnv(mainKeys)
 
 		for _, vm := range msg.VerificationMethod {
@@ -160,7 +159,7 @@ var _ = Describe("Create DID tests", func() {
 			AliceKey1:    mainKeys[AliceKey1],
 		}
 		signers = []string{AliceKey1, ImposterKey1}
-		msg= &types.MsgCreateDidPayload{
+		msg = &types.MsgCreateDidPayload{
 			Id:                   ImposterDID,
 			CapabilityInvocation: []string{ImposterKey1},
 			Controller:           []string{AliceDID},
@@ -263,9 +262,9 @@ var _ = Describe("Create DID tests", func() {
 		}
 	})
 
-// ************************** 
-// ***** Negative cases *****
-// **************************
+	// **************************
+	// ***** Negative cases *****
+	// **************************
 
 	It("Not Valid: Second controller did not sign request", func() {
 		valid = false
@@ -280,7 +279,7 @@ var _ = Describe("Create DID tests", func() {
 		errMsg = fmt.Sprintf("signer: %s: signature is required but not found", BobDID)
 	})
 
-	It("Not Valid: No signature", func(){
+	It("Not Valid: No signature", func() {
 		valid = false
 		msg = &types.MsgCreateDidPayload{
 			Id:         ImposterDID,
@@ -288,8 +287,8 @@ var _ = Describe("Create DID tests", func() {
 		}
 		errMsg = fmt.Sprintf("signer: %s: signature is required but not found", AliceDID)
 	})
-	
-	It("Not Valid: Controller not found", func(){
+
+	It("Not Valid: Controller not found", func() {
 		valid = false
 		msg = &types.MsgCreateDidPayload{
 			Id:         ImposterDID,
@@ -300,10 +299,10 @@ var _ = Describe("Create DID tests", func() {
 			AliceKey1:    mainKeys[AliceKey1],
 			ImposterKey1: GenerateKeyPair(),
 		}
-		errMsg = fmt.Sprintf("%s: DID Doc not found", NotFounDID)	
+		errMsg = fmt.Sprintf("%s: DID Doc not found", NotFounDID)
 	})
 
-	It("Not Valid: Wrong signature", func(){
+	It("Not Valid: Wrong signature", func() {
 		valid = false
 		msg = &types.MsgCreateDidPayload{
 			Id:         ImposterDID,
@@ -316,8 +315,8 @@ var _ = Describe("Create DID tests", func() {
 		errMsg = fmt.Sprintf("method id: %s: invalid signature detected", AliceKey1)
 	})
 
-	It("Not Valid: DID signed by wrong controller", func(){
-		valid =false
+	It("Not Valid: DID signed by wrong controller", func() {
+		valid = false
 		msg = &types.MsgCreateDidPayload{
 			Id:             ImposterDID,
 			Authentication: []string{ImposterKey1},
@@ -337,7 +336,7 @@ var _ = Describe("Create DID tests", func() {
 		errMsg = fmt.Sprintf("signer: %s: signature is required but not found", ImposterDID)
 	})
 
-	It("Not Valid: DID self-signed by not existing verification method", func(){
+	It("Not Valid: DID self-signed by not existing verification method", func() {
 		valid = false
 		msg = &types.MsgCreateDidPayload{
 			Id:             ImposterDID,
@@ -358,7 +357,7 @@ var _ = Describe("Create DID tests", func() {
 		errMsg = fmt.Sprintf("%s: verification method not found", ImposterKey2)
 	})
 
-	It("Not Valid: Self-signature not found", func(){
+	It("Not Valid: Self-signature not found", func() {
 		valid = false
 		msg = &types.MsgCreateDidPayload{
 			Id:             ImposterDID,
@@ -381,7 +380,7 @@ var _ = Describe("Create DID tests", func() {
 		errMsg = fmt.Sprintf("%s: verification method not found", ImposterKey2)
 	})
 
-	It("Not Valid: DID Doc already exists", func(){
+	It("Not Valid: DID Doc already exists", func() {
 		valid = false
 		keys = map[string]KeyPair{
 			CharlieKey1: GenerateKeyPair(),
diff --git a/x/cheqd/tests/signature_verification_test.go b/x/cheqd/tests/signature_verification_test.go
index ab371ac7c..32b43dfcb 100644
--- a/x/cheqd/tests/signature_verification_test.go
+++ b/x/cheqd/tests/signature_verification_test.go
@@ -80,7 +80,7 @@ var _ = Describe("Signature Verification. Remove signature/VM", func() {
 		// Create dids
 		aliceDid = setup.CreateDid(ApubKey, AliceDID)
 		bobDid = setup.CreateDid(BpubKey, BobDID)
-		
+
 		// Collect private keys
 		aliceKeys = map[string]ed25519.PrivateKey{AliceKey1: AprivKey, BobKey1: BprivKey}
 		bobKeys = map[string]ed25519.PrivateKey{BobKey1: BprivKey}
@@ -92,11 +92,9 @@ var _ = Describe("Signature Verification. Remove signature/VM", func() {
 			Type:               Ed25519VerificationKey2020,
 			PublicKeyMultibase: "z" + base58.Encode(BpubKey),
 		})
-
 	})
 
 	It("should fails cause old signature is required for removing this signature", func() {
-
 		// Send dids
 		_, _ = setup.SendCreateDid(bobDid, bobKeys)
 		_, _ = setup.SendCreateDid(aliceDid, aliceKeys)
@@ -123,9 +121,8 @@ var _ = Describe("Signature Verification. Remove signature/VM", func() {
 		updatedDidDoc.VerificationMethod = []*types.VerificationMethod{aliceDid.VerificationMethod[0]}
 		receivedDid, _ := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(ConcatKeys(aliceKeys, bobKeys)))
 
-			// check
+		// check
 		Expect(len(aliceDid.VerificationMethod)).To(Not(Equal(len(receivedDid.VerificationMethod))))
 		Expect(reflect.DeepEqual(aliceDid.VerificationMethod[0], receivedDid.VerificationMethod[0])).To(BeTrue())
-
 	})
 })
diff --git a/x/cheqd/tests/tests_suite_test.go b/x/cheqd/tests/tests_suite_test.go
index cd8579e57..bd60da49f 100644
--- a/x/cheqd/tests/tests_suite_test.go
+++ b/x/cheqd/tests/tests_suite_test.go
@@ -1,14 +1,13 @@
 package tests_test
 
 import (
+	"testing"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
-	"testing"
 )
 
 func TestTestsGeneral(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "General Tests Suite")
 }
-
diff --git a/x/cheqd/tests/update_did_test.go b/x/cheqd/tests/update_did_test.go
index 7ff264203..4917283a2 100644
--- a/x/cheqd/tests/update_did_test.go
+++ b/x/cheqd/tests/update_did_test.go
@@ -17,23 +17,23 @@ var _ = Describe("Update DID tests", func() {
 	var signers []string
 	var signerKeys []SignerKey
 	var msg *types.MsgUpdateDidPayload
-	var errMsg = ""
+	errMsg := ""
 
 	var setup TestSetup
 	var err error
-	var mainKeys = map[string]KeyPair{
-				AliceKey1:    GenerateKeyPair(),
-				AliceKey2:    GenerateKeyPair(),
-				BobKey1:      GenerateKeyPair(),
-				BobKey2:      GenerateKeyPair(),
-				BobKey3:      GenerateKeyPair(),
-				BobKey4:      GenerateKeyPair(),
-				CharlieKey1:  GenerateKeyPair(),
-				CharlieKey2:  GenerateKeyPair(),
-				CharlieKey3:  GenerateKeyPair(),
-				CharlieKey4:  GenerateKeyPair(),
-				ImposterKey1: GenerateKeyPair(),
-			}
+	mainKeys := map[string]KeyPair{
+		AliceKey1:    GenerateKeyPair(),
+		AliceKey2:    GenerateKeyPair(),
+		BobKey1:      GenerateKeyPair(),
+		BobKey2:      GenerateKeyPair(),
+		BobKey3:      GenerateKeyPair(),
+		BobKey4:      GenerateKeyPair(),
+		CharlieKey1:  GenerateKeyPair(),
+		CharlieKey2:  GenerateKeyPair(),
+		CharlieKey3:  GenerateKeyPair(),
+		CharlieKey4:  GenerateKeyPair(),
+		ImposterKey1: GenerateKeyPair(),
+	}
 
 	BeforeEach(func() {
 		// setup
@@ -45,9 +45,8 @@ var _ = Describe("Update DID tests", func() {
 	})
 
 	AfterEach(func() {
-		
 		setup = InitEnv(mainKeys)
-		
+
 		for _, vm := range msg.VerificationMethod {
 			if vm.PublicKeyMultibase == "" {
 				vm.PublicKeyMultibase, err = multibase.Encode(multibase.Base58BTC, mainKeys[vm.Id].PublicKey)
@@ -159,7 +158,6 @@ var _ = Describe("Update DID tests", func() {
 	// --- adding new VM without new signature
 	// --- adding new VM without old signature
 
-
 	It("Valid: Replacing VM controller works with one signature", func() {
 		valid = true
 		signers = []string{AliceKey1, BobKey1}
@@ -176,7 +174,7 @@ var _ = Describe("Update DID tests", func() {
 	})
 
 	It("Not Valid: Replacing VM controller does not work without new signature", func() {
-		valid =false
+		valid = false
 		signers = []string{AliceKey1}
 		msg = &types.MsgUpdateDidPayload{
 			Id: AliceDID,
@@ -207,7 +205,7 @@ var _ = Describe("Update DID tests", func() {
 		errMsg = fmt.Sprintf("there should be at least one valid signature by %s (new version): invalid signature detected", AliceDID)
 	})
 	It("Not Valid: Replacing VM does not work without old signature", func() {
-		valid =false
+		valid = false
 		signers = []string{AliceKey2}
 		msg = &types.MsgUpdateDidPayload{
 			Id: AliceDID,
@@ -469,7 +467,7 @@ var _ = Describe("Update DID tests", func() {
 					Controller: CharlieDID,
 				},
 			},
-		}		
+		}
 	})
 
 	It("Valid: Removing verification method is possible with any kind of valid Bob's key", func() {
diff --git a/x/cheqd/tests/utils.go b/x/cheqd/tests/utils.go
index ac0a3ef88..f6a79c69c 100644
--- a/x/cheqd/tests/utils.go
+++ b/x/cheqd/tests/utils.go
@@ -2,6 +2,7 @@ package tests
 
 import (
 	"math/rand"
+
 	. "github.com/onsi/gomega"
 )
 
diff --git a/x/cheqd/utils/crypto_test.go b/x/cheqd/utils/crypto_test.go
index 6cc5eb869..ee1ec8502 100644
--- a/x/cheqd/utils/crypto_test.go
+++ b/x/cheqd/utils/crypto_test.go
@@ -1,7 +1,6 @@
 package utils_test
 
 import (
-
 	"github.com/multiformats/go-multibase"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
diff --git a/x/cheqd/utils/did_test.go b/x/cheqd/utils/did_test.go
index 13186fd49..90ce24cb9 100644
--- a/x/cheqd/utils/did_test.go
+++ b/x/cheqd/utils/did_test.go
@@ -1,16 +1,16 @@
 package utils_test
 
 import (
+	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
 )
 
 var _ = Describe("DID checks", func() {
 	DescribeTable("Check is valid ID (for example did:cheqD:testnet:123456789abcdefg and ID is 123456789abcdefg)",
 
 		func(expected bool, did string) {
-			Expect(IsValidID(did)).To(Equal(expected))			
+			Expect(IsValidID(did)).To(Equal(expected))
 		},
 		Entry("Valid base58, 16 symbols", true, "123456789abcdefg"),
 		Entry("Valid base58, 32 symbols", true, "123456789abcdefg123456789abcdefg"),
@@ -24,7 +24,7 @@ var _ = Describe("DID checks", func() {
 	DescribeTable("DID validation",
 
 		func(expected bool, did string, method string, allowedNamespaces []string) {
-			Expect(IsValidDID(did, method, allowedNamespaces)).To(Equal(expected))			
+			Expect(IsValidDID(did, method, allowedNamespaces)).To(Equal(expected))
 		},
 
 		Entry("Valid: Inputs: Method and namespace are set", true, "did:cheqd:testnet:123456789abcdefg", "cheqd", []string{"testnet"}),
@@ -66,7 +66,6 @@ var _ = Describe("DID checks", func() {
 
 	// The next test will check more functionality aspects. This one is for testing corner cases
 	Describe("Check splitting functionality", func() {
-
 		Context("Valid DID", func() {
 			It("should return expected method, namespace and DID", func() {
 				method, namespace, id := MustSplitDID("did:cheqd:mainnet:qqqqqqqqqqqqqqqq")
@@ -79,19 +78,19 @@ var _ = Describe("DID checks", func() {
 		Context("Not valid DID string at all", func() {
 			It("should panic", func() {
 				panicDID := "Not 	"
-				Expect(func (){
+				Expect(func() {
 					MustSplitDID(panicDID)
-					}).To(Panic())
+				}).To(Panic())
 			})
 		})
 	})
 
 	DescribeTable("Check DID splitting and joining",
 
-	func(did string) {
-		method, namespace, id := MustSplitDID(did)
-		Expect(did).To(Equal(JoinDID(method, namespace, id)))
-	},
+		func(did string) {
+			method, namespace, id := MustSplitDID(did)
+			Expect(did).To(Equal(JoinDID(method, namespace, id)))
+		},
 		Entry("Full DID", "did:cheqd:testnet:123456789abcdefg"),
 		Entry("Without namespace", "did:cheqd:123456789abcdefg"),
 		Entry("Not cheqd method", "did:NOTcheqd:123456789abcdefg"),
diff --git a/x/cheqd/utils/encoding_test.go b/x/cheqd/utils/encoding_test.go
index f6ec66f15..30edbd93b 100644
--- a/x/cheqd/utils/encoding_test.go
+++ b/x/cheqd/utils/encoding_test.go
@@ -2,6 +2,7 @@ package utils_test
 
 import (
 	"encoding/json"
+
 	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -51,7 +52,7 @@ var _ = Describe("Encoding checks", func() {
 			}
 		},
 
-		Entry("Valid: General pmbkey", "zABCDEFG123456789",  true),
+		Entry("Valid: General pmbkey", "zABCDEFG123456789", true),
 		Entry("Not Valid: cannot be empty", "", false),
 		Entry("Not Valid: without z but base58", "ABCDEFG123456789", false),
 		Entry("Not Valid: without z and not base58", "OIl0ABCDEFG123456789", false),
@@ -66,7 +67,7 @@ var _ = Describe("Encoding checks", func() {
 				Ω(_err).ShouldNot(HaveOccurred())
 			} else {
 				Ω(_err).Should(HaveOccurred())
-			}			
+			}
 		},
 
 		Entry("Valid: General pmbkey", "ABCDEFG123456789", true),
@@ -76,16 +77,16 @@ var _ = Describe("Encoding checks", func() {
 
 	DescribeTable("Validate JWK",
 
-	func(data string, isValid bool) {
-		_err := ValidateJWK(data)
-		if isValid {
-			Ω(_err).ShouldNot(HaveOccurred())
-		} else {
-			Ω(_err).Should(HaveOccurred())
-		}
-	},
+		func(data string, isValid bool) {
+			_err := ValidateJWK(data)
+			if isValid {
+				Ω(_err).ShouldNot(HaveOccurred())
+			} else {
+				Ω(_err).Should(HaveOccurred())
+			}
+		},
 
-	Entry("Valid: General jwk", string(ValidJWKByte), true),
-	Entry("Not Valid: Bad jwk", string(NotValidJWKByte), false),
-)
+		Entry("Valid: General jwk", string(ValidJWKByte), true),
+		Entry("Not Valid: Bad jwk", string(NotValidJWKByte), false),
+	)
 })
diff --git a/x/cheqd/utils/proto_test.go b/x/cheqd/utils/proto_test.go
index 11d4f7a02..18ff21994 100644
--- a/x/cheqd/utils/proto_test.go
+++ b/x/cheqd/utils/proto_test.go
@@ -10,7 +10,7 @@ import (
 
 var _ = Describe("Proto", func() {
 	Describe("Check that DenomUnit from bank type has expected value", func() {
-		Context("Denom Unit from cosmos-sdk" ,func ()  {
+		Context("Denom Unit from cosmos-sdk", func() {
 			It("should return expected value", func() {
 				Expect(MsgTypeURL(&bank_types.DenomUnit{})).To(Equal("/cosmos.bank.v1beta1.DenomUnit"))
 			})
diff --git a/x/cheqd/utils/str_test.go b/x/cheqd/utils/str_test.go
index cb3b5d64e..0e77e86ff 100644
--- a/x/cheqd/utils/str_test.go
+++ b/x/cheqd/utils/str_test.go
@@ -1,10 +1,11 @@
 package utils_test
 
 import (
+	"sort"
+
 	. "github.com/cheqd/cheqd-node/x/cheqd/utils"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"sort"
 )
 
 var _ = Describe("Str utils functionality", func() {
@@ -36,7 +37,6 @@ var _ = Describe("Str utils functionality", func() {
 		Entry("Desired element exists at the position 2. Expected: true", []string{"1", "2", "3"}, "2", true),
 		Entry("Desired element exists at the position 3. Expected: true", []string{"1", "2", "3"}, "3", true),
 		Entry("Desired element is absent. Expected: false", []string{"1", "2", "3"}, "123", false),
-
 	)
 
 	DescribeTable("Substract function",
@@ -82,7 +82,6 @@ var _ = Describe("Str utils functionality", func() {
 		Entry("Replace 2 with 3", []string{"1", "2", "3", "2"}, "2", "3", []string{"1", "3", "3", "3"}),
 	)
 
-
 	DescribeTable("UniqueSorted function",
 
 		func(input []string, expected []string) {
@@ -92,5 +91,4 @@ var _ = Describe("Str utils functionality", func() {
 		Entry("General alphabet reverse list", []string{"bb", "aa"}, []string{"aa", "bb"}),
 		Entry("General number list", []string{"22", "11"}, []string{"11", "22"}),
 	)
-
 })
diff --git a/x/cheqd/utils/utils_suite_test.go b/x/cheqd/utils/utils_suite_test.go
index feade1121..9ca82ff0d 100644
--- a/x/cheqd/utils/utils_suite_test.go
+++ b/x/cheqd/utils/utils_suite_test.go
@@ -1,10 +1,10 @@
 package utils_test
 
 import (
+	"testing"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
-	"testing"
 )
 
 func TestUtils(t *testing.T) {
diff --git a/x/resource/keeper/msg_server_create_resource.go b/x/resource/keeper/msg_server_create_resource.go
index 3fdefe82e..14a3d1bad 100644
--- a/x/resource/keeper/msg_server_create_resource.go
+++ b/x/resource/keeper/msg_server_create_resource.go
@@ -46,8 +46,8 @@ func (k msgServer) CreateResource(goCtx context.Context, msg *types.MsgCreateRes
 
 	// Build Resource
 	resource := msg.Payload.ToResource()
-
-	resource.Header.Checksum = sha256.New().Sum(resource.Data)
+	checksum := sha256.Sum256([]byte(resource.Data))
+	resource.Header.Checksum = checksum[:]
 	resource.Header.Created = ctx.BlockTime().Format(time.RFC3339)
 	resource.Header.MediaType = utils.DetectMediaType(resource.Data)
 
diff --git a/x/resource/tests/constants.go b/x/resource/tests/constants.go
index 6f2befe27..4571fe208 100644
--- a/x/resource/tests/constants.go
+++ b/x/resource/tests/constants.go
@@ -23,7 +23,7 @@ const (
 
 func ExistingResource() types.Resource {
 	data := []byte(SchemaData)
-	checksum := sha256.New().Sum(data)
+	checksum := sha256.Sum256(data)
 	return types.Resource{
 		Header: &types.ResourceHeader{
 			CollectionId: ExistingDIDIdentifier,
@@ -31,7 +31,7 @@ func ExistingResource() types.Resource {
 			Name:         "Existing Resource Name",
 			ResourceType: CLSchemaType,
 			MediaType:    JsonResourceType,
-			Checksum:     checksum,
+			Checksum:     checksum[:],
 		},
 		Data: data,
 	}
diff --git a/x/resource/tests/create_resource_test.go b/x/resource/tests/create_resource_test.go
index ce4b95b9d..6156e48bf 100644
--- a/x/resource/tests/create_resource_test.go
+++ b/x/resource/tests/create_resource_test.go
@@ -1,133 +1,133 @@
-package tests
+package tests_test
 
 import (
 	"crypto/ed25519"
 	"crypto/sha256"
 	"fmt"
-	"testing"
 
-	"github.com/cheqd/cheqd-node/x/cheqd/utils"
+	cheqdutils "github.com/cheqd/cheqd-node/x/cheqd/utils"
+	resourcetests "github.com/cheqd/cheqd-node/x/resource/tests"
+	resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
 
-	// "crypto/sha256"
-
-	"github.com/cheqd/cheqd-node/x/resource/types"
-
-	"github.com/stretchr/testify/require"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 )
 
-func TestCreateResource(t *testing.T) {
-	keys := GenerateTestKeys()
-	cases := []struct {
-		valid             bool
-		name              string
-		signerKeys        map[string]ed25519.PrivateKey
-		msg               *types.MsgCreateResourcePayload
-		mediaType         string
-		previousVersionId string
-		errMsg            string
-	}{
-		{
-			valid: true,
-			name:  "Valid: Works",
-			signerKeys: map[string]ed25519.PrivateKey{
-				ExistingDIDKey: keys[ExistingDIDKey].PrivateKey,
-			},
-			msg: &types.MsgCreateResourcePayload{
-				CollectionId: ExistingDIDIdentifier,
-				Id:           ResourceId,
-				Name:         "Test Resource Name",
-				ResourceType: CLSchemaType,
-				Data:         []byte(SchemaData),
-			},
-			mediaType:         JsonResourceType,
-			previousVersionId: "",
-		},
-		{
-			valid: true,
-			name:  "Valid: Add new resource version",
-			signerKeys: map[string]ed25519.PrivateKey{
-				ExistingDIDKey: keys[ExistingDIDKey].PrivateKey,
-			},
-			msg: &types.MsgCreateResourcePayload{
-				CollectionId: ExistingResource().Header.CollectionId,
-				Id:           ResourceId,
-				Name:         ExistingResource().Header.Name,
-				ResourceType: ExistingResource().Header.ResourceType,
-				Data:         ExistingResource().Data,
-			},
-			mediaType:         ExistingResource().Header.MediaType,
-			previousVersionId: ExistingResource().Header.Id,
-		},
-		{
-			valid:      false,
-			name:       "Not Valid: No signature",
-			signerKeys: map[string]ed25519.PrivateKey{},
-			msg: &types.MsgCreateResourcePayload{
-				CollectionId: ExistingDIDIdentifier,
-				Id:           ResourceId,
-				Name:         "Test Resource Name",
-				ResourceType: CLSchemaType,
-				Data:         []byte(SchemaData),
-			},
-			mediaType: JsonResourceType,
-			errMsg:    fmt.Sprintf("signer: %s: signature is required but not found", ExistingDID),
-		},
-		{
-			valid:      false,
-			name:       "Not Valid: Invalid Resource Id",
-			signerKeys: map[string]ed25519.PrivateKey{},
-			msg: &types.MsgCreateResourcePayload{
-				CollectionId: ExistingDIDIdentifier,
-				Id:           IncorrectResourceId,
-				Name:         "Test Resource Name",
-				ResourceType: CLSchemaType,
-				Data:         []byte(SchemaData),
-			},
-			mediaType: JsonResourceType,
-			errMsg:    fmt.Sprintf("signer: %s: signature is required but not found", ExistingDID),
-		},
-		{
-			valid:      false,
-			name:       "Not Valid: DID Doc is not found",
-			signerKeys: map[string]ed25519.PrivateKey{},
-			msg: &types.MsgCreateResourcePayload{
-				CollectionId: NotFoundDIDIdentifier,
-				Id:           IncorrectResourceId,
-				Name:         "Test Resource Name",
-				ResourceType: CLSchemaType,
-				Data:         []byte(SchemaData),
-			},
-			mediaType: JsonResourceType,
-			errMsg:    fmt.Sprintf("did:cheqd:test:%s: not found", NotFoundDIDIdentifier),
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			msg := tc.msg
-			resourceSetup := InitEnv(t, keys[ExistingDIDKey].PublicKey, keys[ExistingDIDKey].PrivateKey)
-
-			resource, err := resourceSetup.SendCreateResource(msg, tc.signerKeys)
-			if tc.valid {
-				require.Nil(t, err)
+var _ = Describe("CreateResource", func() {
+	Describe("Validate", func() {
+		var setup resourcetests.TestSetup
+		var err error
+		keys := resourcetests.GenerateTestKeys()
+		BeforeEach(func() {
+			setup = resourcetests.Setup()
+			didDoc := setup.CreateDid(keys[resourcetests.ExistingDIDKey].PublicKey, resourcetests.ExistingDID)
+			_, err = setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey})
+			Expect(err).To(BeNil())
+			resourcePayload := resourcetests.GenerateCreateResourcePayload(resourcetests.ExistingResource())
+			_, err = setup.SendCreateResource(resourcePayload, map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey})
+			Expect(err).To(BeNil())
+		})
+		DescribeTable("Validate MsgCreateResource",
+			func(
+				valid bool,
+				signerKeys map[string]ed25519.PrivateKey,
+				msg *resourcetypes.MsgCreateResourcePayload,
+				mediaType string,
+				previousVersionId string,
+				errMsg string,
+			) {
+				resource, err := setup.SendCreateResource(msg, signerKeys)
+				if valid {
+					Expect(err).To(BeNil())
 
-				did := utils.JoinDID("cheqd", "test", resource.Header.CollectionId)
-				didStateValue, err := resourceSetup.Keeper.GetDid(&resourceSetup.Ctx, did)
-				require.Nil(t, err)
-				require.Contains(t, didStateValue.Metadata.Resources, resource.Header.Id)
+					did := cheqdutils.JoinDID("cheqd", "test", resource.Header.CollectionId)
+					didStateValue, err := setup.Keeper.GetDid(&setup.Ctx, did)
+					Expect(err).To(BeNil())
+					Expect(didStateValue.Metadata.Resources).Should(ContainElement(resource.Header.Id))
 
-				require.Equal(t, tc.msg.CollectionId, resource.Header.CollectionId)
-				require.Equal(t, tc.msg.Id, resource.Header.Id)
-				require.Equal(t, tc.mediaType, resource.Header.MediaType)
-				require.Equal(t, tc.msg.ResourceType, resource.Header.ResourceType)
-				require.Equal(t, tc.msg.Data, resource.Data)
-				require.Equal(t, tc.msg.Name, resource.Header.Name)
-				require.Equal(t, sha256.New().Sum(resource.Data), resource.Header.Checksum)
-				require.Equal(t, tc.previousVersionId, resource.Header.PreviousVersionId)
-			} else {
-				require.Error(t, err)
-				require.Equal(t, tc.errMsg, err.Error())
-			}
-		})
-	}
-}
+					Expect(resource.Header.CollectionId).To(Equal(msg.CollectionId))
+					Expect(resource.Header.Id).To(Equal(msg.Id))
+					Expect(resource.Header.Name).To(Equal(msg.Name))
+					Expect(resource.Header.ResourceType).To(Equal(msg.ResourceType))
+					Expect(resource.Header.MediaType).To(Equal(mediaType))
+					Expect(resource.Header.PreviousVersionId).To(Equal(previousVersionId))
+					expectedChecksum := sha256.Sum256(msg.Data)
+					Expect(resource.Header.Checksum).To(Equal(expectedChecksum[:]))
+				} else {
+					Expect(err).ToNot(BeNil())
+					Expect(err.Error()).To(Equal(errMsg))
+				}
+			},
+			Entry("Valid: Works",
+				true,
+				map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey},
+				&resourcetypes.MsgCreateResourcePayload{
+					CollectionId: resourcetests.ExistingDIDIdentifier,
+					Id:           resourcetests.ResourceId,
+					Name:         "Test Resource Name",
+					ResourceType: resourcetests.CLSchemaType,
+					Data:         []byte(resourcetests.SchemaData),
+				},
+				resourcetests.JsonResourceType,
+				"",
+				"",
+			),
+			Entry("Valid: Add new resource version",
+				true,
+				map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey},
+				&resourcetypes.MsgCreateResourcePayload{
+					CollectionId: resourcetests.ExistingResource().Header.CollectionId,
+					Id:           resourcetests.ResourceId,
+					Name:         resourcetests.ExistingResource().Header.Name,
+					ResourceType: resourcetests.ExistingResource().Header.ResourceType,
+					Data:         resourcetests.ExistingResource().Data,
+				},
+				resourcetests.ExistingResource().Header.MediaType,
+				resourcetests.ExistingResource().Header.Id,
+				"",
+			),
+			Entry("Invalid: No signature",
+				false,
+				map[string]ed25519.PrivateKey{},
+				&resourcetypes.MsgCreateResourcePayload{
+					CollectionId: resourcetests.ExistingDIDIdentifier,
+					Id:           resourcetests.ResourceId,
+					Name:         "Test Resource Name",
+					ResourceType: resourcetests.CLSchemaType,
+					Data:         []byte(resourcetests.SchemaData),
+				},
+				resourcetests.JsonResourceType,
+				"",
+				fmt.Errorf("signer: %s: signature is required but not found", resourcetests.ExistingDID).Error(),
+			),
+			Entry("Invalid: Resource Id is not an acceptable format",
+				false,
+				map[string]ed25519.PrivateKey{},
+				&resourcetypes.MsgCreateResourcePayload{
+					CollectionId: resourcetests.ExistingDIDIdentifier,
+					Id:           resourcetests.IncorrectResourceId,
+					Name:         "Test Resource Name",
+					ResourceType: resourcetests.CLSchemaType,
+					Data:         []byte(resourcetests.SchemaData),
+				},
+				resourcetests.JsonResourceType,
+				"",
+				fmt.Errorf("signer: %s: signature is required but not found", resourcetests.ExistingDID).Error(),
+			),
+			Entry("Invalid: DidDoc not found",
+				false,
+				map[string]ed25519.PrivateKey{},
+				&resourcetypes.MsgCreateResourcePayload{
+					CollectionId: resourcetests.NotFoundDIDIdentifier,
+					Id:           resourcetests.IncorrectResourceId,
+					Name:         "Test Resource Name",
+					ResourceType: resourcetests.CLSchemaType,
+					Data:         []byte(resourcetests.SchemaData),
+				},
+				resourcetests.JsonResourceType,
+				"",
+				fmt.Errorf("did:cheqd:test:%s: not found", resourcetests.NotFoundDIDIdentifier).Error(),
+			),
+		)
+	})
+})
diff --git a/x/resource/tests/query_all_resource_versions_test.go b/x/resource/tests/query_all_resource_versions_test.go
index fd90c72da..e70307963 100644
--- a/x/resource/tests/query_all_resource_versions_test.go
+++ b/x/resource/tests/query_all_resource_versions_test.go
@@ -1,99 +1,99 @@
-package tests
+package tests_test
 
 import (
 	"crypto/ed25519"
 	"fmt"
-	"testing"
 
-	cheqdtests "github.com/cheqd/cheqd-node/x/cheqd/tests"
+	resourcetests "github.com/cheqd/cheqd-node/x/resource/tests"
 	"github.com/cheqd/cheqd-node/x/resource/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/stretchr/testify/require"
-)
-
-func SendAnotherResourceVersion(t require.TestingT, resourceSetup TestSetup, keys map[string]cheqdtests.KeyPair) types.Resource {
-	newResourcePayload := GenerateCreateResourcePayload(ExistingResource())
-	newResourcePayload.Id = AnotherResourceId
-	didKey := map[string]ed25519.PrivateKey{
-		ExistingDIDKey: keys[ExistingDIDKey].PrivateKey,
-	}
-	newResourcePayload.Name = "AnotherResourceVersion"
-	createdResource, err := resourceSetup.SendCreateResource(newResourcePayload, didKey)
-	require.Nil(t, err)
 
-	return *createdResource
-}
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
 
-func TestQueryGetAllResourceVersions(t *testing.T) {
-	keys := GenerateTestKeys()
-	existingResource := ExistingResource()
-	cases := []struct {
-		valid    bool
-		name     string
-		msg      *types.QueryGetAllResourceVersionsRequest
-		response *types.QueryGetAllResourceVersionsResponse
-		errMsg   string
-	}{
-		{
-			valid: true,
-			name:  "Valid: Works",
-			msg: &types.QueryGetAllResourceVersionsRequest{
-				CollectionId: ExistingDIDIdentifier,
-				Name:         existingResource.Header.Name,
-			},
-			response: &types.QueryGetAllResourceVersionsResponse{
-				Resources: []*types.ResourceHeader{existingResource.Header},
-			},
-			errMsg: "",
-		},
-		{
-			valid: false,
-			name:  "Not Valid: DID Doc is not found",
-			msg: &types.QueryGetAllResourceVersionsRequest{
-				CollectionId: NotFoundDIDIdentifier,
-				Name:         existingResource.Header.Name,
-			},
-			response: nil,
-			errMsg:   fmt.Sprintf("did:cheqd:test:%s: DID Doc not found", NotFoundDIDIdentifier),
-		},
-	}
+var _ = Describe("QueryAllResourceVersions", func() {
+	Describe("Validate", func() {
+		var setup resourcetests.TestSetup
+		keys := resourcetests.GenerateTestKeys()
+		BeforeEach(func() {
+			setup = resourcetests.Setup()
+			didDoc := setup.CreateDid(keys[resourcetests.ExistingDIDKey].PublicKey, resourcetests.ExistingDID)
+			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey})
+			Expect(err).To(BeNil())
+			payload := resourcetests.GenerateCreateResourcePayload(resourcetests.ExistingResource())
+			_, err = setup.SendCreateResource(payload, map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey})
+			Expect(err).To(BeNil())
+		})
+		DescribeTable("Validate QueryGetAllResourceVersionsRequest",
+			func(
+				valid bool,
+				signerKeys map[string]ed25519.PrivateKey,
+				msg *types.QueryGetAllResourceVersionsRequest,
+				response *types.QueryGetAllResourceVersionsResponse,
+				errMsg string,
+			) {
+				existingResource := resourcetests.ExistingResource()
 
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			msg := tc.msg
-			resourceSetup := InitEnv(t, keys[ExistingDIDKey].PublicKey, keys[ExistingDIDKey].PrivateKey)
+				payload := resourcetests.GenerateCreateResourcePayload(existingResource)
+				payload.Id = resourcetests.ResourceId
 
-			newResourcePayload := GenerateCreateResourcePayload(ExistingResource())
-			newResourcePayload.Id = ResourceId
-			didKey := map[string]ed25519.PrivateKey{
-				ExistingDIDKey: keys[ExistingDIDKey].PrivateKey,
-			}
-			// Resource with the same version but another Id
-			createdResource, err := resourceSetup.SendCreateResource(newResourcePayload, didKey)
-			require.Nil(t, err)
+				nextVersionResource, err := setup.SendCreateResource(payload, signerKeys)
+				Expect(err).To(BeNil())
+				Expect(nextVersionResource).ToNot(Equal(existingResource))
 
-			// Send another Resource but with another Name (should affect the version choosing)
-			SendAnotherResourceVersion(t, resourceSetup, keys)
+				payload = resourcetests.GenerateCreateResourcePayload(existingResource)
+				payload.Id = resourcetests.AnotherResourceId
+				payload.Name = "AnotherResourceVersion"
+				differentResource, err := setup.SendCreateResource(payload, signerKeys)
+				Expect(err).To(BeNil())
+				Expect(differentResource).ToNot(Equal(existingResource))
+				Expect(differentResource).ToNot(Equal(nextVersionResource))
 
-			queryResponse, err := resourceSetup.QueryServer.AllResourceVersions(sdk.WrapSDKContext(resourceSetup.Ctx), msg)
+				queryResponse, err := setup.QueryServer.AllResourceVersions(sdk.WrapSDKContext(setup.Ctx), msg)
 
-			if tc.valid {
-				resources := queryResponse.Resources
-				existingResource.Header.NextVersionId = createdResource.Header.Id
-				expectedResources := map[string]types.Resource{
-					existingResource.Header.Id: existingResource,
-					createdResource.Header.Id:  *createdResource,
-				}
-				require.Nil(t, err)
-				require.Equal(t, len(expectedResources), len(resources))
-				for _, r := range resources {
-					r.Created = expectedResources[r.Id].Header.Created
-					require.Equal(t, r, expectedResources[r.Id].Header)
+				if valid {
+					resources := queryResponse.Resources
+					existingResource.Header.NextVersionId = nextVersionResource.Header.Id
+					expectedResources := map[string]types.Resource{
+						existingResource.Header.Id:    existingResource,
+						nextVersionResource.Header.Id: *nextVersionResource,
+					}
+					Expect(err).To(BeNil())
+					Expect(len(resources)).To(Equal(len(expectedResources)))
+					for _, r := range resources {
+						r.Created = expectedResources[r.Id].Header.Created
+						Expect(r).To(Equal(expectedResources[r.Id].Header))
+					}
+				} else {
+					Expect(err).ToNot(BeNil())
+					Expect(err.Error()).To(Equal(errMsg))
 				}
-			} else {
-				require.Error(t, err)
-				require.Equal(t, tc.errMsg, err.Error())
-			}
-		})
-	}
-}
+			},
+			Entry("Valid: should return all resources",
+				true,
+				map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey},
+				&types.QueryGetAllResourceVersionsRequest{
+					CollectionId: resourcetests.ExistingDIDIdentifier,
+					Name:         resourcetests.ExistingResource().Header.Name,
+				},
+				&types.QueryGetAllResourceVersionsResponse{
+					Resources: []*types.ResourceHeader{
+						resourcetests.ExistingResource().Header,
+					},
+				},
+				"",
+			),
+			Entry("Invalid: should return an error if the collection id is invalid",
+				false,
+				map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey},
+				&types.QueryGetAllResourceVersionsRequest{
+					CollectionId: resourcetests.NotFoundDIDIdentifier,
+					Name:         resourcetests.ExistingResource().Header.Name,
+				},
+				nil,
+				fmt.Errorf("did:cheqd:test:%s: DID Doc not found", resourcetests.NotFoundDIDIdentifier).Error(),
+			),
+		)
+	})
+})
diff --git a/x/resource/tests/query_collection_resources_test.go b/x/resource/tests/query_collection_resources_test.go
index a8f643f0c..abd7d6bff 100644
--- a/x/resource/tests/query_collection_resources_test.go
+++ b/x/resource/tests/query_collection_resources_test.go
@@ -1,66 +1,71 @@
-package tests
+package tests_test
 
 import (
+	"crypto/ed25519"
 	"fmt"
-	"testing"
 
-	"github.com/cheqd/cheqd-node/x/resource/types"
+	resourcetests "github.com/cheqd/cheqd-node/x/resource/tests"
+	resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/stretchr/testify/require"
-)
-
-func TestQueryGetCollectionResources(t *testing.T) {
-	keys := GenerateTestKeys()
-	existingResource := ExistingResource()
-	cases := []struct {
-		valid    bool
-		name     string
-		msg      *types.QueryGetCollectionResourcesRequest
-		response *types.QueryGetCollectionResourcesResponse
-		errMsg   string
-	}{
-		{
-			valid: true,
-			name:  "Valid: Works",
-			msg: &types.QueryGetCollectionResourcesRequest{
-				CollectionId: ExistingDIDIdentifier,
-			},
-			response: &types.QueryGetCollectionResourcesResponse{
-				Resources: []*types.ResourceHeader{existingResource.Header},
-			},
-			errMsg: "",
-		},
-		{
-			valid: false,
-			name:  "Not Valid: DID Doc is not found",
-			msg: &types.QueryGetCollectionResourcesRequest{
-				CollectionId: NotFoundDIDIdentifier,
-			},
-			response: nil,
-			errMsg:   fmt.Sprintf("did:cheqd:test:%s: DID Doc not found", NotFoundDIDIdentifier),
-		},
-	}
 
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			msg := tc.msg
-			resourceSetup := InitEnv(t, keys[ExistingDIDKey].PublicKey, keys[ExistingDIDKey].PrivateKey)
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
 
-			queryResponse, err := resourceSetup.QueryServer.CollectionResources(sdk.WrapSDKContext(resourceSetup.Ctx), msg)
+var _ = Describe("QueryCollectionResources", func() {
+	Describe("Validate", func() {
+		var setup resourcetests.TestSetup
+		keys := resourcetests.GenerateTestKeys()
+		BeforeEach(func() {
+			setup = resourcetests.Setup()
+			didDoc := setup.CreateDid(keys[resourcetests.ExistingDIDKey].PublicKey, resourcetests.ExistingDID)
+			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey})
+			Expect(err).To(BeNil())
+			payload := resourcetests.GenerateCreateResourcePayload(resourcetests.ExistingResource())
+			_, err = setup.SendCreateResource(payload, map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey})
+			Expect(err).To(BeNil())
+		})
+		DescribeTable("Validate QueryCollectionResources",
+			func(
+				valid bool,
+				msg *resourcetypes.QueryGetCollectionResourcesRequest,
+				response *resourcetypes.QueryGetCollectionResourcesResponse,
+				errMsg string,
+			) {
+				queryResponse, err := setup.QueryServer.CollectionResources(sdk.WrapSDKContext(setup.Ctx), msg)
 
-			if tc.valid {
-				resources := queryResponse.Resources
-				expectedResources := tc.response.Resources
-				require.Nil(t, err)
-				require.Equal(t, len(expectedResources), len(resources))
-				for i, r := range resources {
-					r.Created = expectedResources[i].Created
-					require.Equal(t, expectedResources[i], r)
+				if valid {
+					resources := queryResponse.Resources
+					expectedResources := response.Resources
+					Expect(err).To(BeNil())
+					Expect(len(expectedResources)).To(Equal(len(resources)))
+					for i, r := range resources {
+						r.Created = expectedResources[i].Created
+						Expect(expectedResources[i]).To(Equal(r))
+					}
+				} else {
+					Expect(err).To(HaveOccurred())
+					Expect(errMsg).To(Equal(err.Error()))
 				}
-			} else {
-				require.Error(t, err)
-				require.Equal(t, tc.errMsg, err.Error())
-			}
-		})
-	}
-}
+			},
+			Entry("Valid: Works",
+				true,
+				&resourcetypes.QueryGetCollectionResourcesRequest{
+					CollectionId: resourcetests.ExistingDIDIdentifier,
+				},
+				&resourcetypes.QueryGetCollectionResourcesResponse{
+					Resources: []*resourcetypes.ResourceHeader{resourcetests.ExistingResource().Header},
+				},
+				"",
+			),
+			Entry("Invalid: DID Doc is not found",
+				false,
+				&resourcetypes.QueryGetCollectionResourcesRequest{
+					CollectionId: resourcetests.NotFoundDIDIdentifier,
+				},
+				nil,
+				fmt.Errorf("did:cheqd:test:%s: DID Doc not found", resourcetests.NotFoundDIDIdentifier).Error(),
+			),
+		)
+	})
+})
diff --git a/x/resource/tests/query_resource_test.go b/x/resource/tests/query_resource_test.go
index 1cfd044f4..0abe65791 100644
--- a/x/resource/tests/query_resource_test.go
+++ b/x/resource/tests/query_resource_test.go
@@ -1,84 +1,87 @@
-package tests
+package tests_test
 
 import (
-
-	// "crypto/sha256"
+	"crypto/ed25519"
 	"crypto/sha256"
 	"fmt"
-	"testing"
 
-	"github.com/cheqd/cheqd-node/x/resource/types"
+	resourcetests "github.com/cheqd/cheqd-node/x/resource/tests"
+	resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/stretchr/testify/require"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 )
 
-func TestQueryGetResource(t *testing.T) {
-	keys := GenerateTestKeys()
-	existingResource := ExistingResource()
-	cases := []struct {
-		valid    bool
-		name     string
-		msg      *types.QueryGetResourceRequest
-		response *types.QueryGetResourceResponse
-		errMsg   string
-	}{
-		{
-			valid: true,
-			name:  "Valid: Works",
-			msg: &types.QueryGetResourceRequest{
-				CollectionId: ExistingDIDIdentifier,
-				Id:           existingResource.Header.Id,
-			},
-			response: &types.QueryGetResourceResponse{
-				Resource: &existingResource,
-			},
-			errMsg: "",
-		},
-		{
-			valid: false,
-			name:  "Not Valid: Resource is not found",
-			msg: &types.QueryGetResourceRequest{
-				CollectionId: ExistingDIDIdentifier,
-				Id:           ResourceId,
-			},
-			response: nil,
-			errMsg:   fmt.Sprintf("resource %s:%s: not found", ExistingDIDIdentifier, ResourceId),
-		},
-		{
-			valid: false,
-			name:  "Not Valid: DID Doc is not found",
-			msg: &types.QueryGetResourceRequest{
-				CollectionId: NotFoundDIDIdentifier,
-				Id:           existingResource.Header.Id,
-			},
-			response: nil,
-			errMsg:   fmt.Sprintf("did:cheqd:test:%s: DID Doc not found", NotFoundDIDIdentifier),
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			msg := tc.msg
-			resourceSetup := InitEnv(t, keys[ExistingDIDKey].PublicKey, keys[ExistingDIDKey].PrivateKey)
-
-			queryResponse, err := resourceSetup.QueryServer.Resource(sdk.WrapSDKContext(resourceSetup.Ctx), msg)
-
-			if tc.valid {
-				resource := queryResponse.Resource
-				require.Nil(t, err)
-				require.Equal(t, tc.response.Resource.Header.CollectionId, resource.Header.CollectionId)
-				require.Equal(t, tc.response.Resource.Header.Id, resource.Header.Id)
-				require.Equal(t, tc.response.Resource.Header.MediaType, resource.Header.MediaType)
-				require.Equal(t, tc.response.Resource.Header.ResourceType, resource.Header.ResourceType)
-				require.Equal(t, tc.response.Resource.Data, resource.Data)
-				require.Equal(t, tc.response.Resource.Header.Name, resource.Header.Name)
-				require.Equal(t, sha256.New().Sum(tc.response.Resource.Data), resource.Header.Checksum)
-				require.Equal(t, tc.response.Resource.Header.PreviousVersionId, resource.Header.PreviousVersionId)
-				require.Equal(t, tc.response.Resource.Header.NextVersionId, resource.Header.NextVersionId)
-			} else {
-				require.Error(t, err)
-				require.Equal(t, tc.errMsg, err.Error())
-			}
+var _ = Describe("QueryGetResource", func() {
+	Describe("Validate", func() {
+		var setup resourcetests.TestSetup
+		keys := resourcetests.GenerateTestKeys()
+		existingResource := resourcetests.ExistingResource()
+		BeforeEach(func() {
+			setup = resourcetests.Setup()
+			didDoc := setup.CreateDid(keys[resourcetests.ExistingDIDKey].PublicKey, resourcetests.ExistingDID)
+			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey})
+			Expect(err).To(BeNil())
+			payload := resourcetests.GenerateCreateResourcePayload(resourcetests.ExistingResource())
+			_, err = setup.SendCreateResource(payload, map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey})
+			Expect(err).To(BeNil())
 		})
-	}
-}
+		DescribeTable("Validate QueryGetResourceRequest",
+			func(
+				valid bool,
+				msg *resourcetypes.QueryGetResourceRequest,
+				response *resourcetypes.QueryGetResourceResponse,
+				errMsg string,
+			) {
+				queryResponse, err := setup.QueryServer.Resource(sdk.WrapSDKContext(setup.Ctx), msg)
+
+				if valid {
+					resource := queryResponse.Resource
+					Expect(err).To(BeNil())
+					Expect(response.Resource.Header.CollectionId).To(Equal(resource.Header.CollectionId))
+					Expect(response.Resource.Header.Id).To(Equal(resource.Header.Id))
+					Expect(response.Resource.Header.MediaType).To(Equal(resource.Header.MediaType))
+					Expect(response.Resource.Header.ResourceType).To(Equal(resource.Header.ResourceType))
+					Expect(response.Resource.Data).To(Equal(resource.Data))
+					Expect(response.Resource.Header.Name).To(Equal(resource.Header.Name))
+					checksum := sha256.Sum256(response.Resource.Data)
+					Expect(checksum[:]).To(Equal(resource.Header.Checksum))
+					Expect(response.Resource.Header.PreviousVersionId).To(Equal(resource.Header.PreviousVersionId))
+					Expect(response.Resource.Header.NextVersionId).To(Equal(resource.Header.NextVersionId))
+				} else {
+					Expect(err).To(HaveOccurred())
+					Expect(err.Error()).To(Equal(errMsg))
+				}
+			},
+			Entry("Valid: Works",
+				true,
+				&resourcetypes.QueryGetResourceRequest{
+					CollectionId: resourcetests.ExistingDIDIdentifier,
+					Id:           existingResource.Header.Id,
+				},
+				&resourcetypes.QueryGetResourceResponse{
+					Resource: &existingResource,
+				},
+				"",
+			),
+			Entry("Invalid: Resource not found",
+				false,
+				&resourcetypes.QueryGetResourceRequest{
+					CollectionId: resourcetests.ExistingDIDIdentifier,
+					Id:           resourcetests.AnotherResourceId,
+				},
+				nil,
+				fmt.Errorf("resource %s:%s: not found", resourcetests.ExistingDIDIdentifier, resourcetests.AnotherResourceId).Error(),
+			),
+			Entry("Invalid: DIDDoc not found",
+				false,
+				&resourcetypes.QueryGetResourceRequest{
+					CollectionId: resourcetests.NotFoundDIDIdentifier,
+					Id:           existingResource.Header.Id,
+				},
+				nil,
+				fmt.Errorf("did:cheqd:test:%s: DID Doc not found", resourcetests.NotFoundDIDIdentifier).Error(),
+			),
+		)
+	})
+})
diff --git a/x/resource/tests/setup.go b/x/resource/tests/setup.go
index 1709e37f2..e7259e0ef 100644
--- a/x/resource/tests/setup.go
+++ b/x/resource/tests/setup.go
@@ -4,7 +4,7 @@ import (
 	"crypto/ed25519"
 	"crypto/rand"
 	"encoding/base64"
-	"testing"
+	// "testing"
 	"time"
 
 	"github.com/cheqd/cheqd-node/x/cheqd"
@@ -15,7 +15,7 @@ import (
 	"github.com/cheqd/cheqd-node/x/resource"
 	"github.com/cheqd/cheqd-node/x/resource/types"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-	"github.com/stretchr/testify/require"
+	// "github.com/stretchr/testify/require"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/store"
@@ -127,7 +127,7 @@ func (s *TestSetup) SendCreateResource(msg *types.MsgCreateResourcePayload, keys
 	return &created, nil
 }
 
-func InitEnv(t *testing.T, publicKey ed25519.PublicKey, privateKey ed25519.PrivateKey) TestSetup {
+/* func InitEnv(t *testing.T, publicKey ed25519.PublicKey, privateKey ed25519.PrivateKey) TestSetup {
 	resourceSetup := Setup()
 
 	didDoc := resourceSetup.CreateDid(publicKey, ExistingDID)
@@ -139,7 +139,7 @@ func InitEnv(t *testing.T, publicKey ed25519.PublicKey, privateKey ed25519.Priva
 	require.NoError(t, err)
 
 	return resourceSetup
-}
+} */
 
 func GenerateTestKeys() map[string]cheqdtests.KeyPair {
 	return map[string]cheqdtests.KeyPair{
diff --git a/x/resource/tests/tests_suite_test.go b/x/resource/tests/tests_suite_test.go
new file mode 100644
index 000000000..3b0acded2
--- /dev/null
+++ b/x/resource/tests/tests_suite_test.go
@@ -0,0 +1,13 @@
+package tests_test
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+func TestTests(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Tests Suite")
+}
diff --git a/x/resource/types/tx_msg_create_resource_payload_test.go b/x/resource/types/tx_msg_create_resource_payload_test.go
index 26fb75ab6..53c82a40b 100644
--- a/x/resource/types/tx_msg_create_resource_payload_test.go
+++ b/x/resource/types/tx_msg_create_resource_payload_test.go
@@ -1,53 +1,38 @@
-package types
+package types_test
 
 import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
+	resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 )
 
-func TestMsgCreateResourcePayloadValidation(t *testing.T) {
-	cases := []struct {
-		name     string
-		struct_  *MsgCreateResourcePayload
-		isValid  bool
-		errorMsg string
-	}{
-		{
-			name: "positive",
-			struct_: &MsgCreateResourcePayload{
-				CollectionId: "123456789abcdefg",
-				Id:           "ba62c728-cb15-498b-8e9e-9259cc242186",
-				Name:         "Test Resource",
-				ResourceType: "CL-Schema",
-				Data:         []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
-			},
-			isValid: true,
-		},
-		{
-			name: "negative resource type",
-			struct_: &MsgCreateResourcePayload{
-				CollectionId: "123456789abcdefg",
-				Id:           "ba62c728-cb15-498b-8e9e-9259cc242186",
-				Name:         "Test Resource",
-				ResourceType: "",
-				Data:         []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
-			},
-			isValid:  false,
-			errorMsg: "resource_type: cannot be blank.",
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := tc.struct_.Validate()
+var _ = Describe("TxMsgCreateResourcePayload", func() {
+	var msg *resourcetypes.MsgCreateResourcePayload
+	Describe("Validate", func() {
+		Context("Valid: MsgCreateResourcePayload", func() {
+			It("should return nil if the message is valid", func() {
+				msg = &resourcetypes.MsgCreateResourcePayload{
+					CollectionId: "123456789abcdefg",
+					Id:           "ba62c728-cb15-498b-8e9e-9259cc242186",
+					Name:         "Test Resource",
+					ResourceType: "CL-Schema",
+					Data:         []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
+				}
+				Expect(msg.Validate()).To(BeNil())
+			})
+		})
 
-			if tc.isValid {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-				require.Equal(t, err.Error(), tc.errorMsg)
-			}
+		Context("Invalid: MsgCreateResourcePayload", func() {
+			It("should return error if the resource type is empty", func() {
+				msg = &resourcetypes.MsgCreateResourcePayload{
+					CollectionId: "123456789abcdefg",
+					Id:           "ba62c728-cb15-498b-8e9e-9259cc242186",
+					Name:         "Test Resource",
+					ResourceType: "",
+					Data:         []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
+				}
+				Expect(msg.Validate().Error()).To(Equal("resource_type: cannot be blank."))
+			})
 		})
-	}
-}
+	})
+})
diff --git a/x/resource/types/types_suite_test.go b/x/resource/types/types_suite_test.go
new file mode 100644
index 000000000..b1cf86cdb
--- /dev/null
+++ b/x/resource/types/types_suite_test.go
@@ -0,0 +1,13 @@
+package types_test
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+func TestTypes(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Resource Types Suite")
+}
diff --git a/x/resource/utils/media_type_test.go b/x/resource/utils/media_type_test.go
index becbc3578..41f3519e7 100644
--- a/x/resource/utils/media_type_test.go
+++ b/x/resource/utils/media_type_test.go
@@ -1,32 +1,30 @@
-package utils
+package utils_test
 
 import (
 	"os"
-	"testing"
 
-	"github.com/stretchr/testify/require"
-)
-
-func TestValidateMediaType(t *testing.T) {
-	cases := []struct {
-		path string
-		mt   string
-	}{
-		{"testdata/resource.txt", "text/plain; charset=utf-8"},
-		{"testdata/resource.csv", "text/csv"},
-		{"testdata/resource.dat", "application/octet-stream"},
-		{"testdata/resource.json", "application/json"},
-		{"testdata/resource.pdf", "application/pdf"},
-	}
+	resourceutils "github.com/cheqd/cheqd-node/x/resource/utils"
 
-	for _, tc := range cases {
-		t.Run(tc.mt, func(t *testing.T) {
-			data, err := os.ReadFile(tc.path)
-			require.NoError(t, err)
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
 
-			detected := DetectMediaType(data)
+var _ = Describe("MediaType", func() {
+	Describe("GetMediaType", func() {
+		DescribeTable("Validate MIME type for different source files",
+			func(path string, mt string) {
+				data, err := os.ReadFile(path)
+				Expect(err).To(BeNil())
 
-			require.Equal(t, tc.mt, detected)
-		})
-	}
-}
+				detected := resourceutils.DetectMediaType(data)
+				Expect(detected).To(Equal(mt))
+			},
+			Entry("text file", "testdata/resource.txt", "text/plain; charset=utf-8"),
+			Entry("csv file", "testdata/resource.csv", "text/csv"),
+			Entry("dat file", "testdata/resource.dat", "application/octet-stream"),
+			Entry("json file", "testdata/resource.json", "application/json"),
+			Entry("pdf file", "testdata/resource.pdf", "application/pdf"),
+			Entry("png file", "testdata/resource.png", "image/png"),
+		)
+	})
+})
diff --git a/x/resource/utils/testdata/resource.png b/x/resource/utils/testdata/resource.png
new file mode 100644
index 0000000000000000000000000000000000000000..eca57ae580fe933f9e54cea3156074f6c39fd5aa
GIT binary patch
literal 98198
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%0Atn&m4cxp{Io
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%0AomabJYHL1mz;|^
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

literal 0
HcmV?d00001

diff --git a/x/resource/utils/utils_suite_test.go b/x/resource/utils/utils_suite_test.go
new file mode 100644
index 000000000..5c7bf50ab
--- /dev/null
+++ b/x/resource/utils/utils_suite_test.go
@@ -0,0 +1,13 @@
+package utils_test
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+func TestUtils(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Resource Utils Suite")
+}

From 34d9c860cc8f5d2c5515fc3702fa801feabde98f Mon Sep 17 00:00:00 2001
From: Tasos <50984242+Eengineer1@users.noreply.github.com>
Date: Fri, 7 Oct 2022 22:16:27 +0300
Subject: [PATCH 18/76] Removed bloat

---
 x/resource/tests/setup.go | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/x/resource/tests/setup.go b/x/resource/tests/setup.go
index e7259e0ef..b0944ff4f 100644
--- a/x/resource/tests/setup.go
+++ b/x/resource/tests/setup.go
@@ -4,7 +4,6 @@ import (
 	"crypto/ed25519"
 	"crypto/rand"
 	"encoding/base64"
-	// "testing"
 	"time"
 
 	"github.com/cheqd/cheqd-node/x/cheqd"
@@ -15,7 +14,6 @@ import (
 	"github.com/cheqd/cheqd-node/x/resource"
 	"github.com/cheqd/cheqd-node/x/resource/types"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-	// "github.com/stretchr/testify/require"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/store"
@@ -127,20 +125,6 @@ func (s *TestSetup) SendCreateResource(msg *types.MsgCreateResourcePayload, keys
 	return &created, nil
 }
 
-/* func InitEnv(t *testing.T, publicKey ed25519.PublicKey, privateKey ed25519.PrivateKey) TestSetup {
-	resourceSetup := Setup()
-
-	didDoc := resourceSetup.CreateDid(publicKey, ExistingDID)
-	_, err := resourceSetup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: privateKey})
-	require.NoError(t, err)
-
-	resourcePayload := GenerateCreateResourcePayload(ExistingResource())
-	_, err = resourceSetup.SendCreateResource(resourcePayload, map[string]ed25519.PrivateKey{ExistingDIDKey: privateKey})
-	require.NoError(t, err)
-
-	return resourceSetup
-} */
-
 func GenerateTestKeys() map[string]cheqdtests.KeyPair {
 	return map[string]cheqdtests.KeyPair{
 		ExistingDIDKey: cheqdtests.GenerateKeyPair(),

From 6de20fa2f9009fd33296915e007065e2f43ab6e7 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Mon, 10 Oct 2022 14:31:56 +0300
Subject: [PATCH 19/76] Add tests for type module

---
 x/cheqd/types/did_did_test.go                 | 347 ++++++------
 x/cheqd/types/did_service_test.go             |  41 +-
 x/cheqd/types/did_verification_method_test.go | 499 ++++++++++--------
 x/cheqd/types/stateValue_test.go              | 147 +++---
 x/cheqd/types/tx_msg_create_did_test.go       |  79 +--
 x/cheqd/types/tx_msg_update_did_test.go       |  96 ++--
 x/cheqd/types/tx_sign_ingo_test.go            | 189 ++++---
 7 files changed, 750 insertions(+), 648 deletions(-)

diff --git a/x/cheqd/types/did_did_test.go b/x/cheqd/types/did_did_test.go
index eda878553..aff9bf21f 100644
--- a/x/cheqd/types/did_did_test.go
+++ b/x/cheqd/types/did_did_test.go
@@ -34,197 +34,220 @@ var _ = Describe("DID Validation tests", func() {
 			}
 	})
 
-	It("Valid: Id: allowed DID", func() {
-		struct_ = &Did{
-			Id: ValidTestDID,
-			VerificationMethod: []*VerificationMethod{
-				{
-					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-					Type:               "Ed25519VerificationKey2020",
-					Controller:         ValidTestDID,
-					PublicKeyJwk:       nil,
-					PublicKeyMultibase: ValidEd25519PubKey,
+	When("DID is allowed", func() {
+		It("is valid", func() {
+			struct_ = &Did{
+				Id: ValidTestDID,
+				VerificationMethod: []*VerificationMethod{
+					{
+						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+						Type:               "Ed25519VerificationKey2020",
+						Controller:         ValidTestDID,
+						PublicKeyJwk:       nil,
+						PublicKeyMultibase: ValidEd25519PubKey,
+					},
 				},
-			},
-		}
-		isValid =  true
-		errorMsg = ""
+			}
+			isValid =  true
+			errorMsg = ""
+		})
 	})
 
-	It("Not valid: Id: not allowed DID", func() {
-		struct_ = &Did{
-			Id: InvalidTestDID,
-			VerificationMethod: []*VerificationMethod{
-				{
-					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-					Type:               "Ed25519VerificationKey2020",
-					Controller:         ValidTestDID,
-					PublicKeyJwk:       nil,
-					PublicKeyMultibase: ValidEd25519PubKey,
+	When("DID is not allowed", func() {
+		It("should fail with error", func() {
+			struct_ = &Did{
+				Id: InvalidTestDID,
+				VerificationMethod: []*VerificationMethod{
+					{
+						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+						Type:               "Ed25519VerificationKey2020",
+						Controller:         ValidTestDID,
+						PublicKeyJwk:       nil,
+						PublicKeyMultibase: ValidEd25519PubKey,
+					},
 				},
-			},
-		}
-		isValid = false
-		errorMsg = "id: unable to split did into method, namespace and id; verification_method: (0: (id: must have prefix: badDid.).)."
+			}
+			isValid = false
+			errorMsg = "id: unable to split did into method, namespace and id; verification_method: (0: (id: must have prefix: badDid.).)."
+		})
 	})
 
-	It("Valid: Verification Method: all is fine with type Ed25519VerificationKey2020", func() {
-		struct_ = &Did{
-			Id: ValidTestDID,
-			VerificationMethod: []*VerificationMethod{
-				{
-					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-					Type:               "Ed25519VerificationKey2020",
-					Controller:         ValidTestDID,
-					PublicKeyJwk:       nil,
-					PublicKeyMultibase: ValidEd25519PubKey,
+	When("Verification method is Ed25519VerificationKey2020", func() {
+		It("is valid", func() {
+			struct_ = &Did{
+				Id: ValidTestDID,
+				VerificationMethod: []*VerificationMethod{
+					{
+						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+						Type:               "Ed25519VerificationKey2020",
+						Controller:         ValidTestDID,
+						PublicKeyJwk:       nil,
+						PublicKeyMultibase: ValidEd25519PubKey,
+					},
 				},
-			},
-		}
-		isValid = true
-		errorMsg = ""
+			}
+			isValid = true
+			errorMsg = ""
+		})
 	})
 
-	It("Valid: Verification Method: all is fine with type jwk", func() {
-		struct_ = &Did{
-			Id: ValidTestDID,
-			VerificationMethod: []*VerificationMethod{
-				{
-					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-					Type:               "JsonWebKey2020",
-					Controller:         ValidTestDID,
-					PublicKeyJwk:       ValidPublicKeyJWK,
-					PublicKeyMultibase: "",
+	When("Verification method is jwk", func() {
+		It("is valid", func() {
+			struct_ = &Did{
+				Id: ValidTestDID,
+				VerificationMethod: []*VerificationMethod{
+					{
+						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+						Type:               "JsonWebKey2020",
+						Controller:         ValidTestDID,
+						PublicKeyJwk:       ValidPublicKeyJWK,
+						PublicKeyMultibase: "",
+					},
 				},
-			},
-		}
-		isValid = true
-		errorMsg = ""
+			}
+			isValid = true
+			errorMsg = ""
+		})
 	})
 
-	It("Not valid: Verification Method: Wrong id", func() {
-		struct_ = &Did{
-			Id: ValidTestDID,
-			VerificationMethod: []*VerificationMethod{
-				{
-					Id:                 InvalidTestDID,
-					Type:               "JsonWebKey2020",
-					Controller:         ValidTestDID,
-					PublicKeyJwk:       ValidPublicKeyJWK,
-					PublicKeyMultibase: "",
+	When("verification method has wrong id", func() {
+		It("should fail with corresponding error", func() {
+			struct_ = &Did{
+				Id: ValidTestDID,
+				VerificationMethod: []*VerificationMethod{
+					{
+						Id:                 InvalidTestDID,
+						Type:               "JsonWebKey2020",
+						Controller:         ValidTestDID,
+						PublicKeyJwk:       ValidPublicKeyJWK,
+						PublicKeyMultibase: "",
+					},
 				},
-			},
-		}
-		isValid = false
-		errorMsg = "verification_method: (0: (id: unable to split did into method, namespace and id.).)."
+			}
+			isValid = false
+			errorMsg = "verification_method: (0: (id: unable to split did into method, namespace and id.).)."
+		})
 	})
-
-	It("Not valid: Verification Method: Wrong controller", func() {
-		struct_ = &Did{
-			Id: ValidTestDID,
-			VerificationMethod: []*VerificationMethod{
-				{
-					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-					Type:               "JsonWebKey2020",
-					Controller:         InvalidTestDID,
-					PublicKeyJwk:       ValidPublicKeyJWK,
-					PublicKeyMultibase: "",
+	When("verification method has wrong controller", func() {
+		It("should fail with corresponding error", func() {
+			struct_ = &Did{
+				Id: ValidTestDID,
+				VerificationMethod: []*VerificationMethod{
+					{
+						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+						Type:               "JsonWebKey2020",
+						Controller:         InvalidTestDID,
+						PublicKeyJwk:       ValidPublicKeyJWK,
+						PublicKeyMultibase: "",
+					},
 				},
-			},
-		}
-		isValid = false
-		errorMsg = "verification_method: (0: (controller: unable to split did into method, namespace and id.).)."
+			}
+			isValid = false
+			errorMsg = "verification_method: (0: (controller: unable to split did into method, namespace and id.).)."
+		})
 	})
 
-	It("Valid: Controller: List of DIDs allowed", func() {
-		struct_ = &Did{
-			Id:         ValidTestDID,
-			Controller: []string{ValidTestDID, ValidTestDID2},
-			VerificationMethod: []*VerificationMethod{
-				{
-					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-					Type:               "Ed25519VerificationKey2020",
-					Controller:         ValidTestDID,
-					PublicKeyMultibase: ValidEd25519PubKey,
+	When("list of DIDs in cotroller is allowed", func() {
+		It("s valid", func() {
+			struct_ = &Did{
+				Id:         ValidTestDID,
+				Controller: []string{ValidTestDID, ValidTestDID2},
+				VerificationMethod: []*VerificationMethod{
+					{
+						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+						Type:               "Ed25519VerificationKey2020",
+						Controller:         ValidTestDID,
+						PublicKeyMultibase: ValidEd25519PubKey,
+					},
 				},
-			},
-		}
-		isValid = true
-		errorMsg = ""
+			}
+			isValid = true
+			errorMsg = ""
+		})
 	})
 
-	It("Not valid: Controller: List of DIDs is not allowed", func() {
-		struct_ = &Did{
-			Context:    nil,
-			Id:         ValidTestDID,
-			Controller: []string{ValidTestDID, InvalidTestDID},
-			VerificationMethod: []*VerificationMethod{
-				{
-					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-					Type:               "Ed25519VerificationKey2020",
-					Controller:         ValidTestDID,
-					PublicKeyMultibase: ValidEd25519PubKey,
+	When("list of DIDs in cotroller is not allowed", func() {
+		It("should fail with corresponding error", func() {
+			struct_ = &Did{
+				Context:    nil,
+				Id:         ValidTestDID,
+				Controller: []string{ValidTestDID, InvalidTestDID},
+				VerificationMethod: []*VerificationMethod{
+					{
+						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+						Type:               "Ed25519VerificationKey2020",
+						Controller:         ValidTestDID,
+						PublicKeyMultibase: ValidEd25519PubKey,
+					},
 				},
-			},
-		}
-		isValid = false
-		errorMsg = "controller: (1: unable to split did into method, namespace and id.)."
+			}
+			isValid = false
+			errorMsg = "controller: (1: unable to split did into method, namespace and id.)."
+		})
 	})
 
-	It("Allowed namespaces: Negative", func() {
-		struct_ = &Did{
-			Id:         ValidTestDID,
-			Controller: []string{ValidTestDID},
-			VerificationMethod: []*VerificationMethod{
-				{
-					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-					Type:               "Ed25519VerificationKey2020",
-					Controller:         ValidTestDID,
-					PublicKeyMultibase: ValidEd25519PubKey,
+	When("namespace in controleer is not in list of allowed", func() {
+		It("should fail", func() {
+			struct_ = &Did{
+				Id:         ValidTestDID,
+				Controller: []string{ValidTestDID},
+				VerificationMethod: []*VerificationMethod{
+					{
+						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+						Type:               "Ed25519VerificationKey2020",
+						Controller:         ValidTestDID,
+						PublicKeyMultibase: ValidEd25519PubKey,
+					},
 				},
-			},
-		}
-		allowedNamespaces = []string{"mainnet"}
-		isValid = false
-		errorMsg = "controller: (0: did namespace must be one of: mainnet.); id: did namespace must be one of: mainnet; verification_method: (0: (controller: did namespace must be one of: mainnet; id: did namespace must be one of: mainnet.).)."
+			}
+			allowedNamespaces = []string{"mainnet"}
+			isValid = false
+			errorMsg = "controller: (0: did namespace must be one of: mainnet.); id: did namespace must be one of: mainnet; verification_method: (0: (controller: did namespace must be one of: mainnet; id: did namespace must be one of: mainnet.).)."
+		})
 	})
 
-	It("Controller duplicated: negative", func() {
-		struct_ = &Did{
-			Id:         ValidTestDID,
-			Controller: []string{ValidTestDID, ValidTestDID},
-			VerificationMethod: []*VerificationMethod{
-				{
-					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-					Type:               "Ed25519VerificationKey2020",
-					Controller:         ValidTestDID,
-					PublicKeyMultibase: ValidEd25519PubKey,
+	When("controller is duplicated", func() {
+
+		It("should fail", func() {
+			struct_ = &Did{
+				Id:         ValidTestDID,
+				Controller: []string{ValidTestDID, ValidTestDID},
+				VerificationMethod: []*VerificationMethod{
+					{
+						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+						Type:               "Ed25519VerificationKey2020",
+						Controller:         ValidTestDID,
+						PublicKeyMultibase: ValidEd25519PubKey,
+					},
 				},
-			},
-		}
-		isValid = false
-		errorMsg = "controller: there should be no duplicates."
+			}
+			isValid = false
+			errorMsg = "controller: there should be no duplicates."
+		})
 	})
 
-	It("VM duplicated: negative", func() {
-		struct_ = &Did{
-			Id: ValidTestDID,
-			VerificationMethod: []*VerificationMethod{
-				{
-					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-					Type:               "Ed25519VerificationKey2020",
-					Controller:         ValidTestDID,
-					PublicKeyMultibase: ValidEd25519PubKey,
+	When("verification method is duplicated", func() {
+
+		It("should fail", func() {
+			struct_ = &Did{
+				Id: ValidTestDID,
+				VerificationMethod: []*VerificationMethod{
+					{
+						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+						Type:               "Ed25519VerificationKey2020",
+						Controller:         ValidTestDID,
+						PublicKeyMultibase: ValidEd25519PubKey,
+					},
+					{
+						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+						Type:               "Ed25519VerificationKey2020",
+						Controller:         ValidTestDID,
+						PublicKeyMultibase: ValidEd25519PubKey,
+					},
 				},
-				{
-					Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-					Type:               "Ed25519VerificationKey2020",
-					Controller:         ValidTestDID,
-					PublicKeyMultibase: ValidEd25519PubKey,
-				},
-			},
-		}
-		isValid = false
-		errorMsg = "verification_method: there are verification method duplicates."
+			}
+			isValid = false
+			errorMsg = "verification_method: there are verification method duplicates."
+		})
 	})
 })
diff --git a/x/cheqd/types/did_service_test.go b/x/cheqd/types/did_service_test.go
index ce854a72d..d15928a36 100644
--- a/x/cheqd/types/did_service_test.go
+++ b/x/cheqd/types/did_service_test.go
@@ -46,25 +46,30 @@ var _ = Describe("DID Validation tests", func() {
 		errorMsg = ""
 	})
 
-	It("Negative: namespace", func() {
-		struct_ = Service{
-			Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
-			Type:            "DIDCommMessaging",
-			ServiceEndpoint: "endpoint",
-		}
-		allowedNamespaces = []string{"mainnet"}
-		isValid = false
-		errorMsg = "id: did namespace must be one of: mainnet."
+	When("Namespace is not allowed", func() {
+
+		It("should fail", func() {
+			struct_ = Service{
+				Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
+				Type:            "DIDCommMessaging",
+				ServiceEndpoint: "endpoint",
+			}
+			allowedNamespaces = []string{"mainnet"}
+			isValid = false
+			errorMsg = "id: did namespace must be one of: mainnet."
+		})
 	})
 
-	It("Negative: Base did", func() {
-		struct_ = Service{
-			Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
-			Type:            "DIDCommMessaging",
-			ServiceEndpoint: "endpoint",
-		}
-		baseDid = "did:cheqd:baaaaaaaaaaaaaab"
-		isValid = false
-		errorMsg = "id: must have prefix: did:cheqd:baaaaaaaaaaaaaab."
+	When("base DID is not the same as in id", func() {
+		It("should fail", func() {
+			struct_ = Service{
+				Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
+				Type:            "DIDCommMessaging",
+				ServiceEndpoint: "endpoint",
+			}
+			baseDid = "did:cheqd:baaaaaaaaaaaaaab"
+			isValid = false
+			errorMsg = "id: must have prefix: did:cheqd:baaaaaaaaaaaaaab."
+		})
 	})
 })
diff --git a/x/cheqd/types/did_verification_method_test.go b/x/cheqd/types/did_verification_method_test.go
index f2242d3ef..067d886e2 100644
--- a/x/cheqd/types/did_verification_method_test.go
+++ b/x/cheqd/types/did_verification_method_test.go
@@ -1,4 +1,4 @@
-package types
+package types_test
 
 import (
 	"crypto"
@@ -6,292 +6,323 @@ import (
 	"crypto/ed25519"
 	"crypto/elliptic"
 	"crypto/rand"
+
 	"crypto/rsa"
 	"encoding/json"
-	"testing"
 
+	. "github.com/cheqd/cheqd-node/x/cheqd/types"
 	"github.com/lestrrat-go/jwx/jwk"
 	"github.com/multiformats/go-multibase"
-	"github.com/stretchr/testify/require"
-)
-
-type TestJWKKey struct {
-	Kty string `json:"kty"`
-	N   string `json:"n"`
-	Use string `json:"use"`
-	Alg string `json:"alg"`
-	E   string `json:"e"`
-	Kid string `json:"kid"`
-}
-
-var ValidJWKKey = TestJWKKey{
-	Kty: "RSA",
-	N:   "o76AudS2rsCvlz_3D47sFkpuz3NJxgLbXr1cHdmbo9xOMttPMJI97f0rHiSl9stltMi87KIOEEVQWUgMLaWQNaIZThgI1seWDAGRw59AO5sctgM1wPVZYt40fj2Qw4KT7m4RLMsZV1M5NYyXSd1lAAywM4FT25N0RLhkm3u8Hehw2Szj_2lm-rmcbDXzvjeXkodOUszFiOqzqBIS0Bv3c2zj2sytnozaG7aXa14OiUMSwJb4gmBC7I0BjPv5T85CH88VOcFDV51sO9zPJaBQnNBRUWNLh1vQUbkmspIANTzj2sN62cTSoxRhSdnjZQ9E_jraKYEW5oizE9Dtow4EvQ",
-	Use: "sig",
-	Alg: "RS256",
-	E:   "AQAB",
-	Kid: "6a8ba5652a7044121d4fedac8f14d14c54e4895b",
-}
-
-var NotValidJWKKey = TestJWKKey{
-	Kty: "SomeOtherKeyType",
-	N:   "o76AudS2rsCvlz_3D47sFkpuz3NJxgLbXr1cHdmbo9xOMttPMJI97f0rHiSl9stltMi87KIOEEVQWUgMLaWQNaIZThgI1seWDAGRw59AO5sctgM1wPVZYt40fj2Qw4KT7m4RLMsZV1M5NYyXSd1lAAywM4FT25N0RLhkm3u8Hehw2Szj_2lm-rmcbDXzvjeXkodOUszFiOqzqBIS0Bv3c2zj2sytnozaG7aXa14OiUMSwJb4gmBC7I0BjPv5T85CH88VOcFDV51sO9zPJaBQnNBRUWNLh1vQUbkmspIANTzj2sN62cTSoxRhSdnjZQ9E_jraKYEW5oizE9Dtow4EvQ",
-	Use: "sig",
-	Alg: "RS256",
-	E:   "AQAB",
-	Kid: "6a8ba5652a7044121d4fedac8f14d14c54e4895b",
-}
-
-var (
-	ValidJWKByte, _    = json.Marshal(ValidJWKKey)
-	NotValidJWKByte, _ = json.Marshal(NotValidJWKKey)
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 )
 
-var (
-	ValidPublicKeyJWK    = JSONToPubKeyJWK(string(ValidJWKByte))
-	NotValidPublicKeyJWK = JSONToPubKeyJWK(string(NotValidJWKByte))
-)
-
-func TestVerificationMethodValidation(t *testing.T) {
-	cases := []struct {
-		name              string
-		struct_           VerificationMethod
-		baseDid           string
-		allowedNamespaces []string
-		isValid           bool
-		errorMsg          string
-	}{
-		{
-			name: "valid method with multibase key",
-			struct_: VerificationMethod{
+var _ = Describe("Verification Method Validation tests", func() {
+
+	var struct_ VerificationMethod
+	var baseDid string
+	var allowedNamespaces []string
+	var isValid bool
+	var errorMsg string
+
+	BeforeEach(func() {
+		struct_ = VerificationMethod{}
+		baseDid = ""
+		allowedNamespaces = []string{}
+		isValid = false
+		errorMsg = ""
+	})
+
+	AfterEach(func() {
+		err := struct_.Validate(baseDid, allowedNamespaces)
+
+		if isValid {
+			Expect(err).To(BeNil())
+		} else {
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(errorMsg))
+		}
+	})
+	When("verification method with expected multibase key", func() {
+
+		It("is valid", func() {
+			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
 				Type:               "Ed25519VerificationKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       nil,
 				PublicKeyMultibase: ValidEd25519PubKey,
-			},
-			isValid:  true,
-			errorMsg: "",
-		},
-		{
-			name: "valid method with jwk key",
-			struct_: VerificationMethod{
+			}
+			isValid = true
+			errorMsg = ""
+		})
+	})
+
+	When("verification method with expected jwk key", func() {
+
+		It("is valid", func() {
+			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#rty",
 				Type:               "JsonWebKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       ValidPublicKeyJWK,
 				PublicKeyMultibase: "",
-			},
-			isValid:  true,
-			errorMsg: "",
-		},
-		{
-			name: "base did: positive",
-			struct_: VerificationMethod{
+			}
+			isValid = true
+			errorMsg = ""
+		})
+	})
+
+	When("id has expected DID as a base", func() {
+
+		It("is valid", func() {
+			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#rty",
 				Type:               "JsonWebKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       ValidPublicKeyJWK,
 				PublicKeyMultibase: "",
-			},
-			baseDid:  "did:cheqd:aaaaaaaaaaaaaaaa",
-			isValid:  true,
-			errorMsg: "",
-		},
-		{
-			name: "base did: negative",
-			struct_: VerificationMethod{
+			}
+			baseDid = "did:cheqd:aaaaaaaaaaaaaaaa"
+			isValid = true
+			errorMsg = ""
+		})
+	})
+
+	When("id does not have expected DID as a base", func() {
+
+		It("should fail", func() {
+			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#rty",
 				Type:               "JsonWebKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       ValidPublicKeyJWK,
 				PublicKeyMultibase: "",
-			},
-			baseDid:  "did:cheqd:bbbbbbbbbbbbbbbb",
-			isValid:  false,
-			errorMsg: "id: must have prefix: did:cheqd:bbbbbbbbbbbbbbbb.",
-		},
-		{
-			name: "allowed namespaces: positive",
-			struct_: VerificationMethod{
+			}
+			baseDid = "did:cheqd:bbbbbbbbbbbbbbbb"
+			isValid = false
+			errorMsg = "id: must have prefix: did:cheqd:bbbbbbbbbbbbbbbb."
+		})
+	})
+
+	When("namespace is allowed", func() {
+
+		It("is valid", func() {
+			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:mainnet:aaaaaaaaaaaaaaaa#rty",
 				Type:               "JsonWebKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       ValidPublicKeyJWK,
 				PublicKeyMultibase: "",
-			},
-			allowedNamespaces: []string{"mainnet", ""},
-			isValid:           true,
-		},
-		{
-			name: "allowed namespaces: positive",
-			struct_: VerificationMethod{
+			}
+			allowedNamespaces = []string{"mainnet", ""}
+			isValid = true
+		})
+	})
+
+	When("namespace is not allowed", func() {
+
+		It("should fail", func() {
+			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:mainnet:aaaaaaaaaaaaaaaa#rty",
 				Type:               "JsonWebKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       ValidPublicKeyJWK,
 				PublicKeyMultibase: "",
-			},
-			allowedNamespaces: []string{"testnet"},
-			isValid:           false,
-			errorMsg:          "controller: did namespace must be one of: testnet; id: did namespace must be one of: testnet.",
-		},
-		{
-			name: "JWK: valid key",
-			struct_: VerificationMethod{
+			}
+			allowedNamespaces = []string{"testnet"}
+			isValid = false
+			errorMsg = "controller: did namespace must be one of: testnet; id: did namespace must be one of: testnet."
+		})
+	})
+
+	When("JWK key has expected format", func() {
+
+		It("is valid", func() {
+			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
 				Type:               "JsonWebKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       ValidPublicKeyJWK,
 				PublicKeyMultibase: "",
-			},
-			isValid: true,
-		},
-		{
-			name: "JWK: not valid key",
-			struct_: VerificationMethod{
+			}
+			isValid = true
+		})
+	})
+
+	When("JWK key has unexpected format", func() {
+		It("is not valid", func() {
+			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
 				Type:               "JsonWebKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       NotValidPublicKeyJWK,
 				PublicKeyMultibase: "",
-			},
-			isValid:  false,
-			errorMsg: "public_key_jwk: can't parse jwk: failed to parse key: invalid key type from JSON (SomeOtherKeyType).",
-		},
-		{
-			name: "all keys and values are required in jwk",
-			struct_: VerificationMethod{
+			}
+			isValid = false
+			errorMsg = "public_key_jwk: can't parse jwk: failed to parse key: invalid key type from JSON (SomeOtherKeyType)."
+		})
+	})
+
+	When("not all keys and valuesin JWK have expected format", func() {
+
+		It("should fail", func() {
+			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
 				Type:               "JsonWebKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       append(ValidPublicKeyJWK, &KeyValuePair{Key: "", Value: ""}),
 				PublicKeyMultibase: "",
-			},
-			isValid:  false,
-			errorMsg: "public_key_jwk: (6: (key: cannot be blank; value: cannot be blank.).).",
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := tc.struct_.Validate(tc.baseDid, tc.allowedNamespaces)
-
-			if tc.isValid {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-				require.Equal(t, err.Error(), tc.errorMsg)
 			}
+			isValid = false
+			errorMsg = "public_key_jwk: (6: (key: cannot be blank; value: cannot be blank.).)."
 		})
-	}
-}
+	})
+})
 
-func TestEd25519SignatureVerification(t *testing.T) {
-	message := "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +
-		"tempor incididunt ut labore et dolore magna aliqua."
-	msgBytes := []byte(message)
-
-	pubKey, privKey, err := ed25519.GenerateKey(rand.Reader)
-	require.NoError(t, err)
-	signature := ed25519.Sign(privKey, msgBytes)
-
-	pubKeyStr, err := multibase.Encode(multibase.Base58BTC, pubKey)
-	require.NoError(t, err)
-
-	vm := VerificationMethod{
-		Id:                 "",
-		Type:               "Ed25519VerificationKey2020",
-		Controller:         "",
-		PublicKeyJwk:       nil,
-		PublicKeyMultibase: pubKeyStr,
-	}
-
-	err = VerifySignature(vm, msgBytes, signature)
-	require.NoError(t, err)
-
-	jwk_, err := jwk.New(pubKey)
-	require.NoError(t, err)
-	json_, err := json.MarshalIndent(jwk_, "", "  ")
-	require.NoError(t, err)
-	pubKeyJwk := JSONToPubKeyJWK(string(json_))
-
-	vm2 := VerificationMethod{
-		Id:                 "",
-		Type:               "JsonWebKey2020",
-		Controller:         "",
-		PublicKeyJwk:       pubKeyJwk,
-		PublicKeyMultibase: "",
-	}
-
-	err = VerifySignature(vm2, msgBytes, signature)
-	require.NoError(t, err)
-}
-
-func TestECDSASignatureVerification(t *testing.T) {
-	message := "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +
-		"tempor incididunt ut labore et dolore magna aliqua."
-	msgBytes := []byte(message)
-
-	hasher := crypto.SHA256.New()
-	hasher.Write(msgBytes)
-	msgDigest := hasher.Sum(nil)
-
-	privKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	require.NoError(t, err)
-	pubKey := privKey.PublicKey
-
-	signature, err := ecdsa.SignASN1(rand.Reader, privKey, msgDigest)
-	require.NoError(t, err)
-
-	jwk_, err := jwk.New(pubKey)
-	require.NoError(t, err)
-	json_, err := json.MarshalIndent(jwk_, "", "  ")
-	require.NoError(t, err)
-	pubKeyJwk := JSONToPubKeyJWK(string(json_))
-
-	vm2 := VerificationMethod{
-		Id:                 "",
-		Type:               "JsonWebKey2020",
-		Controller:         "",
-		PublicKeyJwk:       pubKeyJwk,
-		PublicKeyMultibase: "",
-	}
-
-	err = VerifySignature(vm2, msgBytes, signature)
-	require.NoError(t, err)
-}
-
-func TestRSASignatureVerification(t *testing.T) {
-	message := "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +
+var _ = Describe("Validation ed25519 Signature in verification method", func() {
+
+	var pubKey ed25519.PublicKey
+	var privKey ed25519.PrivateKey
+	var err error
+	var message = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +
 		"tempor incididunt ut labore et dolore magna aliqua."
-	msgBytes := []byte(message)
-
-	hasher := crypto.SHA256.New()
-	hasher.Write(msgBytes)
-	msgDigest := hasher.Sum(nil)
-
-	privKey, err := rsa.GenerateKey(rand.Reader, 2048)
-	require.NoError(t, err)
-	pubKey := privKey.PublicKey
-
-	signature, err := rsa.SignPSS(rand.Reader, privKey, crypto.SHA256, msgDigest, nil)
-	require.NoError(t, err)
-
-	jwk_, err := jwk.New(pubKey)
-	require.NoError(t, err)
-	json_, err := json.MarshalIndent(jwk_, "", "  ")
-	require.NoError(t, err)
-	pubKeyJwk := JSONToPubKeyJWK(string(json_))
-
-	vm2 := VerificationMethod{
-		Id:                 "",
-		Type:               "JsonWebKey2020",
-		Controller:         "",
-		PublicKeyJwk:       pubKeyJwk,
-		PublicKeyMultibase: "",
-	}
-
-	err = VerifySignature(vm2, msgBytes, signature)
-	require.NoError(t, err)
-}
+	var msgBytes = []byte(message)
+	var signature []byte
+
+	pubKey, privKey, err = ed25519.GenerateKey(rand.Reader)
+	Expect(err).To(BeNil())
+
+	signature = ed25519.Sign(privKey, msgBytes)
+
+	Context("when ed25519 key is placed", func() {
+		It("is valid", func() {
+
+			pubKeyStr, err := multibase.Encode(multibase.Base58BTC, pubKey)
+			Expect(err).To(BeNil())
+
+			vm := VerificationMethod{
+				Id:                 "",
+				Type:               "Ed25519VerificationKey2020",
+				Controller:         "",
+				PublicKeyJwk:       nil,
+				PublicKeyMultibase: pubKeyStr,
+			}
+
+			err = VerifySignature(vm, msgBytes, signature)
+			Expect(err).To(BeNil())
+		})
+	})
+
+	Context("when with the same env but JWK is placed", func() {
+		It("is valid", func() {
+			jwk_, err := jwk.New(pubKey)
+			Expect(err).To(BeNil())
+
+			json_, err := json.MarshalIndent(jwk_, "", "  ")
+			Expect(err).To(BeNil())
+
+			pubKeyJwk := JSONToPubKeyJWK(string(json_))
+
+			vm2 := VerificationMethod{
+				Id:                 "",
+				Type:               "JsonWebKey2020",
+				Controller:         "",
+				PublicKeyJwk:       pubKeyJwk,
+				PublicKeyMultibase: "",
+			}
+
+			err = VerifySignature(vm2, msgBytes, signature)
+			Expect(err).To(BeNil())
+		})
+	})	
+
+})
+
+var _ = Describe("Validation ECDSA Signature in verification method", func() {
+
+	Context("ECDSA signature preparations and verification", func() {
+			It("is positive case", func() {
+			message := "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +
+				"tempor incididunt ut labore et dolore magna aliqua."
+
+			msgBytes := []byte(message)
+
+			hasher := crypto.SHA256.New()
+			hasher.Write(msgBytes)
+			msgDigest := hasher.Sum(nil)
+
+			privKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
+			Expect(err).To(BeNil())
+
+			pubKey := privKey.PublicKey
+
+			signature, err := ecdsa.SignASN1(rand.Reader, privKey, msgDigest)
+			Expect(err).To(BeNil())
+
+			jwk_, err := jwk.New(pubKey)
+			Expect(err).To(BeNil())
+
+			json_, err := json.MarshalIndent(jwk_, "", "  ")
+			Expect(err).To(BeNil())
+
+			pubKeyJwk := JSONToPubKeyJWK(string(json_))
+
+			vm := VerificationMethod{
+				Id:                 "",
+				Type:               "JsonWebKey2020",
+				Controller:         "",
+				PublicKeyJwk:       pubKeyJwk,
+				PublicKeyMultibase: "",
+			}
+
+			err = VerifySignature(vm, msgBytes, signature)
+			Expect(err).To(BeNil())
+		})
+	})
+
+})
+
+
+var _ = Describe("Validation RSA Signature in verification method", func() {
+
+	Context("RSA signature preparations and verification", func() {
+		It("is positive case", func() {
+			message := "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +
+				"tempor incididunt ut labore et dolore magna aliqua."
+			msgBytes := []byte(message)
+
+			hasher := crypto.SHA256.New()
+			hasher.Write(msgBytes)
+			msgDigest := hasher.Sum(nil)
+
+			privKey, err := rsa.GenerateKey(rand.Reader, 2048)
+			Expect(err).To(BeNil())
+
+			pubKey := privKey.PublicKey
+
+			signature, err := rsa.SignPSS(rand.Reader, privKey, crypto.SHA256, msgDigest, nil)
+			Expect(err).To(BeNil())
+
+			jwk_, err := jwk.New(pubKey)
+			Expect(err).To(BeNil())
+
+			json_, err := json.MarshalIndent(jwk_, "", "  ")
+			Expect(err).To(BeNil())
+
+			pubKeyJwk := JSONToPubKeyJWK(string(json_))
+
+			vm2 := VerificationMethod{
+				Id:                 "",
+				Type:               "JsonWebKey2020",
+				Controller:         "",
+				PublicKeyJwk:       pubKeyJwk,
+				PublicKeyMultibase: "",
+			}
+
+			err = VerifySignature(vm2, msgBytes, signature)
+			Expect(err).To(BeNil())
+		})
+	})
+
+})
diff --git a/x/cheqd/types/stateValue_test.go b/x/cheqd/types/stateValue_test.go
index 40d208b81..1f28f189c 100644
--- a/x/cheqd/types/stateValue_test.go
+++ b/x/cheqd/types/stateValue_test.go
@@ -1,81 +1,92 @@
-package types
+package types_test
 
 import (
-	"testing"
 	"time"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+
+	. "github.com/cheqd/cheqd-node/x/cheqd/types"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
 	"github.com/cheqd/cheqd-node/x/cheqd/utils"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 )
 
-func Test_PackUnpackAny(t *testing.T) {
-	original := &Did{
-		Id: "test",
-	}
-
-	// Construct codec
-	registry := types.NewInterfaceRegistry()
-	RegisterInterfaces(registry)
-	cdc := codec.NewProtoCodec(registry)
-
-	// Marshal
-	bz, err := cdc.MarshalInterface(original)
-	require.NoError(t, err)
-
-	// Assert type url
-	var any types.Any
-	err = any.Unmarshal(bz)
-	assert.NoError(t, err)
-	assert.Equal(t, any.TypeUrl, utils.MsgTypeURL(&Did{}))
-
-	// Unmarshal
-	var decoded StateValueData
-	err = cdc.UnmarshalInterface(bz, &decoded)
-	require.NoError(t, err)
-	require.IsType(t, &Did{}, decoded)
-	require.Equal(t, original, decoded)
-}
-
-func Test_NewMetadataFromContext(t *testing.T) {
-	createdTime := time.Now()
-	ctx := sdk.NewContext(nil, tmproto.Header{ChainID: "test_chain_id", Time: createdTime}, true, nil)
-	ctx.WithTxBytes([]byte("test_tx"))
-	expectedMetadata := Metadata{
-		Created:     createdTime.UTC().Format(time.RFC3339),
-		Updated:     "",
-		Deactivated: false,
-		VersionId:   utils.GetTxHash(ctx.TxBytes()),
-	}
-
-	metadata := NewMetadataFromContext(ctx)
-
-	require.Equal(t, expectedMetadata, metadata)
-}
-
-func Test_UpdateMetadata(t *testing.T) {
-	createdTime := time.Now()
-	updatedTime := createdTime.Add(time.Hour)
-
-	ctx1 := NewContext(createdTime, []byte("test1_tx"))
-	ctx2 := NewContext(updatedTime, []byte("test1_tx"))
-
-	expectedMetadata := Metadata{
-		Created:     createdTime.UTC().Format(time.RFC3339),
-		Updated:     updatedTime.UTC().Format(time.RFC3339),
-		Deactivated: false,
-		VersionId:   utils.GetTxHash(ctx2.TxBytes()),
-	}
-
-	metadata := NewMetadataFromContext(ctx1)
-	metadata.Update(ctx2)
-
-	require.Equal(t, expectedMetadata, metadata)
-}
+var _ = Describe(`StaeValue tests`, func() {
+
+	Context("Pack/unpack functionality", func() {
+		It("should pack and unpack withour any errors", func() {
+
+			original := &Did{
+				Id: "test",
+			}
+			
+			// Construct codec
+			registry := types.NewInterfaceRegistry()
+			RegisterInterfaces(registry)
+			cdc := codec.NewProtoCodec(registry)
+
+			// Marshal
+			bz, err := cdc.MarshalInterface(original)
+			Expect(err).To(BeNil())
+
+			// Assert type url
+			var any types.Any
+			err = any.Unmarshal(bz)
+			Expect(err).To(BeNil())
+			Expect(any.TypeUrl).To(Equal(utils.MsgTypeURL(&Did{})))
+
+			// Unmarshal
+			var decoded StateValueData
+			err = cdc.UnmarshalInterface(bz, &decoded)
+			Expect(err).To(BeNil())
+			Expect(&Did{}).To(BeAssignableToTypeOf(decoded))
+			Expect(original).To(Equal(decoded))
+		})
+	})
+
+	When("New metadata is created from context", func() {
+		It("should be the same as original", func() {
+			createdTime := time.Now()
+			ctx := sdk.NewContext(nil, tmproto.Header{ChainID: "test_chain_id", Time: createdTime}, true, nil)
+			ctx.WithTxBytes([]byte("test_tx"))
+			expectedMetadata := Metadata{
+				Created:     createdTime.UTC().Format(time.RFC3339),
+				Updated:     "",
+				Deactivated: false,
+				VersionId:   utils.GetTxHash(ctx.TxBytes()),
+			}
+
+			metadata := NewMetadataFromContext(ctx)
+			Expect(expectedMetadata).To(Equal(metadata))
+		})
+	})
+
+	When("Metadata is updated", func() {
+		It("should has ", func() {
+			createdTime := time.Now()
+			updatedTime := createdTime.Add(time.Hour)
+		
+			ctx1 := NewContext(createdTime, []byte("test1_tx"))
+			ctx2 := NewContext(updatedTime, []byte("test1_tx"))
+		
+			expectedMetadata := Metadata{
+				Created:     createdTime.UTC().Format(time.RFC3339),
+				Updated:     updatedTime.UTC().Format(time.RFC3339),
+				Deactivated: false,
+				VersionId:   utils.GetTxHash(ctx2.TxBytes()),
+			}
+		
+			metadata := NewMetadataFromContext(ctx1)
+			metadata.Update(ctx2)
+		
+			Expect(expectedMetadata).To(Equal(metadata))
+		})
+	})
+
+})
 
 func NewContext(time time.Time, txBytes []byte) sdk.Context {
 	ctx := sdk.NewContext(nil, tmproto.Header{ChainID: "test_chain_id", Time: time}, true, nil)
diff --git a/x/cheqd/types/tx_msg_create_did_test.go b/x/cheqd/types/tx_msg_create_did_test.go
index 43385c95d..47d2cc225 100644
--- a/x/cheqd/types/tx_msg_create_did_test.go
+++ b/x/cheqd/types/tx_msg_create_did_test.go
@@ -1,21 +1,38 @@
-package types
+package types_test
 
 import (
-	"testing"
+. "github.com/onsi/ginkgo/v2"
+. "github.com/onsi/gomega"
 
-	"github.com/stretchr/testify/require"
+. "github.com/cheqd/cheqd-node/x/cheqd/types"
 )
 
-func TestMsgCreateDidValidation(t *testing.T) {
-	cases := []struct {
-		name     string
-		struct_  *MsgCreateDid
-		isValid  bool
-		errorMsg string
-	}{
-		{
-			name: "positive",
-			struct_: &MsgCreateDid{
+var _ = Describe("Message for DID creation", func() {
+
+	var struct_           *MsgCreateDid
+	var isValid           bool
+	var errorMsg          string
+
+	BeforeEach(func() {
+		struct_ = &MsgCreateDid{}
+		isValid = false
+		errorMsg = ""
+	})
+
+	AfterEach(func() {
+		err := struct_.ValidateBasic()
+
+			if isValid {
+				Expect(err).To(BeNil())
+			} else {
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring(errorMsg))
+			}
+	})
+
+	When("all fields are set properly", func() {
+		It("Will pass", func() {
+			struct_ = &MsgCreateDid{
 				Payload: &MsgCreateDidPayload{
 					Id: "did:cheqd:testnet:123456789abcdefg",
 					VerificationMethod: []*VerificationMethod{
@@ -29,12 +46,14 @@ func TestMsgCreateDidValidation(t *testing.T) {
 					Authentication: []string{"did:cheqd:testnet:123456789abcdefg#key1", "did:cheqd:testnet:123456789abcdefg#aaa"},
 				},
 				Signatures: nil,
-			},
-			isValid: true,
-		},
-		{
-			name: "negative: relationship duplicates",
-			struct_: &MsgCreateDid{
+			}
+			isValid = true
+		})
+	})
+
+	When("IDs are duplicated", func() {
+		It("should fail the validation", func() {
+			struct_ = &MsgCreateDid{
 				Payload: &MsgCreateDidPayload{
 					Id: "did:cheqd:testnet:123456789abcdefg",
 					VerificationMethod: []*VerificationMethod{
@@ -48,22 +67,10 @@ func TestMsgCreateDidValidation(t *testing.T) {
 					Authentication: []string{"did:cheqd:testnet:123456789abcdefg#key1", "did:cheqd:testnet:123456789abcdefg#key1"},
 				},
 				Signatures: nil,
-			},
-			isValid:  false,
-			errorMsg: "payload: (authentication: there should be no duplicates.).: basic validation failed",
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := tc.struct_.ValidateBasic()
-
-			if tc.isValid {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-				require.Equal(t, err.Error(), tc.errorMsg)
 			}
+			isValid = false
+			errorMsg = "payload: (authentication: there should be no duplicates.).: basic validation failed"
 		})
-	}
-}
+
+	})
+})
diff --git a/x/cheqd/types/tx_msg_update_did_test.go b/x/cheqd/types/tx_msg_update_did_test.go
index 1b9c84e06..dff424c46 100644
--- a/x/cheqd/types/tx_msg_update_did_test.go
+++ b/x/cheqd/types/tx_msg_update_did_test.go
@@ -1,21 +1,38 @@
-package types
+package types_test
 
 import (
-	"testing"
+. "github.com/onsi/ginkgo/v2"
+. "github.com/onsi/gomega"
 
-	"github.com/stretchr/testify/require"
+. "github.com/cheqd/cheqd-node/x/cheqd/types"
 )
 
-func TestMsgUpdateDidValidation(t *testing.T) {
-	cases := []struct {
-		name     string
-		struct_  *MsgUpdateDid
-		isValid  bool
-		errorMsg string
-	}{
-		{
-			name: "positive",
-			struct_: &MsgUpdateDid{
+var _ = Describe("Message for DID creation", func() {
+
+	var struct_           *MsgUpdateDid
+	var isValid           bool
+	var errorMsg          string
+
+	BeforeEach(func() {
+		struct_ = &MsgUpdateDid{}
+		isValid = false
+		errorMsg = ""
+	})
+
+	AfterEach(func() {
+		err := struct_.ValidateBasic()
+
+			if isValid {
+				Expect(err).To(BeNil())
+			} else {
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring(errorMsg))
+			}
+	})
+
+	When("all fields are set properly", func() {
+		It("Will pass", func() {
+			struct_ = &MsgUpdateDid{
 				Payload: &MsgUpdateDidPayload{
 					Id: "did:cheqd:testnet:123456789abcdefg",
 					VerificationMethod: []*VerificationMethod{
@@ -30,12 +47,14 @@ func TestMsgUpdateDidValidation(t *testing.T) {
 					VersionId:      "version1",
 				},
 				Signatures: nil,
-			},
-			isValid: true,
-		},
-		{
-			name: "negative: relationship duplicates",
-			struct_: &MsgUpdateDid{
+			}
+			isValid = true
+		})
+	})
+
+	When("IDs are duplicated", func() {
+		It("should fail the validation", func() {
+			struct_ = &MsgUpdateDid{
 				Payload: &MsgUpdateDidPayload{
 					Id: "did:cheqd:testnet:123456789abcdefg",
 					VerificationMethod: []*VerificationMethod{
@@ -50,13 +69,17 @@ func TestMsgUpdateDidValidation(t *testing.T) {
 					VersionId:      "version1",
 				},
 				Signatures: nil,
-			},
-			isValid:  false,
-			errorMsg: "payload: (authentication: there should be no duplicates.).: basic validation failed",
-		},
-		{
-			name: "negative: version id is required",
-			struct_: &MsgUpdateDid{
+			}
+			isValid = false
+			errorMsg = "payload: (authentication: there should be no duplicates.).: basic validation failed"
+
+
+		})
+	})
+
+	When("VersionId is empty", func() {
+		It("should fail on validation", func() {
+			struct_ = &MsgUpdateDid{
 				Payload: &MsgUpdateDidPayload{
 					Id: "did:cheqd:testnet:123456789abcdefg",
 					VerificationMethod: []*VerificationMethod{
@@ -70,22 +93,9 @@ func TestMsgUpdateDidValidation(t *testing.T) {
 					Authentication: []string{"did:cheqd:testnet:123456789abcdefg#key1", "did:cheqd:testnet:123456789abcdefg#aaa"},
 				},
 				Signatures: nil,
-			},
-			isValid:  false,
-			errorMsg: "payload: (version_id: cannot be blank.).: basic validation failed",
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := tc.struct_.ValidateBasic()
-
-			if tc.isValid {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-				require.Equal(t, err.Error(), tc.errorMsg)
 			}
+			isValid = false
+			errorMsg = "payload: (version_id: cannot be blank.).: basic validation failed"
 		})
-	}
-}
+	})
+})
diff --git a/x/cheqd/types/tx_sign_ingo_test.go b/x/cheqd/types/tx_sign_ingo_test.go
index 582f342a3..3d3489ff9 100644
--- a/x/cheqd/types/tx_sign_ingo_test.go
+++ b/x/cheqd/types/tx_sign_ingo_test.go
@@ -1,72 +1,88 @@
-package types
+package types_test
 
 import (
-	"testing"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 
-	"github.com/stretchr/testify/require"
+	. "github.com/cheqd/cheqd-node/x/cheqd/types"
 )
 
-func TestSignInfoValidation(t *testing.T) {
-	cases := []struct {
-		name              string
-		struct_           SignInfo
-		allowedNamespaces []string
-		isValid           bool
-		errorMsg          string
-	}{
-		{
-			name: "positive",
-			struct_: SignInfo{
-				VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
-				Signature:            "aaa=",
-			},
-			isValid:  true,
-			errorMsg: "",
-		},
-		{
-			name: "negative: namespace",
-			struct_: SignInfo{
+var _ = Describe("SignInfo validation tests", func() {
+
+	var struct_           SignInfo
+	var allowedNamespaces []string
+	var isValid           bool
+	var errorMsg          string
+
+	BeforeEach(func() {
+		struct_ = SignInfo{}
+		allowedNamespaces = []string{}
+		isValid = false
+		errorMsg = ""
+	})
+
+	AfterEach(func() {
+		err := struct_.Validate(allowedNamespaces)
+
+			if isValid {
+				Expect(err).To(BeNil())
+			} else {
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring(errorMsg))
+			}
+	})
+
+	It("Positive case", func() {
+		struct_ = SignInfo{
+			VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
+			Signature:            "aaa=",
+		}
+		isValid = true
+		errorMsg = ""
+	})
+
+	When("namespace is not allowed", func() {
+		It("should fail", func() {
+			struct_ = SignInfo{
 				VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#service1",
 				Signature:            "DIDCommMessaging",
-			},
-			allowedNamespaces: []string{"mainnet"},
-			isValid:           false,
-			errorMsg:          "verification_method_id: did namespace must be one of: mainnet.",
-		},
-		{
-			name: "negative: signature",
-			struct_: SignInfo{
+			}
+			allowedNamespaces = []string{"mainnet"}
+			isValid = false
+			errorMsg = "verification_method_id: did namespace must be one of: mainnet."
+		})
+	})
+
+	When("signature is not valid base64 string", func() {
+		It("should fail", func() {
+			struct_ = SignInfo{
 				VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#service1",
 				Signature:            "!@#",
-			},
-			isValid:  false,
-			errorMsg: "signature: must be encoded in Base64.",
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := tc.struct_.Validate(tc.allowedNamespaces)
-
-			if tc.isValid {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-				require.Equal(t, err.Error(), tc.errorMsg)
 			}
+			isValid = false
+			errorMsg = "signature: must be encoded in Base64."
 		})
-	}
-}
-
-func TestFullSignInfoDublicateValidation(t *testing.T) {
-	cases := []struct {
-		name     string
-		structs_ []*SignInfo
-		isValid  bool
-	}{
-		{
-			name: "positive",
-			structs_: []*SignInfo{
+	})
+
+})
+
+var _ = Describe("Full SignInfo duplicates tests", func() {
+	var structs_ []*SignInfo
+	var isValid  bool
+
+	BeforeEach(func() {
+		structs_ = []*SignInfo{}
+		isValid = false
+	})
+
+	AfterEach(func() {
+		res_ := IsUniqueSignInfoList(structs_)
+		Expect(res_).To(Equal(isValid))
+	})
+
+	When("signatures are different", func() {
+		It("should pass", func() {
+			structs_ = []*SignInfo{
 				{
 					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
 					Signature:            "aaa=",
@@ -75,12 +91,14 @@ func TestFullSignInfoDublicateValidation(t *testing.T) {
 					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
 					Signature:            "bbb=",
 				},
-			},
-			isValid: true,
-		},
-		{
-			name: "positive with all different pieces",
-			structs_: []*SignInfo{
+			}
+			isValid  = true
+		})
+	})
+
+	When("all fields are different", func() {
+		It("should pass", func() {
+			structs_ = []*SignInfo{
 				{
 					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
 					Signature:            "aaa=",
@@ -89,12 +107,14 @@ func TestFullSignInfoDublicateValidation(t *testing.T) {
 					VerificationMethodId: "did:cheqd:bbbbbbbbbbbbbbbb#method1",
 					Signature:            "bbb=",
 				},
-			},
-			isValid: true,
-		},
-		{
-			name: "negative",
-			structs_: []*SignInfo{
+			}
+			isValid = true
+		})
+	})
+
+	When("all fields are the same", func() {
+		It("should fail", func() {
+			structs_ = []*SignInfo{
 				{
 					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
 					Signature:            "aaa=",
@@ -103,12 +123,14 @@ func TestFullSignInfoDublicateValidation(t *testing.T) {
 					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
 					Signature:            "aaa=",
 				},
-			},
-			isValid: false,
-		},
-		{
-			name: "negative with a lot of same elems",
-			structs_: []*SignInfo{
+			}
+			isValid = false
+		})
+	})
+
+	When("all fields are the same and more elments", func() {
+		It("should fail", func() {
+			structs_ = []*SignInfo{
 				{
 					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
 					Signature:            "aaa=",
@@ -121,15 +143,8 @@ func TestFullSignInfoDublicateValidation(t *testing.T) {
 					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
 					Signature:            "aaa=",
 				},
-			},
-			isValid: false,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			res_ := IsUniqueSignInfoList(tc.structs_)
-			require.Equal(t, res_, tc.isValid)
+			}
+			isValid = false
 		})
-	}
-}
+	})
+})

From 425bb4488a7d12135fe2661e0c1dbeeb23164cb0 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Mon, 10 Oct 2022 14:35:12 +0300
Subject: [PATCH 20/76] Makes linter happy

---
 app/export.go                                 |  3 ++-
 x/cheqd/types/constant_test.go                |  5 ++--
 x/cheqd/types/did_did_test.go                 | 23 +++++++---------
 x/cheqd/types/did_service_test.go             | 22 +++++++--------
 x/cheqd/types/did_verification_method_test.go | 26 +++---------------
 x/cheqd/types/stateValue_test.go              | 14 +++++-----
 x/cheqd/types/tx_msg_create_did_test.go       | 26 +++++++++---------
 x/cheqd/types/tx_msg_update_did_test.go       | 27 +++++++++----------
 x/cheqd/types/tx_sign_ingo_test.go            | 24 ++++++++---------
 x/cheqd/types/types_test.go                   |  3 ++-
 x/cheqd/utils/str_test.go                     | 12 ++++-----
 11 files changed, 78 insertions(+), 107 deletions(-)

diff --git a/app/export.go b/app/export.go
index 79f6c2c6b..b6d449ead 100644
--- a/app/export.go
+++ b/app/export.go
@@ -49,7 +49,8 @@ func (app *App) ExportAppStateAndValidators(
 
 // prepare for fresh start at zero height
 // NOTE zero height genesis is a temporary feature which will be deprecated
-//      in favour of export at a block height
+//
+//	in favour of export at a block height
 func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []string) {
 	applyAllowedAddrs := false
 
diff --git a/x/cheqd/types/constant_test.go b/x/cheqd/types/constant_test.go
index 66aa6ec66..96e1fa695 100644
--- a/x/cheqd/types/constant_test.go
+++ b/x/cheqd/types/constant_test.go
@@ -1,8 +1,9 @@
 package types_test
+
 import (
 	"encoding/json"
+
 	. "github.com/cheqd/cheqd-node/x/cheqd/types"
-	
 )
 
 var (
@@ -48,4 +49,4 @@ var (
 var (
 	ValidPublicKeyJWK    = JSONToPubKeyJWK(string(ValidJWKByte))
 	NotValidPublicKeyJWK = JSONToPubKeyJWK(string(NotValidJWKByte))
-)
\ No newline at end of file
+)
diff --git a/x/cheqd/types/did_did_test.go b/x/cheqd/types/did_did_test.go
index aff9bf21f..53140c03a 100644
--- a/x/cheqd/types/did_did_test.go
+++ b/x/cheqd/types/did_did_test.go
@@ -10,11 +10,10 @@ import (
 )
 
 var _ = Describe("DID Validation tests", func() {
-
-	var struct_           *Did
+	var struct_ *Did
 	var allowedNamespaces []string
-	var isValid           bool
-	var errorMsg          string
+	var isValid bool
+	var errorMsg string
 
 	BeforeEach(func() {
 		struct_ = &Did{}
@@ -26,12 +25,12 @@ var _ = Describe("DID Validation tests", func() {
 	AfterEach(func() {
 		err := struct_.Validate(allowedNamespaces)
 
-			if isValid {
-				Expect(err).To(BeNil())
-			} else {
-				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring(errorMsg))
-			}
+		if isValid {
+			Expect(err).To(BeNil())
+		} else {
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(errorMsg))
+		}
 	})
 
 	When("DID is allowed", func() {
@@ -48,7 +47,7 @@ var _ = Describe("DID Validation tests", func() {
 					},
 				},
 			}
-			isValid =  true
+			isValid = true
 			errorMsg = ""
 		})
 	})
@@ -207,7 +206,6 @@ var _ = Describe("DID Validation tests", func() {
 	})
 
 	When("controller is duplicated", func() {
-
 		It("should fail", func() {
 			struct_ = &Did{
 				Id:         ValidTestDID,
@@ -227,7 +225,6 @@ var _ = Describe("DID Validation tests", func() {
 	})
 
 	When("verification method is duplicated", func() {
-
 		It("should fail", func() {
 			struct_ = &Did{
 				Id: ValidTestDID,
diff --git a/x/cheqd/types/did_service_test.go b/x/cheqd/types/did_service_test.go
index d15928a36..b2b47c9c2 100644
--- a/x/cheqd/types/did_service_test.go
+++ b/x/cheqd/types/did_service_test.go
@@ -8,12 +8,11 @@ import (
 )
 
 var _ = Describe("DID Validation tests", func() {
-
-	var struct_           Service
-	var baseDid           string
+	var struct_ Service
+	var baseDid string
 	var allowedNamespaces []string
-	var isValid           bool
-	var errorMsg          string
+	var isValid bool
+	var errorMsg string
 
 	BeforeEach(func() {
 		struct_ = Service{}
@@ -26,12 +25,12 @@ var _ = Describe("DID Validation tests", func() {
 	AfterEach(func() {
 		err := struct_.Validate(baseDid, allowedNamespaces)
 
-			if isValid {
-				Expect(err).To(BeNil())
-			} else {
-				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring(errorMsg))
-			}
+		if isValid {
+			Expect(err).To(BeNil())
+		} else {
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(errorMsg))
+		}
 	})
 
 	It("Positive case", func() {
@@ -47,7 +46,6 @@ var _ = Describe("DID Validation tests", func() {
 	})
 
 	When("Namespace is not allowed", func() {
-
 		It("should fail", func() {
 			struct_ = Service{
 				Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
diff --git a/x/cheqd/types/did_verification_method_test.go b/x/cheqd/types/did_verification_method_test.go
index 067d886e2..c1e4e7f09 100644
--- a/x/cheqd/types/did_verification_method_test.go
+++ b/x/cheqd/types/did_verification_method_test.go
@@ -6,7 +6,6 @@ import (
 	"crypto/ed25519"
 	"crypto/elliptic"
 	"crypto/rand"
-
 	"crypto/rsa"
 	"encoding/json"
 
@@ -18,7 +17,6 @@ import (
 )
 
 var _ = Describe("Verification Method Validation tests", func() {
-
 	var struct_ VerificationMethod
 	var baseDid string
 	var allowedNamespaces []string
@@ -44,7 +42,6 @@ var _ = Describe("Verification Method Validation tests", func() {
 		}
 	})
 	When("verification method with expected multibase key", func() {
-
 		It("is valid", func() {
 			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
@@ -59,7 +56,6 @@ var _ = Describe("Verification Method Validation tests", func() {
 	})
 
 	When("verification method with expected jwk key", func() {
-
 		It("is valid", func() {
 			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#rty",
@@ -74,7 +70,6 @@ var _ = Describe("Verification Method Validation tests", func() {
 	})
 
 	When("id has expected DID as a base", func() {
-
 		It("is valid", func() {
 			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#rty",
@@ -90,7 +85,6 @@ var _ = Describe("Verification Method Validation tests", func() {
 	})
 
 	When("id does not have expected DID as a base", func() {
-
 		It("should fail", func() {
 			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#rty",
@@ -106,7 +100,6 @@ var _ = Describe("Verification Method Validation tests", func() {
 	})
 
 	When("namespace is allowed", func() {
-
 		It("is valid", func() {
 			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:mainnet:aaaaaaaaaaaaaaaa#rty",
@@ -121,7 +114,6 @@ var _ = Describe("Verification Method Validation tests", func() {
 	})
 
 	When("namespace is not allowed", func() {
-
 		It("should fail", func() {
 			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:mainnet:aaaaaaaaaaaaaaaa#rty",
@@ -137,7 +129,6 @@ var _ = Describe("Verification Method Validation tests", func() {
 	})
 
 	When("JWK key has expected format", func() {
-
 		It("is valid", func() {
 			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
@@ -165,7 +156,6 @@ var _ = Describe("Verification Method Validation tests", func() {
 	})
 
 	When("not all keys and valuesin JWK have expected format", func() {
-
 		It("should fail", func() {
 			struct_ = VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
@@ -181,13 +171,12 @@ var _ = Describe("Verification Method Validation tests", func() {
 })
 
 var _ = Describe("Validation ed25519 Signature in verification method", func() {
-
 	var pubKey ed25519.PublicKey
 	var privKey ed25519.PrivateKey
 	var err error
-	var message = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +
+	message := "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +
 		"tempor incididunt ut labore et dolore magna aliqua."
-	var msgBytes = []byte(message)
+	msgBytes := []byte(message)
 	var signature []byte
 
 	pubKey, privKey, err = ed25519.GenerateKey(rand.Reader)
@@ -197,7 +186,6 @@ var _ = Describe("Validation ed25519 Signature in verification method", func() {
 
 	Context("when ed25519 key is placed", func() {
 		It("is valid", func() {
-
 			pubKeyStr, err := multibase.Encode(multibase.Base58BTC, pubKey)
 			Expect(err).To(BeNil())
 
@@ -235,14 +223,12 @@ var _ = Describe("Validation ed25519 Signature in verification method", func() {
 			err = VerifySignature(vm2, msgBytes, signature)
 			Expect(err).To(BeNil())
 		})
-	})	
-
+	})
 })
 
 var _ = Describe("Validation ECDSA Signature in verification method", func() {
-
 	Context("ECDSA signature preparations and verification", func() {
-			It("is positive case", func() {
+		It("is positive case", func() {
 			message := "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +
 				"tempor incididunt ut labore et dolore magna aliqua."
 
@@ -280,12 +266,9 @@ var _ = Describe("Validation ECDSA Signature in verification method", func() {
 			Expect(err).To(BeNil())
 		})
 	})
-
 })
 
-
 var _ = Describe("Validation RSA Signature in verification method", func() {
-
 	Context("RSA signature preparations and verification", func() {
 		It("is positive case", func() {
 			message := "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +
@@ -324,5 +307,4 @@ var _ = Describe("Validation RSA Signature in verification method", func() {
 			Expect(err).To(BeNil())
 		})
 	})
-
 })
diff --git a/x/cheqd/types/stateValue_test.go b/x/cheqd/types/stateValue_test.go
index 1f28f189c..eb2bbf477 100644
--- a/x/cheqd/types/stateValue_test.go
+++ b/x/cheqd/types/stateValue_test.go
@@ -2,6 +2,7 @@ package types_test
 
 import (
 	"time"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
@@ -15,14 +16,12 @@ import (
 )
 
 var _ = Describe(`StaeValue tests`, func() {
-
 	Context("Pack/unpack functionality", func() {
 		It("should pack and unpack withour any errors", func() {
-
 			original := &Did{
 				Id: "test",
 			}
-			
+
 			// Construct codec
 			registry := types.NewInterfaceRegistry()
 			RegisterInterfaces(registry)
@@ -68,24 +67,23 @@ var _ = Describe(`StaeValue tests`, func() {
 		It("should has ", func() {
 			createdTime := time.Now()
 			updatedTime := createdTime.Add(time.Hour)
-		
+
 			ctx1 := NewContext(createdTime, []byte("test1_tx"))
 			ctx2 := NewContext(updatedTime, []byte("test1_tx"))
-		
+
 			expectedMetadata := Metadata{
 				Created:     createdTime.UTC().Format(time.RFC3339),
 				Updated:     updatedTime.UTC().Format(time.RFC3339),
 				Deactivated: false,
 				VersionId:   utils.GetTxHash(ctx2.TxBytes()),
 			}
-		
+
 			metadata := NewMetadataFromContext(ctx1)
 			metadata.Update(ctx2)
-		
+
 			Expect(expectedMetadata).To(Equal(metadata))
 		})
 	})
-
 })
 
 func NewContext(time time.Time, txBytes []byte) sdk.Context {
diff --git a/x/cheqd/types/tx_msg_create_did_test.go b/x/cheqd/types/tx_msg_create_did_test.go
index 47d2cc225..d0d00c3f3 100644
--- a/x/cheqd/types/tx_msg_create_did_test.go
+++ b/x/cheqd/types/tx_msg_create_did_test.go
@@ -1,17 +1,16 @@
 package types_test
 
 import (
-. "github.com/onsi/ginkgo/v2"
-. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 
-. "github.com/cheqd/cheqd-node/x/cheqd/types"
+	. "github.com/cheqd/cheqd-node/x/cheqd/types"
 )
 
 var _ = Describe("Message for DID creation", func() {
-
-	var struct_           *MsgCreateDid
-	var isValid           bool
-	var errorMsg          string
+	var struct_ *MsgCreateDid
+	var isValid bool
+	var errorMsg string
 
 	BeforeEach(func() {
 		struct_ = &MsgCreateDid{}
@@ -22,12 +21,12 @@ var _ = Describe("Message for DID creation", func() {
 	AfterEach(func() {
 		err := struct_.ValidateBasic()
 
-			if isValid {
-				Expect(err).To(BeNil())
-			} else {
-				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring(errorMsg))
-			}
+		if isValid {
+			Expect(err).To(BeNil())
+		} else {
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(errorMsg))
+		}
 	})
 
 	When("all fields are set properly", func() {
@@ -71,6 +70,5 @@ var _ = Describe("Message for DID creation", func() {
 			isValid = false
 			errorMsg = "payload: (authentication: there should be no duplicates.).: basic validation failed"
 		})
-
 	})
 })
diff --git a/x/cheqd/types/tx_msg_update_did_test.go b/x/cheqd/types/tx_msg_update_did_test.go
index dff424c46..c29f35982 100644
--- a/x/cheqd/types/tx_msg_update_did_test.go
+++ b/x/cheqd/types/tx_msg_update_did_test.go
@@ -1,17 +1,16 @@
 package types_test
 
 import (
-. "github.com/onsi/ginkgo/v2"
-. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 
-. "github.com/cheqd/cheqd-node/x/cheqd/types"
+	. "github.com/cheqd/cheqd-node/x/cheqd/types"
 )
 
 var _ = Describe("Message for DID creation", func() {
-
-	var struct_           *MsgUpdateDid
-	var isValid           bool
-	var errorMsg          string
+	var struct_ *MsgUpdateDid
+	var isValid bool
+	var errorMsg string
 
 	BeforeEach(func() {
 		struct_ = &MsgUpdateDid{}
@@ -22,12 +21,12 @@ var _ = Describe("Message for DID creation", func() {
 	AfterEach(func() {
 		err := struct_.ValidateBasic()
 
-			if isValid {
-				Expect(err).To(BeNil())
-			} else {
-				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring(errorMsg))
-			}
+		if isValid {
+			Expect(err).To(BeNil())
+		} else {
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(errorMsg))
+		}
 	})
 
 	When("all fields are set properly", func() {
@@ -72,8 +71,6 @@ var _ = Describe("Message for DID creation", func() {
 			}
 			isValid = false
 			errorMsg = "payload: (authentication: there should be no duplicates.).: basic validation failed"
-
-
 		})
 	})
 
diff --git a/x/cheqd/types/tx_sign_ingo_test.go b/x/cheqd/types/tx_sign_ingo_test.go
index 3d3489ff9..597e9616c 100644
--- a/x/cheqd/types/tx_sign_ingo_test.go
+++ b/x/cheqd/types/tx_sign_ingo_test.go
@@ -8,11 +8,10 @@ import (
 )
 
 var _ = Describe("SignInfo validation tests", func() {
-
-	var struct_           SignInfo
+	var struct_ SignInfo
 	var allowedNamespaces []string
-	var isValid           bool
-	var errorMsg          string
+	var isValid bool
+	var errorMsg string
 
 	BeforeEach(func() {
 		struct_ = SignInfo{}
@@ -24,12 +23,12 @@ var _ = Describe("SignInfo validation tests", func() {
 	AfterEach(func() {
 		err := struct_.Validate(allowedNamespaces)
 
-			if isValid {
-				Expect(err).To(BeNil())
-			} else {
-				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring(errorMsg))
-			}
+		if isValid {
+			Expect(err).To(BeNil())
+		} else {
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(errorMsg))
+		}
 	})
 
 	It("Positive case", func() {
@@ -63,12 +62,11 @@ var _ = Describe("SignInfo validation tests", func() {
 			errorMsg = "signature: must be encoded in Base64."
 		})
 	})
-
 })
 
 var _ = Describe("Full SignInfo duplicates tests", func() {
 	var structs_ []*SignInfo
-	var isValid  bool
+	var isValid bool
 
 	BeforeEach(func() {
 		structs_ = []*SignInfo{}
@@ -92,7 +90,7 @@ var _ = Describe("Full SignInfo duplicates tests", func() {
 					Signature:            "bbb=",
 				},
 			}
-			isValid  = true
+			isValid = true
 		})
 	})
 
diff --git a/x/cheqd/types/types_test.go b/x/cheqd/types/types_test.go
index 550174758..d3c237d8d 100644
--- a/x/cheqd/types/types_test.go
+++ b/x/cheqd/types/types_test.go
@@ -1,9 +1,10 @@
 package types_test
 
 import (
+	"testing"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"testing"
 )
 
 func TestUtils(t *testing.T) {
diff --git a/x/cheqd/utils/str_test.go b/x/cheqd/utils/str_test.go
index 0e77e86ff..68fa811cd 100644
--- a/x/cheqd/utils/str_test.go
+++ b/x/cheqd/utils/str_test.go
@@ -39,7 +39,7 @@ var _ = Describe("Str utils functionality", func() {
 		Entry("Desired element is absent. Expected: false", []string{"1", "2", "3"}, "123", false),
 	)
 
-	DescribeTable("Substract function",
+	DescribeTable("Subtract function",
 
 		func(first []string, second []string, expected []string) {
 			actual := Subtract(first, second)
@@ -51,11 +51,11 @@ var _ = Describe("Str utils functionality", func() {
 		Entry("nil as the first and the empty second. Expected empty list", nil, []string{}, []string{}),
 		Entry("nil as the first and nil as the second. Expected empty list", nil, nil, []string{}),
 		Entry("The same lists. Expected empty list", []string{"1", "2"}, []string{"1", "2"}, []string{}),
-		Entry("Substract with empty list. Exected: first array", []string{"1", "2", "3"}, []string{}, []string{"1", "2", "3"}),
-		Entry("Substract with nil as the second. Exected: first array", []string{"1", "2", "3"}, nil, []string{"1", "2", "3"}),
-		Entry("Substract with totally different list. Expected: first array", []string{"1", "2", "3"}, []string{"4", "5", "6"}, []string{"1", "2", "3"}),
-		Entry("Substract. General case. Expected: [1, 2]", []string{"1", "2", "3"}, []string{"1", "5", "2"}, []string{"3"}),
-		Entry("Substract. General case. Expected: [3, 4, 6]", []string{"4", "1", "6", "2", "3"}, []string{"1", "5", "2"}, []string{"3", "4", "6"}),
+		Entry("Subtract with empty list. Exected: first array", []string{"1", "2", "3"}, []string{}, []string{"1", "2", "3"}),
+		Entry("Subtract with nil as the second. Exected: first array", []string{"1", "2", "3"}, nil, []string{"1", "2", "3"}),
+		Entry("Subtract with totally different list. Expected: first array", []string{"1", "2", "3"}, []string{"4", "5", "6"}, []string{"1", "2", "3"}),
+		Entry("Subtract. General case. Expected: [1, 2]", []string{"1", "2", "3"}, []string{"1", "5", "2"}, []string{"3"}),
+		Entry("Subtract. General case. Expected: [3, 4, 6]", []string{"4", "1", "6", "2", "3"}, []string{"1", "5", "2"}, []string{"3", "4", "6"}),
 	)
 
 	DescribeTable("Unique function",

From 697479a076fad276d969aca9957b32e70a4e8b4f Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Mon, 10 Oct 2022 14:38:30 +0300
Subject: [PATCH 21/76] Enable ginkgo tests

---
 .github/workflows/test.yml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2d8150b17..a45d1d014 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -46,17 +46,7 @@ jobs:
           go install github.com/jstemmer/go-junit-report/v2@latest
 
       - name: Run Ginkgo tests
-        run: |
-          go test -v github.com/cheqd/cheqd-node/x/cheqd/utils 2>&1 | go-junit-report -parser gotest > report.xml
-#
-      - uses: dorny/test-reporter@v1
-        if: success() || failure()        # run this step even if previous step failed
-        with:
-          name: JEST Tests                  # Name of the check run which will be created
-          path: report.xml                     # Path to test results (inside artifact .zip)
-          reporter: java-junit              # Format of test results
-          max-annotations: '50'
-          fail-on-error: false
+        run: ginkgo -r --race --randomize-all --randomize-suites -v
 
 
     # test-new-node-setup:

From 80f811bdf1f93739535f73da600aa0d42ea530d3 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Mon, 10 Oct 2022 14:49:42 +0300
Subject: [PATCH 22/76] Show test results in junit format

---
 .github/workflows/test.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a45d1d014..4730ff418 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -46,7 +46,16 @@ jobs:
           go install github.com/jstemmer/go-junit-report/v2@latest
 
       - name: Run Ginkgo tests
-        run: ginkgo -r --race --randomize-all --randomize-suites -v
+        run: ginkgo -r --race --randomize-all --randomize-suites --junit-report report.xml
+
+      - uses: dorny/test-reporter@v1
+        if: success() || failure()        # run this step even if previous step failed
+        with:
+          name: JEST Tests                  # Name of the check run which will be created
+          path: report.xml                     # Path to test results (inside artifact .zip)
+          reporter: java-junit              # Format of test results
+          max-annotations: '50'
+          fail-on-error: false
 
 
     # test-new-node-setup:

From 0feb00dd2aefadb601d40cf33714217f506aaf31 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Mon, 10 Oct 2022 14:58:38 +0300
Subject: [PATCH 23/76] Show test results in a pretty view

---
 .github/workflows/test.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4730ff418..d52fcb219 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -48,14 +48,10 @@ jobs:
       - name: Run Ginkgo tests
         run: ginkgo -r --race --randomize-all --randomize-suites --junit-report report.xml
 
-      - uses: dorny/test-reporter@v1
+      - uses: mikepenz/action-junit-report@v3
         if: success() || failure()        # run this step even if previous step failed
         with:
-          name: JEST Tests                  # Name of the check run which will be created
-          path: report.xml                     # Path to test results (inside artifact .zip)
-          reporter: java-junit              # Format of test results
-          max-annotations: '50'
-          fail-on-error: false
+          report_paths: 'report.xml'
 
 
     # test-new-node-setup:

From 4075f4e09c913531d9c92de79d1721ca14b08e71 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Mon, 10 Oct 2022 16:52:15 +0300
Subject: [PATCH 24/76] small fixes

---
 app/encoding_test.go                         | 20 --------------------
 x/cheqd/tests/signature_verification_test.go | 20 +++++++++++---------
 x/cheqd/types/tx_msg_create_did_test.go      |  2 +-
 3 files changed, 12 insertions(+), 30 deletions(-)
 delete mode 100644 app/encoding_test.go

diff --git a/app/encoding_test.go b/app/encoding_test.go
deleted file mode 100644
index acd26ab32..000000000
--- a/app/encoding_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package app
-
-import (
-	"testing"
-
-	"github.com/cheqd/cheqd-node/x/cheqd/types"
-	"github.com/stretchr/testify/require"
-)
-
-func Test_MsgCreateDidPayload_UnmarshalJSON(t *testing.T) {
-	cdc := MakeTestEncodingConfig()
-
-	createPayloadJson := `{"id": "did:cheqd:alice"}`
-
-	var createPayload types.MsgCreateDidPayload
-	err := cdc.Codec.UnmarshalJSON([]byte(createPayloadJson), &createPayload)
-	require.NoError(t, err)
-
-	require.Equal(t, "did:cheqd:alice", createPayload.Id, "json unmarshal doesn't work")
-}
diff --git a/x/cheqd/tests/signature_verification_test.go b/x/cheqd/tests/signature_verification_test.go
index 32b43dfcb..e3c8bd531 100644
--- a/x/cheqd/tests/signature_verification_test.go
+++ b/x/cheqd/tests/signature_verification_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
 )
 
-var _ = Describe("Signature Verification", func() {
+var _ = Describe("Signature Verification while updating DID", func() {
 	var setup TestSetup
 	var aliceKeys, bobKeys map[string]ed25519.PrivateKey
 	var aliceDid *types.MsgCreateDidPayload
@@ -23,7 +23,7 @@ var _ = Describe("Signature Verification", func() {
 		bobKeys, _, _ = setup.InitDid(BobDID)
 	})
 
-	It("should has changed DIDDoc controller", func() {
+	It("should have changed DIDDoc controller", func() {
 		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
 		updatedDidDoc.Controller = append(updatedDidDoc.Controller, BobDID)
 		receivedDid, _ := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(ConcatKeys(aliceKeys, bobKeys)))
@@ -33,14 +33,16 @@ var _ = Describe("Signature Verification", func() {
 		Expect([]string{BobDID}, receivedDid.Controller)
 	})
 
-	It("should fails cause we need old signature for changing verification method", func() {
-		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-		updatedDidDoc.VerificationMethod[0].Type = Ed25519VerificationKey2020
-		_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
+	When("Old signature in verification method is absent", func() {
+		It("should fail", func() {
+			updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
+			updatedDidDoc.VerificationMethod[0].Type = Ed25519VerificationKey2020
+			_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
 
-		// check
-		Expect(err).To(Not(BeNil()))
-		Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
+			// check
+			Expect(err).To(Not(BeNil()))
+			Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
+		})
 	})
 
 	It("should fails cause we need old signature for changing verification method controller", func() {
diff --git a/x/cheqd/types/tx_msg_create_did_test.go b/x/cheqd/types/tx_msg_create_did_test.go
index d0d00c3f3..714504135 100644
--- a/x/cheqd/types/tx_msg_create_did_test.go
+++ b/x/cheqd/types/tx_msg_create_did_test.go
@@ -30,7 +30,7 @@ var _ = Describe("Message for DID creation", func() {
 	})
 
 	When("all fields are set properly", func() {
-		It("Will pass", func() {
+		It("should pass", func() {
 			struct_ = &MsgCreateDid{
 				Payload: &MsgCreateDidPayload{
 					Id: "did:cheqd:testnet:123456789abcdefg",

From c76a086121d4ba2554622d7bb858e0b7c02df483 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Tue, 11 Oct 2022 09:11:13 +0300
Subject: [PATCH 25/76] Enable lint and build stages

---
 .github/workflows/dispatch.yml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index 853556039..d1f5b075c 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -7,25 +7,24 @@ concurrency:
 
 jobs:
 
-  # call-lint:
-  #   name: "Lint"
-  #   uses: ./.github/workflows/lint.yml
+ call-lint:
+    name: "Lint"
+    uses: ./.github/workflows/lint.yml
 
-#  call-build:
-#    name: "Build"
-#    # needs: call-lint
-#    uses: ./.github/workflows/build.yml
-#    secrets: inherit
+ call-build:
+    name: "Build"
+    needs: call-lint
+    uses: ./.github/workflows/build.yml
+    secrets: inherit
 
-  call-test:
+ call-test:
     name: "Test"
-#    needs: call-build
+    needs: call-build
     uses: ./.github/workflows/test.yml
 
-  call-release:
+ call-release:
     name: "Release"
-#    needs: [call-test, call-build]
-    needs: call-test
+    needs: [call-test, call-build]
     if: ${{ github.ref_protected == true }}
     uses: ./.github/workflows/release.yml
     secrets: inherit
\ No newline at end of file

From 338b6019dc168b64d21c76c6d8343ba7bfc5fa73 Mon Sep 17 00:00:00 2001
From: Alexandr Kolesov <kolesov.alex.s@gmail.com>
Date: Tue, 11 Oct 2022 14:18:26 +0500
Subject: [PATCH 26/76] Cleaning up

---
 x/cheqd/tests/create_did_test.go              | 10 +--
 x/cheqd/tests/setup.go                        | 32 +++-----
 x/cheqd/tests/{constants.go => test_data.go}  |  0
 x/cheqd/tests/tests_suite_test.go             |  4 +-
 x/cheqd/tests/types.go                        | 13 +++
 x/cheqd/tests/update_did_test.go              | 33 ++++----
 x/cheqd/tests/utils.go                        |  8 +-
 x/cheqd/types/types_test.go                   |  2 +-
 x/cheqd/utils/utils_suite_test.go             |  2 +-
 x/resource/tests/create_resource_test.go      | 81 +++++++++----------
 .../tests/query_all_resource_versions_test.go | 43 +++++-----
 .../tests/query_collection_resources_test.go  | 25 +++---
 x/resource/tests/query_resource_test.go       | 31 ++++---
 x/resource/tests/tests_suite_test.go          |  4 +-
 x/resource/types/types_suite_test.go          |  2 +-
 x/resource/utils/utils_suite_test.go          |  2 +-
 16 files changed, 146 insertions(+), 146 deletions(-)
 rename x/cheqd/tests/{constants.go => test_data.go} (100%)
 create mode 100644 x/cheqd/tests/types.go

diff --git a/x/cheqd/tests/create_did_test.go b/x/cheqd/tests/create_did_test.go
index 3c60d01cb..dddc534ab 100644
--- a/x/cheqd/tests/create_did_test.go
+++ b/x/cheqd/tests/create_did_test.go
@@ -39,14 +39,14 @@ var _ = Describe("Create DID tests", func() {
 
 		for _, vm := range msg.VerificationMethod {
 			if vm.PublicKeyMultibase == "" {
-				vm.PublicKeyMultibase, err = multibase.Encode(multibase.Base58BTC, keys[vm.Id].PublicKey)
+				vm.PublicKeyMultibase, err = multibase.Encode(multibase.Base58BTC, keys[vm.Id].Public)
 			}
 			Expect(err).To(BeNil())
 		}
 
 		signerKeys := map[string]ed25519.PrivateKey{}
 		for _, signer := range signers {
-			signerKeys[signer] = keys[signer].PrivateKey
+			signerKeys[signer] = keys[signer].Private
 		}
 
 		did, err := setup.SendCreateDid(msg, signerKeys)
@@ -325,7 +325,7 @@ var _ = Describe("Create DID tests", func() {
 					Id:                 ImposterKey1,
 					Type:               Ed25519VerificationKey2020,
 					Controller:         ImposterDID,
-					PublicKeyMultibase: "z" + base58.Encode(mainKeys[ImposterKey1].PublicKey),
+					PublicKeyMultibase: "z" + base58.Encode(mainKeys[ImposterKey1].Public),
 				},
 			},
 		}
@@ -346,7 +346,7 @@ var _ = Describe("Create DID tests", func() {
 					Id:                 ImposterKey1,
 					Type:               Ed25519VerificationKey2020,
 					Controller:         ImposterDID,
-					PublicKeyMultibase: "z" + base58.Encode(mainKeys[ImposterKey1].PublicKey),
+					PublicKeyMultibase: "z" + base58.Encode(mainKeys[ImposterKey1].Public),
 				},
 			},
 		}
@@ -368,7 +368,7 @@ var _ = Describe("Create DID tests", func() {
 					Id:                 ImposterKey1,
 					Type:               Ed25519VerificationKey2020,
 					Controller:         ImposterDID,
-					PublicKeyMultibase: "z" + base58.Encode(mainKeys[ImposterKey1].PublicKey),
+					PublicKeyMultibase: "z" + base58.Encode(mainKeys[ImposterKey1].Public),
 				},
 			},
 		}
diff --git a/x/cheqd/tests/setup.go b/x/cheqd/tests/setup.go
index b5fdf30f3..975cbb106 100644
--- a/x/cheqd/tests/setup.go
+++ b/x/cheqd/tests/setup.go
@@ -24,11 +24,6 @@ import (
 
 const Ed25519VerificationKey2020 = "Ed25519VerificationKey2020"
 
-type KeyPair struct {
-	PrivateKey ed25519.PrivateKey
-	PublicKey  ed25519.PublicKey
-}
-
 type TestSetup struct {
 	Cdc     codec.Codec
 	Ctx     sdk.Context
@@ -36,11 +31,6 @@ type TestSetup struct {
 	Handler sdk.Handler
 }
 
-type SignerKey struct {
-	signer string
-	key    ed25519.PrivateKey
-}
-
 func Setup() TestSetup {
 	// Init Codec
 	ir := codectypes.NewInterfaceRegistry()
@@ -147,14 +137,14 @@ func (s *TestSetup) WrapCreateRequest(payload *types.MsgCreateDidPayload, keys m
 	}
 }
 
-func (s *TestSetup) WrapUpdateRequest(payload *types.MsgUpdateDidPayload, keys []SignerKey) *types.MsgUpdateDid {
+func (s *TestSetup) WrapUpdateRequest(payload *types.MsgUpdateDidPayload, keys []SignInput) *types.MsgUpdateDid {
 	var signatures []*types.SignInfo
 	signingInput := payload.GetSignBytes()
 
 	for _, skey := range keys {
-		signature := base64.StdEncoding.EncodeToString(ed25519.Sign(skey.key, signingInput))
+		signature := base64.StdEncoding.EncodeToString(ed25519.Sign(skey.Key, signingInput))
 		signatures = append(signatures, &types.SignInfo{
-			VerificationMethodId: skey.signer,
+			VerificationMethodId: skey.VerificationMethodId,
 			Signature:            signature,
 		})
 	}
@@ -192,7 +182,7 @@ func (s *TestSetup) InitDid(did string) (map[string]ed25519.PrivateKey, *types.M
 	return keys, didMsg, nil
 }
 
-func (s *TestSetup) SendUpdateDid(msg *types.MsgUpdateDidPayload, keys []SignerKey) (*types.Did, error) {
+func (s *TestSetup) SendUpdateDid(msg *types.MsgUpdateDidPayload, keys []SignInput) (*types.Did, error) {
 	// query Did
 	state, _ := s.Keeper.GetDid(&s.Ctx, msg.Id)
 	if len(msg.VersionId) == 0 {
@@ -226,12 +216,12 @@ func ConcatKeys(dst map[string]ed25519.PrivateKey, src map[string]ed25519.Privat
 	return dst
 }
 
-func MapToListOfSignerKeys(mp map[string]ed25519.PrivateKey) []SignerKey {
-	rlist := []SignerKey{}
+func MapToListOfSignerKeys(mp map[string]ed25519.PrivateKey) []SignInput {
+	rlist := []SignInput{}
 	for k, v := range mp {
-		rlist = append(rlist, SignerKey{
-			signer: k,
-			key:    v,
+		rlist = append(rlist, SignInput{
+			VerificationMethodId: k,
+			Key:                  v,
 		})
 	}
 	return rlist
@@ -326,7 +316,7 @@ func (s TestSetup) CreateTestDIDs(keys map[string]KeyPair) error {
 		msg := prefilled.msg
 
 		for _, vm := range msg.VerificationMethod {
-			encoded, err := multibase.Encode(multibase.Base58BTC, keys[vm.Id].PublicKey)
+			encoded, err := multibase.Encode(multibase.Base58BTC, keys[vm.Id].Public)
 			if err != nil {
 				return err
 			}
@@ -335,7 +325,7 @@ func (s TestSetup) CreateTestDIDs(keys map[string]KeyPair) error {
 
 		signerKeys := map[string]ed25519.PrivateKey{}
 		for _, signer := range prefilled.signers {
-			signerKeys[signer] = keys[signer].PrivateKey
+			signerKeys[signer] = keys[signer].Private
 		}
 
 		_, err := s.SendCreateDid(msg, signerKeys)
diff --git a/x/cheqd/tests/constants.go b/x/cheqd/tests/test_data.go
similarity index 100%
rename from x/cheqd/tests/constants.go
rename to x/cheqd/tests/test_data.go
diff --git a/x/cheqd/tests/tests_suite_test.go b/x/cheqd/tests/tests_suite_test.go
index bd60da49f..eab13e53b 100644
--- a/x/cheqd/tests/tests_suite_test.go
+++ b/x/cheqd/tests/tests_suite_test.go
@@ -1,4 +1,4 @@
-package tests_test
+package tests
 
 import (
 	"testing"
@@ -9,5 +9,5 @@ import (
 
 func TestTestsGeneral(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "General Tests Suite")
+	RunSpecs(t, "Cheqd Module")
 }
diff --git a/x/cheqd/tests/types.go b/x/cheqd/tests/types.go
new file mode 100644
index 000000000..ddafef7bd
--- /dev/null
+++ b/x/cheqd/tests/types.go
@@ -0,0 +1,13 @@
+package tests
+
+import "crypto/ed25519"
+
+type KeyPair struct {
+	Private ed25519.PrivateKey
+	Public  ed25519.PublicKey
+}
+
+type SignInput struct {
+	VerificationMethodId string
+	Key                  ed25519.PrivateKey
+}
diff --git a/x/cheqd/tests/update_did_test.go b/x/cheqd/tests/update_did_test.go
index 4917283a2..244fc1db5 100644
--- a/x/cheqd/tests/update_did_test.go
+++ b/x/cheqd/tests/update_did_test.go
@@ -15,7 +15,7 @@ var _ = Describe("Update DID tests", func() {
 	// params for cases
 	var valid bool
 	var signers []string
-	var signerKeys []SignerKey
+	var signerKeys []SignInput
 	var msg *types.MsgUpdateDidPayload
 	errMsg := ""
 
@@ -39,7 +39,7 @@ var _ = Describe("Update DID tests", func() {
 		// setup
 		valid = false
 		signers = []string{}
-		signerKeys = []SignerKey{}
+		signerKeys = []SignInput{}
 		msg = &types.MsgUpdateDidPayload{}
 		errMsg = ""
 	})
@@ -49,19 +49,19 @@ var _ = Describe("Update DID tests", func() {
 
 		for _, vm := range msg.VerificationMethod {
 			if vm.PublicKeyMultibase == "" {
-				vm.PublicKeyMultibase, err = multibase.Encode(multibase.Base58BTC, mainKeys[vm.Id].PublicKey)
+				vm.PublicKeyMultibase, err = multibase.Encode(multibase.Base58BTC, mainKeys[vm.Id].Public)
 			}
 			Expect(err).To(BeNil())
 		}
 
-		compiledKeys := []SignerKey{}
+		compiledKeys := []SignInput{}
 		if len(signerKeys) > 0 {
 			compiledKeys = signerKeys
 		} else {
 			for _, signer := range signers {
-				compiledKeys = append(compiledKeys, SignerKey{
-					signer: signer,
-					key:    mainKeys[signer].PrivateKey,
+				compiledKeys = append(compiledKeys, SignInput{
+					VerificationMethodId: signer,
+					Key:                  mainKeys[signer].Private,
 				})
 			}
 		}
@@ -89,24 +89,25 @@ var _ = Describe("Update DID tests", func() {
 
 	It("Valid: Key rotation works", func() {
 		valid = true
-		signerKeys = []SignerKey{
+		signerKeys = []SignInput{
 			{
-				signer: AliceKey1,
-				key:    mainKeys[AliceKey1].PrivateKey,
+				VerificationMethodId: AliceKey1,
+				Key:                  mainKeys[AliceKey1].Private,
 			},
 			{
-				signer: AliceKey1,
-				key:    mainKeys[AliceKey2].PrivateKey,
+				VerificationMethodId: AliceKey1,
+				Key:                  mainKeys[AliceKey2].Private,
 			},
 		}
 		msg = &types.MsgUpdateDidPayload{
 			Id: AliceDID,
 			VerificationMethod: []*types.VerificationMethod{
 				{
-					Id:                 AliceKey1,
-					Type:               Ed25519VerificationKey2020,
-					Controller:         AliceDID,
-					PublicKeyMultibase: "z" + base58.Encode(mainKeys[AliceKey2].PublicKey),
+					Id:         AliceKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: AliceDID,
+					// TODO: Use multibase encoding
+					PublicKeyMultibase: "z" + base58.Encode(mainKeys[AliceKey2].Public),
 				},
 			},
 		}
diff --git a/x/cheqd/tests/utils.go b/x/cheqd/tests/utils.go
index f6a79c69c..6509bec72 100644
--- a/x/cheqd/tests/utils.go
+++ b/x/cheqd/tests/utils.go
@@ -6,18 +6,18 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var letters = []rune("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz")
+var base58Runes = []rune("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz")
 
-func randSeq(n int) string {
+func randBase58Seq(n int) string {
 	b := make([]rune, n)
 	for i := range b {
-		b[i] = letters[rand.Intn(len(letters))]
+		b[i] = base58Runes[rand.Intn(len(base58Runes))]
 	}
 	return string(b)
 }
 
 func GenerateDID() string {
-	return "did:cheqd:test:" + randSeq(16)
+	return "did:cheqd:test:" + randBase58Seq(16)
 }
 
 func GenerateFragment(did string) string {
diff --git a/x/cheqd/types/types_test.go b/x/cheqd/types/types_test.go
index d3c237d8d..0421edfd7 100644
--- a/x/cheqd/types/types_test.go
+++ b/x/cheqd/types/types_test.go
@@ -9,5 +9,5 @@ import (
 
 func TestUtils(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Types Tests Suite")
+	RunSpecs(t, "Cheqd Module Types")
 }
diff --git a/x/cheqd/utils/utils_suite_test.go b/x/cheqd/utils/utils_suite_test.go
index 9ca82ff0d..6bd2b0c8e 100644
--- a/x/cheqd/utils/utils_suite_test.go
+++ b/x/cheqd/utils/utils_suite_test.go
@@ -9,5 +9,5 @@ import (
 
 func TestUtils(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Utils Suite")
+	RunSpecs(t, "Cheqd Module Utils")
 }
diff --git a/x/resource/tests/create_resource_test.go b/x/resource/tests/create_resource_test.go
index 6156e48bf..ca31f3694 100644
--- a/x/resource/tests/create_resource_test.go
+++ b/x/resource/tests/create_resource_test.go
@@ -1,4 +1,4 @@
-package tests_test
+package tests
 
 import (
 	"crypto/ed25519"
@@ -6,7 +6,6 @@ import (
 	"fmt"
 
 	cheqdutils "github.com/cheqd/cheqd-node/x/cheqd/utils"
-	resourcetests "github.com/cheqd/cheqd-node/x/resource/tests"
 	resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -15,16 +14,16 @@ import (
 
 var _ = Describe("CreateResource", func() {
 	Describe("Validate", func() {
-		var setup resourcetests.TestSetup
+		var setup TestSetup
 		var err error
-		keys := resourcetests.GenerateTestKeys()
+		keys := GenerateTestKeys()
 		BeforeEach(func() {
-			setup = resourcetests.Setup()
-			didDoc := setup.CreateDid(keys[resourcetests.ExistingDIDKey].PublicKey, resourcetests.ExistingDID)
-			_, err = setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey})
+			setup = Setup()
+			didDoc := setup.CreateDid(keys[ExistingDIDKey].Public, ExistingDID)
+			_, err = setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
-			resourcePayload := resourcetests.GenerateCreateResourcePayload(resourcetests.ExistingResource())
-			_, err = setup.SendCreateResource(resourcePayload, map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey})
+			resourcePayload := GenerateCreateResourcePayload(ExistingResource())
+			_, err = setup.SendCreateResource(resourcePayload, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
 		})
 		DescribeTable("Validate MsgCreateResource",
@@ -60,73 +59,73 @@ var _ = Describe("CreateResource", func() {
 			},
 			Entry("Valid: Works",
 				true,
-				map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey},
+				map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private},
 				&resourcetypes.MsgCreateResourcePayload{
-					CollectionId: resourcetests.ExistingDIDIdentifier,
-					Id:           resourcetests.ResourceId,
+					CollectionId: ExistingDIDIdentifier,
+					Id:           ResourceId,
 					Name:         "Test Resource Name",
-					ResourceType: resourcetests.CLSchemaType,
-					Data:         []byte(resourcetests.SchemaData),
+					ResourceType: CLSchemaType,
+					Data:         []byte(SchemaData),
 				},
-				resourcetests.JsonResourceType,
+				JsonResourceType,
 				"",
 				"",
 			),
 			Entry("Valid: Add new resource version",
 				true,
-				map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey},
+				map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private},
 				&resourcetypes.MsgCreateResourcePayload{
-					CollectionId: resourcetests.ExistingResource().Header.CollectionId,
-					Id:           resourcetests.ResourceId,
-					Name:         resourcetests.ExistingResource().Header.Name,
-					ResourceType: resourcetests.ExistingResource().Header.ResourceType,
-					Data:         resourcetests.ExistingResource().Data,
+					CollectionId: ExistingResource().Header.CollectionId,
+					Id:           ResourceId,
+					Name:         ExistingResource().Header.Name,
+					ResourceType: ExistingResource().Header.ResourceType,
+					Data:         ExistingResource().Data,
 				},
-				resourcetests.ExistingResource().Header.MediaType,
-				resourcetests.ExistingResource().Header.Id,
+				ExistingResource().Header.MediaType,
+				ExistingResource().Header.Id,
 				"",
 			),
 			Entry("Invalid: No signature",
 				false,
 				map[string]ed25519.PrivateKey{},
 				&resourcetypes.MsgCreateResourcePayload{
-					CollectionId: resourcetests.ExistingDIDIdentifier,
-					Id:           resourcetests.ResourceId,
+					CollectionId: ExistingDIDIdentifier,
+					Id:           ResourceId,
 					Name:         "Test Resource Name",
-					ResourceType: resourcetests.CLSchemaType,
-					Data:         []byte(resourcetests.SchemaData),
+					ResourceType: CLSchemaType,
+					Data:         []byte(SchemaData),
 				},
-				resourcetests.JsonResourceType,
+				JsonResourceType,
 				"",
-				fmt.Errorf("signer: %s: signature is required but not found", resourcetests.ExistingDID).Error(),
+				fmt.Errorf("signer: %s: signature is required but not found", ExistingDID).Error(),
 			),
 			Entry("Invalid: Resource Id is not an acceptable format",
 				false,
 				map[string]ed25519.PrivateKey{},
 				&resourcetypes.MsgCreateResourcePayload{
-					CollectionId: resourcetests.ExistingDIDIdentifier,
-					Id:           resourcetests.IncorrectResourceId,
+					CollectionId: ExistingDIDIdentifier,
+					Id:           IncorrectResourceId,
 					Name:         "Test Resource Name",
-					ResourceType: resourcetests.CLSchemaType,
-					Data:         []byte(resourcetests.SchemaData),
+					ResourceType: CLSchemaType,
+					Data:         []byte(SchemaData),
 				},
-				resourcetests.JsonResourceType,
+				JsonResourceType,
 				"",
-				fmt.Errorf("signer: %s: signature is required but not found", resourcetests.ExistingDID).Error(),
+				fmt.Errorf("signer: %s: signature is required but not found", ExistingDID).Error(),
 			),
 			Entry("Invalid: DidDoc not found",
 				false,
 				map[string]ed25519.PrivateKey{},
 				&resourcetypes.MsgCreateResourcePayload{
-					CollectionId: resourcetests.NotFoundDIDIdentifier,
-					Id:           resourcetests.IncorrectResourceId,
+					CollectionId: NotFoundDIDIdentifier,
+					Id:           IncorrectResourceId,
 					Name:         "Test Resource Name",
-					ResourceType: resourcetests.CLSchemaType,
-					Data:         []byte(resourcetests.SchemaData),
+					ResourceType: CLSchemaType,
+					Data:         []byte(SchemaData),
 				},
-				resourcetests.JsonResourceType,
+				JsonResourceType,
 				"",
-				fmt.Errorf("did:cheqd:test:%s: not found", resourcetests.NotFoundDIDIdentifier).Error(),
+				fmt.Errorf("did:cheqd:test:%s: not found", NotFoundDIDIdentifier).Error(),
 			),
 		)
 	})
diff --git a/x/resource/tests/query_all_resource_versions_test.go b/x/resource/tests/query_all_resource_versions_test.go
index e70307963..23ffdb903 100644
--- a/x/resource/tests/query_all_resource_versions_test.go
+++ b/x/resource/tests/query_all_resource_versions_test.go
@@ -1,10 +1,9 @@
-package tests_test
+package tests
 
 import (
 	"crypto/ed25519"
 	"fmt"
 
-	resourcetests "github.com/cheqd/cheqd-node/x/resource/tests"
 	"github.com/cheqd/cheqd-node/x/resource/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
@@ -14,15 +13,15 @@ import (
 
 var _ = Describe("QueryAllResourceVersions", func() {
 	Describe("Validate", func() {
-		var setup resourcetests.TestSetup
-		keys := resourcetests.GenerateTestKeys()
+		var setup TestSetup
+		keys := GenerateTestKeys()
 		BeforeEach(func() {
-			setup = resourcetests.Setup()
-			didDoc := setup.CreateDid(keys[resourcetests.ExistingDIDKey].PublicKey, resourcetests.ExistingDID)
-			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey})
+			setup = Setup()
+			didDoc := setup.CreateDid(keys[ExistingDIDKey].Public, ExistingDID)
+			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
-			payload := resourcetests.GenerateCreateResourcePayload(resourcetests.ExistingResource())
-			_, err = setup.SendCreateResource(payload, map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey})
+			payload := GenerateCreateResourcePayload(ExistingResource())
+			_, err = setup.SendCreateResource(payload, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
 		})
 		DescribeTable("Validate QueryGetAllResourceVersionsRequest",
@@ -33,17 +32,17 @@ var _ = Describe("QueryAllResourceVersions", func() {
 				response *types.QueryGetAllResourceVersionsResponse,
 				errMsg string,
 			) {
-				existingResource := resourcetests.ExistingResource()
+				existingResource := ExistingResource()
 
-				payload := resourcetests.GenerateCreateResourcePayload(existingResource)
-				payload.Id = resourcetests.ResourceId
+				payload := GenerateCreateResourcePayload(existingResource)
+				payload.Id = ResourceId
 
 				nextVersionResource, err := setup.SendCreateResource(payload, signerKeys)
 				Expect(err).To(BeNil())
 				Expect(nextVersionResource).ToNot(Equal(existingResource))
 
-				payload = resourcetests.GenerateCreateResourcePayload(existingResource)
-				payload.Id = resourcetests.AnotherResourceId
+				payload = GenerateCreateResourcePayload(existingResource)
+				payload.Id = AnotherResourceId
 				payload.Name = "AnotherResourceVersion"
 				differentResource, err := setup.SendCreateResource(payload, signerKeys)
 				Expect(err).To(BeNil())
@@ -72,27 +71,27 @@ var _ = Describe("QueryAllResourceVersions", func() {
 			},
 			Entry("Valid: should return all resources",
 				true,
-				map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey},
+				map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private},
 				&types.QueryGetAllResourceVersionsRequest{
-					CollectionId: resourcetests.ExistingDIDIdentifier,
-					Name:         resourcetests.ExistingResource().Header.Name,
+					CollectionId: ExistingDIDIdentifier,
+					Name:         ExistingResource().Header.Name,
 				},
 				&types.QueryGetAllResourceVersionsResponse{
 					Resources: []*types.ResourceHeader{
-						resourcetests.ExistingResource().Header,
+						ExistingResource().Header,
 					},
 				},
 				"",
 			),
 			Entry("Invalid: should return an error if the collection id is invalid",
 				false,
-				map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey},
+				map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private},
 				&types.QueryGetAllResourceVersionsRequest{
-					CollectionId: resourcetests.NotFoundDIDIdentifier,
-					Name:         resourcetests.ExistingResource().Header.Name,
+					CollectionId: NotFoundDIDIdentifier,
+					Name:         ExistingResource().Header.Name,
 				},
 				nil,
-				fmt.Errorf("did:cheqd:test:%s: DID Doc not found", resourcetests.NotFoundDIDIdentifier).Error(),
+				fmt.Errorf("did:cheqd:test:%s: DID Doc not found", NotFoundDIDIdentifier).Error(),
 			),
 		)
 	})
diff --git a/x/resource/tests/query_collection_resources_test.go b/x/resource/tests/query_collection_resources_test.go
index abd7d6bff..198810ec3 100644
--- a/x/resource/tests/query_collection_resources_test.go
+++ b/x/resource/tests/query_collection_resources_test.go
@@ -1,10 +1,9 @@
-package tests_test
+package tests
 
 import (
 	"crypto/ed25519"
 	"fmt"
 
-	resourcetests "github.com/cheqd/cheqd-node/x/resource/tests"
 	resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
@@ -14,15 +13,15 @@ import (
 
 var _ = Describe("QueryCollectionResources", func() {
 	Describe("Validate", func() {
-		var setup resourcetests.TestSetup
-		keys := resourcetests.GenerateTestKeys()
+		var setup TestSetup
+		keys := GenerateTestKeys()
 		BeforeEach(func() {
-			setup = resourcetests.Setup()
-			didDoc := setup.CreateDid(keys[resourcetests.ExistingDIDKey].PublicKey, resourcetests.ExistingDID)
-			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey})
+			setup = Setup()
+			didDoc := setup.CreateDid(keys[ExistingDIDKey].Public, ExistingDID)
+			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
-			payload := resourcetests.GenerateCreateResourcePayload(resourcetests.ExistingResource())
-			_, err = setup.SendCreateResource(payload, map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey})
+			payload := GenerateCreateResourcePayload(ExistingResource())
+			_, err = setup.SendCreateResource(payload, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
 		})
 		DescribeTable("Validate QueryCollectionResources",
@@ -51,20 +50,20 @@ var _ = Describe("QueryCollectionResources", func() {
 			Entry("Valid: Works",
 				true,
 				&resourcetypes.QueryGetCollectionResourcesRequest{
-					CollectionId: resourcetests.ExistingDIDIdentifier,
+					CollectionId: ExistingDIDIdentifier,
 				},
 				&resourcetypes.QueryGetCollectionResourcesResponse{
-					Resources: []*resourcetypes.ResourceHeader{resourcetests.ExistingResource().Header},
+					Resources: []*resourcetypes.ResourceHeader{ExistingResource().Header},
 				},
 				"",
 			),
 			Entry("Invalid: DID Doc is not found",
 				false,
 				&resourcetypes.QueryGetCollectionResourcesRequest{
-					CollectionId: resourcetests.NotFoundDIDIdentifier,
+					CollectionId: NotFoundDIDIdentifier,
 				},
 				nil,
-				fmt.Errorf("did:cheqd:test:%s: DID Doc not found", resourcetests.NotFoundDIDIdentifier).Error(),
+				fmt.Errorf("did:cheqd:test:%s: DID Doc not found", NotFoundDIDIdentifier).Error(),
 			),
 		)
 	})
diff --git a/x/resource/tests/query_resource_test.go b/x/resource/tests/query_resource_test.go
index 0abe65791..6ee4b9d0e 100644
--- a/x/resource/tests/query_resource_test.go
+++ b/x/resource/tests/query_resource_test.go
@@ -1,11 +1,10 @@
-package tests_test
+package tests
 
 import (
 	"crypto/ed25519"
 	"crypto/sha256"
 	"fmt"
 
-	resourcetests "github.com/cheqd/cheqd-node/x/resource/tests"
 	resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	. "github.com/onsi/ginkgo/v2"
@@ -14,16 +13,16 @@ import (
 
 var _ = Describe("QueryGetResource", func() {
 	Describe("Validate", func() {
-		var setup resourcetests.TestSetup
-		keys := resourcetests.GenerateTestKeys()
-		existingResource := resourcetests.ExistingResource()
+		var setup TestSetup
+		keys := GenerateTestKeys()
+		existingResource := ExistingResource()
 		BeforeEach(func() {
-			setup = resourcetests.Setup()
-			didDoc := setup.CreateDid(keys[resourcetests.ExistingDIDKey].PublicKey, resourcetests.ExistingDID)
-			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey})
+			setup = Setup()
+			didDoc := setup.CreateDid(keys[ExistingDIDKey].Public, ExistingDID)
+			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
-			payload := resourcetests.GenerateCreateResourcePayload(resourcetests.ExistingResource())
-			_, err = setup.SendCreateResource(payload, map[string]ed25519.PrivateKey{resourcetests.ExistingDIDKey: keys[resourcetests.ExistingDIDKey].PrivateKey})
+			payload := GenerateCreateResourcePayload(ExistingResource())
+			_, err = setup.SendCreateResource(payload, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
 		})
 		DescribeTable("Validate QueryGetResourceRequest",
@@ -56,7 +55,7 @@ var _ = Describe("QueryGetResource", func() {
 			Entry("Valid: Works",
 				true,
 				&resourcetypes.QueryGetResourceRequest{
-					CollectionId: resourcetests.ExistingDIDIdentifier,
+					CollectionId: ExistingDIDIdentifier,
 					Id:           existingResource.Header.Id,
 				},
 				&resourcetypes.QueryGetResourceResponse{
@@ -67,20 +66,20 @@ var _ = Describe("QueryGetResource", func() {
 			Entry("Invalid: Resource not found",
 				false,
 				&resourcetypes.QueryGetResourceRequest{
-					CollectionId: resourcetests.ExistingDIDIdentifier,
-					Id:           resourcetests.AnotherResourceId,
+					CollectionId: ExistingDIDIdentifier,
+					Id:           AnotherResourceId,
 				},
 				nil,
-				fmt.Errorf("resource %s:%s: not found", resourcetests.ExistingDIDIdentifier, resourcetests.AnotherResourceId).Error(),
+				fmt.Errorf("resource %s:%s: not found", ExistingDIDIdentifier, AnotherResourceId).Error(),
 			),
 			Entry("Invalid: DIDDoc not found",
 				false,
 				&resourcetypes.QueryGetResourceRequest{
-					CollectionId: resourcetests.NotFoundDIDIdentifier,
+					CollectionId: NotFoundDIDIdentifier,
 					Id:           existingResource.Header.Id,
 				},
 				nil,
-				fmt.Errorf("did:cheqd:test:%s: DID Doc not found", resourcetests.NotFoundDIDIdentifier).Error(),
+				fmt.Errorf("did:cheqd:test:%s: DID Doc not found", NotFoundDIDIdentifier).Error(),
 			),
 		)
 	})
diff --git a/x/resource/tests/tests_suite_test.go b/x/resource/tests/tests_suite_test.go
index 3b0acded2..c77802530 100644
--- a/x/resource/tests/tests_suite_test.go
+++ b/x/resource/tests/tests_suite_test.go
@@ -1,4 +1,4 @@
-package tests_test
+package tests
 
 import (
 	"testing"
@@ -9,5 +9,5 @@ import (
 
 func TestTests(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Tests Suite")
+	RunSpecs(t, "Resource Module")
 }
diff --git a/x/resource/types/types_suite_test.go b/x/resource/types/types_suite_test.go
index b1cf86cdb..cb73a491c 100644
--- a/x/resource/types/types_suite_test.go
+++ b/x/resource/types/types_suite_test.go
@@ -9,5 +9,5 @@ import (
 
 func TestTypes(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Resource Types Suite")
+	RunSpecs(t, "Resource Module Types")
 }
diff --git a/x/resource/utils/utils_suite_test.go b/x/resource/utils/utils_suite_test.go
index 5c7bf50ab..27ffc5d23 100644
--- a/x/resource/utils/utils_suite_test.go
+++ b/x/resource/utils/utils_suite_test.go
@@ -9,5 +9,5 @@ import (
 
 func TestUtils(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Resource Utils Suite")
+	RunSpecs(t, "Resource Module Utils")
 }

From faa0dd0405ec126f3e66a97b7f263e773f81dba5 Mon Sep 17 00:00:00 2001
From: Alexandr Kolesov <kolesov.alex.s@gmail.com>
Date: Tue, 11 Oct 2022 16:04:25 +0500
Subject: [PATCH 27/76] Switch wrom legacy routers to proto servers

---
 x/cheqd/keeper/msg_server.go                  |  6 +-
 x/cheqd/keeper/msg_server_create_did.go       |  2 +-
 x/cheqd/keeper/msg_server_update_did.go       |  2 +-
 x/cheqd/keeper/query_server.go                |  6 +-
 x/cheqd/tests/config.go                       |  3 +
 x/cheqd/tests/const.go                        |  3 +
 x/cheqd/tests/create_did_test.go              | 77 ++++++++++++++++++
 x/cheqd/tests/setup.go                        | 78 +++++++++++--------
 x/cheqd/tests/utils.go                        | 11 ++-
 x/resource/tests/create_resource_test.go      |  4 +-
 .../tests/query_all_resource_versions_test.go |  3 +-
 .../tests/query_collection_resources_test.go  |  3 +-
 x/resource/tests/query_resource_test.go       |  3 +-
 x/resource/tests/setup.go                     | 50 +++++++-----
 14 files changed, 180 insertions(+), 71 deletions(-)
 create mode 100644 x/cheqd/tests/config.go
 create mode 100644 x/cheqd/tests/const.go

diff --git a/x/cheqd/keeper/msg_server.go b/x/cheqd/keeper/msg_server.go
index ee41b5468..f7a9e5110 100644
--- a/x/cheqd/keeper/msg_server.go
+++ b/x/cheqd/keeper/msg_server.go
@@ -8,16 +8,16 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-type msgServer struct {
+type MsgServer struct {
 	Keeper
 }
 
 // NewMsgServer returns an implementation of the MsgServer interface for the provided Keeper.
 func NewMsgServer(keeper Keeper) types.MsgServer {
-	return &msgServer{Keeper: keeper}
+	return &MsgServer{Keeper: keeper}
 }
 
-var _ types.MsgServer = msgServer{}
+var _ types.MsgServer = MsgServer{}
 
 func FindDid(k *Keeper, ctx *sdk.Context, inMemoryDIDs map[string]types.StateValue, did string) (res types.StateValue, found bool, err error) {
 	// Look in inMemory dict
diff --git a/x/cheqd/keeper/msg_server_create_did.go b/x/cheqd/keeper/msg_server_create_did.go
index 2ba9df228..10809d56e 100644
--- a/x/cheqd/keeper/msg_server_create_did.go
+++ b/x/cheqd/keeper/msg_server_create_did.go
@@ -8,7 +8,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-func (k msgServer) CreateDid(goCtx context.Context, msg *types.MsgCreateDid) (*types.MsgCreateDidResponse, error) {
+func (k MsgServer) CreateDid(goCtx context.Context, msg *types.MsgCreateDid) (*types.MsgCreateDidResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	// Validate DID doesn't exist
diff --git a/x/cheqd/keeper/msg_server_update_did.go b/x/cheqd/keeper/msg_server_update_did.go
index d19e6a66f..8e7fcaea7 100644
--- a/x/cheqd/keeper/msg_server_update_did.go
+++ b/x/cheqd/keeper/msg_server_update_did.go
@@ -10,7 +10,7 @@ import (
 
 const UpdatedPostfix string = "-updated"
 
-func (k msgServer) UpdateDid(goCtx context.Context, msg *types.MsgUpdateDid) (*types.MsgUpdateDidResponse, error) {
+func (k MsgServer) UpdateDid(goCtx context.Context, msg *types.MsgUpdateDid) (*types.MsgUpdateDidResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	// Validate DID does exist
diff --git a/x/cheqd/keeper/query_server.go b/x/cheqd/keeper/query_server.go
index 966633539..e3a62bffc 100644
--- a/x/cheqd/keeper/query_server.go
+++ b/x/cheqd/keeper/query_server.go
@@ -4,13 +4,13 @@ import (
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
 )
 
-type queryServer struct {
+type QueryServer struct {
 	Keeper
 }
 
 // NewQueryServer returns an implementation of the MsgServer interface for the provided Keeper.
 func NewQueryServer(keeper Keeper) types.QueryServer {
-	return &queryServer{Keeper: keeper}
+	return &QueryServer{Keeper: keeper}
 }
 
-var _ types.QueryServer = queryServer{}
+var _ types.QueryServer = QueryServer{}
diff --git a/x/cheqd/tests/config.go b/x/cheqd/tests/config.go
new file mode 100644
index 000000000..9d067e0c2
--- /dev/null
+++ b/x/cheqd/tests/config.go
@@ -0,0 +1,3 @@
+package tests
+
+const DID_NAMESPACE = "test"
diff --git a/x/cheqd/tests/const.go b/x/cheqd/tests/const.go
new file mode 100644
index 000000000..cd5394f9c
--- /dev/null
+++ b/x/cheqd/tests/const.go
@@ -0,0 +1,3 @@
+package tests
+
+const Ed25519VerificationKey2020 = "Ed25519VerificationKey2020"
diff --git a/x/cheqd/tests/create_did_test.go b/x/cheqd/tests/create_did_test.go
index dddc534ab..0cb4a7bad 100644
--- a/x/cheqd/tests/create_did_test.go
+++ b/x/cheqd/tests/create_did_test.go
@@ -13,6 +13,83 @@ import (
 	"github.com/multiformats/go-multibase"
 )
 
+var _ = Describe("Create DID tests new", func() {
+	// params for cases
+	var valid bool
+	var keys map[string]KeyPair
+	var signers []string
+	var msg *types.MsgCreateDidPayload
+	errMsg := ""
+
+	var setup TestSetup
+	var err error
+	mainKeys := GenerateTestKeys()
+
+	BeforeEach(func() {
+		// setup
+		valid = false
+		keys = map[string]KeyPair{}
+		signers = []string{}
+		msg = &types.MsgCreateDidPayload{}
+		errMsg = ""
+	})
+
+	AfterEach(func() {
+		setup = InitEnv(mainKeys)
+
+		for _, vm := range msg.VerificationMethod {
+			if vm.PublicKeyMultibase == "" {
+				vm.PublicKeyMultibase, err = multibase.Encode(multibase.Base58BTC, keys[vm.Id].Public)
+			}
+			Expect(err).To(BeNil())
+		}
+
+		signerKeys := map[string]ed25519.PrivateKey{}
+		for _, signer := range signers {
+			signerKeys[signer] = keys[signer].Private
+		}
+
+		did, err := setup.SendCreateDid(msg, signerKeys)
+
+		if valid {
+			Expect(err).To(BeNil())
+			Expect(msg.Id).To(Equal(did.Id))
+			Expect(msg.Controller).To(Equal(did.Controller))
+			Expect(msg.VerificationMethod).To(Equal(did.VerificationMethod))
+			Expect(msg.Authentication).To(Equal(did.Authentication))
+			Expect(msg.AssertionMethod).To(Equal(did.AssertionMethod))
+			Expect(msg.CapabilityInvocation).To(Equal(did.CapabilityInvocation))
+			Expect(msg.CapabilityDelegation).To(Equal(did.CapabilityDelegation))
+			Expect(msg.KeyAgreement).To(Equal(did.KeyAgreement))
+			Expect(msg.AlsoKnownAs).To(Equal(did.AlsoKnownAs))
+			Expect(msg.Service).To(Equal(did.Service))
+			Expect(msg.Context).To(Equal(did.Context))
+		} else {
+			Expect(err).To(HaveOccurred())
+			Expect(errMsg).To(Equal(err.Error()))
+		}
+	})
+
+	It("Valid: Works", func() {
+		valid = true
+		keys = map[string]KeyPair{
+			ImposterKey1: GenerateKeyPair(),
+		}
+		signers = []string{ImposterKey1}
+		msg = &types.MsgCreateDidPayload{
+			Id:             ImposterDID,
+			Authentication: []string{ImposterKey1},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:         ImposterKey1,
+					Type:       Ed25519VerificationKey2020,
+					Controller: ImposterDID,
+				},
+			},
+		}
+	})
+})
+
 var _ = Describe("Create DID tests", func() {
 	// params for cases
 	var valid bool
diff --git a/x/cheqd/tests/setup.go b/x/cheqd/tests/setup.go
index 975cbb106..2bde90df9 100644
--- a/x/cheqd/tests/setup.go
+++ b/x/cheqd/tests/setup.go
@@ -1,13 +1,12 @@
 package tests
 
 import (
+	"context"
 	"crypto/ed25519"
 	"crypto/rand"
 	"encoding/base64"
 	"time"
 
-	"github.com/btcsuite/btcutil/base58"
-	"github.com/cheqd/cheqd-node/x/cheqd"
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/multiformats/go-multibase"
@@ -22,13 +21,15 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-const Ed25519VerificationKey2020 = "Ed25519VerificationKey2020"
-
 type TestSetup struct {
-	Cdc     codec.Codec
-	Ctx     sdk.Context
-	Keeper  keeper.Keeper
-	Handler sdk.Handler
+	Cdc codec.Codec
+
+	SdkCtx sdk.Context
+	StdCtx context.Context
+
+	Keeper      keeper.Keeper
+	MsgServer   types.MsgServer
+	QueryServer types.QueryServer
 }
 
 func Setup() TestSetup {
@@ -59,21 +60,29 @@ func Setup() TestSetup {
 		tmproto.Header{ChainID: "test", Time: blockTime},
 		false, log.NewNopLogger()).WithTxBytes(txBytes)
 
-	handler := cheqd.NewHandler(*newKeeper)
+	msgServer := keeper.NewMsgServer(*newKeeper)
+	queryServer := keeper.NewQueryServer(*newKeeper)
 
 	setup := TestSetup{
-		Cdc:     cdc,
-		Ctx:     ctx,
-		Keeper:  *newKeeper,
-		Handler: handler,
+		Cdc: cdc,
+
+		SdkCtx: ctx,
+		StdCtx: sdk.WrapSDKContext(ctx),
+
+		Keeper:      *newKeeper,
+		MsgServer:   msgServer,
+		QueryServer: queryServer,
 	}
 
-	setup.Keeper.SetDidNamespace(&ctx, "test")
+	setup.Keeper.SetDidNamespace(&ctx, DID_NAMESPACE)
 	return setup
 }
 
 func (s *TestSetup) CreateDid(pubKey ed25519.PublicKey, did string) *types.MsgCreateDidPayload {
-	PublicKeyMultibase := "z" + base58.Encode(pubKey)
+	PublicKeyMultibase, err := multibase.Encode(multibase.Base58BTC, pubKey)
+	if err != nil {
+		panic(err)
+	}
 
 	VerificationMethod := types.VerificationMethod{
 		Id:                 did + "#key-1",
@@ -155,11 +164,6 @@ func (s *TestSetup) WrapUpdateRequest(payload *types.MsgUpdateDidPayload, keys [
 	}
 }
 
-func GenerateKeyPair() KeyPair {
-	PublicKey, PrivateKey, _ := ed25519.GenerateKey(rand.Reader)
-	return KeyPair{PrivateKey, PublicKey}
-}
-
 func (s *TestSetup) InitDid(did string) (map[string]ed25519.PrivateKey, *types.MsgCreateDidPayload, error) {
 	pubKey, privKey, _ := ed25519.GenerateKey(rand.Reader)
 
@@ -169,43 +173,49 @@ func (s *TestSetup) InitDid(did string) (map[string]ed25519.PrivateKey, *types.M
 	keyId := did + "#key-1"
 	keys := map[string]ed25519.PrivateKey{keyId: privKey}
 
-	result, err := s.Handler(s.Ctx, s.WrapCreateRequest(didMsg, keys))
+	_, err := s.MsgServer.CreateDid(s.StdCtx, s.WrapCreateRequest(didMsg, keys))
 	if err != nil {
 		return nil, nil, err
 	}
 
-	didResponse := types.MsgCreateDidResponse{}
-	if err := didResponse.Unmarshal(result.Data); err != nil {
-		return nil, nil, err
-	}
-
 	return keys, didMsg, nil
 }
 
 func (s *TestSetup) SendUpdateDid(msg *types.MsgUpdateDidPayload, keys []SignInput) (*types.Did, error) {
-	// query Did
-	state, _ := s.Keeper.GetDid(&s.Ctx, msg.Id)
+	req := types.QueryGetDidRequest{
+		Id: msg.Id,
+	}
+
+	state, _ := s.QueryServer.Did(s.StdCtx, &req)
 	if len(msg.VersionId) == 0 {
 		msg.VersionId = state.Metadata.VersionId
 	}
 
-	_, err := s.Handler(s.Ctx, s.WrapUpdateRequest(msg, keys))
+	_, err := s.MsgServer.UpdateDid(s.StdCtx, s.WrapUpdateRequest(msg, keys))
 	if err != nil {
 		return nil, err
 	}
 
-	updated, _ := s.Keeper.GetDid(&s.Ctx, msg.Id)
-	return updated.UnpackDataAsDid()
+	req = types.QueryGetDidRequest{
+		Id: msg.Id,
+	}
+
+	updated, _ := s.QueryServer.Did(s.StdCtx, &req)
+	return updated.Did, nil
 }
 
 func (s *TestSetup) SendCreateDid(msg *types.MsgCreateDidPayload, keys map[string]ed25519.PrivateKey) (*types.Did, error) {
-	_, err := s.Handler(s.Ctx, s.WrapCreateRequest(msg, keys))
+	_, err := s.MsgServer.CreateDid(s.StdCtx, s.WrapCreateRequest(msg, keys))
 	if err != nil {
 		return nil, err
 	}
 
-	created, _ := s.Keeper.GetDid(&s.Ctx, msg.Id)
-	return created.UnpackDataAsDid()
+	req := types.QueryGetDidRequest{
+		Id: msg.Id,
+	}
+
+	created, _ := s.QueryServer.Did(s.StdCtx, &req)
+	return created.Did, nil
 }
 
 func ConcatKeys(dst map[string]ed25519.PrivateKey, src map[string]ed25519.PrivateKey) map[string]ed25519.PrivateKey {
diff --git a/x/cheqd/tests/utils.go b/x/cheqd/tests/utils.go
index 6509bec72..ff1d6e28c 100644
--- a/x/cheqd/tests/utils.go
+++ b/x/cheqd/tests/utils.go
@@ -1,7 +1,9 @@
 package tests
 
 import (
-	"math/rand"
+	"crypto/ed25519"
+	"crypto/rand"
+	mathrand "math/rand"
 
 	. "github.com/onsi/gomega"
 )
@@ -11,7 +13,7 @@ var base58Runes = []rune("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuv
 func randBase58Seq(n int) string {
 	b := make([]rune, n)
 	for i := range b {
-		b[i] = base58Runes[rand.Intn(len(base58Runes))]
+		b[i] = base58Runes[mathrand.Intn(len(base58Runes))]
 	}
 	return string(b)
 }
@@ -45,3 +47,8 @@ func InitEnv(keys map[string]KeyPair) TestSetup {
 	Expect(err).To(BeNil())
 	return setup
 }
+
+func GenerateKeyPair() KeyPair {
+	PublicKey, PrivateKey, _ := ed25519.GenerateKey(rand.Reader)
+	return KeyPair{PrivateKey, PublicKey}
+}
diff --git a/x/resource/tests/create_resource_test.go b/x/resource/tests/create_resource_test.go
index ca31f3694..285ae1d50 100644
--- a/x/resource/tests/create_resource_test.go
+++ b/x/resource/tests/create_resource_test.go
@@ -5,6 +5,7 @@ import (
 	"crypto/sha256"
 	"fmt"
 
+	cheqdtypes "github.com/cheqd/cheqd-node/x/cheqd/types"
 	cheqdutils "github.com/cheqd/cheqd-node/x/cheqd/utils"
 	resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
 
@@ -40,7 +41,8 @@ var _ = Describe("CreateResource", func() {
 					Expect(err).To(BeNil())
 
 					did := cheqdutils.JoinDID("cheqd", "test", resource.Header.CollectionId)
-					didStateValue, err := setup.Keeper.GetDid(&setup.Ctx, did)
+					req := cheqdtypes.QueryGetDidRequest{Id: did}
+					didStateValue, err := setup.QueryServer.Did(setup.StdCtx, &req)
 					Expect(err).To(BeNil())
 					Expect(didStateValue.Metadata.Resources).Should(ContainElement(resource.Header.Id))
 
diff --git a/x/resource/tests/query_all_resource_versions_test.go b/x/resource/tests/query_all_resource_versions_test.go
index 23ffdb903..a92be3701 100644
--- a/x/resource/tests/query_all_resource_versions_test.go
+++ b/x/resource/tests/query_all_resource_versions_test.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"github.com/cheqd/cheqd-node/x/resource/types"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -49,7 +48,7 @@ var _ = Describe("QueryAllResourceVersions", func() {
 				Expect(differentResource).ToNot(Equal(existingResource))
 				Expect(differentResource).ToNot(Equal(nextVersionResource))
 
-				queryResponse, err := setup.QueryServer.AllResourceVersions(sdk.WrapSDKContext(setup.Ctx), msg)
+				queryResponse, err := setup.ResourceQueryServer.AllResourceVersions(setup.StdCtx, msg)
 
 				if valid {
 					resources := queryResponse.Resources
diff --git a/x/resource/tests/query_collection_resources_test.go b/x/resource/tests/query_collection_resources_test.go
index 198810ec3..10431db91 100644
--- a/x/resource/tests/query_collection_resources_test.go
+++ b/x/resource/tests/query_collection_resources_test.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -31,7 +30,7 @@ var _ = Describe("QueryCollectionResources", func() {
 				response *resourcetypes.QueryGetCollectionResourcesResponse,
 				errMsg string,
 			) {
-				queryResponse, err := setup.QueryServer.CollectionResources(sdk.WrapSDKContext(setup.Ctx), msg)
+				queryResponse, err := setup.ResourceQueryServer.CollectionResources(setup.StdCtx, msg)
 
 				if valid {
 					resources := queryResponse.Resources
diff --git a/x/resource/tests/query_resource_test.go b/x/resource/tests/query_resource_test.go
index 6ee4b9d0e..ba8a8be47 100644
--- a/x/resource/tests/query_resource_test.go
+++ b/x/resource/tests/query_resource_test.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 
 	resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -32,7 +31,7 @@ var _ = Describe("QueryGetResource", func() {
 				response *resourcetypes.QueryGetResourceResponse,
 				errMsg string,
 			) {
-				queryResponse, err := setup.QueryServer.Resource(sdk.WrapSDKContext(setup.Ctx), msg)
+				queryResponse, err := setup.ResourceQueryServer.Resource(setup.StdCtx, msg)
 
 				if valid {
 					resource := queryResponse.Resource
diff --git a/x/resource/tests/setup.go b/x/resource/tests/setup.go
index b0944ff4f..ca6e6ba77 100644
--- a/x/resource/tests/setup.go
+++ b/x/resource/tests/setup.go
@@ -6,12 +6,9 @@ import (
 	"encoding/base64"
 	"time"
 
-	"github.com/cheqd/cheqd-node/x/cheqd"
 	cheqdkeeper "github.com/cheqd/cheqd-node/x/cheqd/keeper"
-
 	cheqdtests "github.com/cheqd/cheqd-node/x/cheqd/tests"
 	cheqdtypes "github.com/cheqd/cheqd-node/x/cheqd/types"
-	"github.com/cheqd/cheqd-node/x/resource"
 	"github.com/cheqd/cheqd-node/x/resource/types"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 
@@ -28,9 +25,9 @@ import (
 type TestSetup struct {
 	cheqdtests.TestSetup
 
-	ResourceKeeper  keeper.Keeper
-	ResourceHandler sdk.Handler
-	QueryServer     types.QueryServer
+	ResourceKeeper      keeper.Keeper
+	ResourceMsgServer   types.MsgServer
+	ResourceQueryServer types.QueryServer
 }
 
 func Setup() TestSetup {
@@ -56,7 +53,6 @@ func Setup() TestSetup {
 	// Init Keepers
 	cheqdKeeper := cheqdkeeper.NewKeeper(cdc, cheqdStoreKey)
 	resourceKeeper := keeper.NewKeeper(cdc, resourceStoreKey)
-	queryServer := keeper.NewQueryServer(*resourceKeeper, *cheqdKeeper)
 
 	// Create Tx
 	txBytes := make([]byte, 28)
@@ -68,22 +64,31 @@ func Setup() TestSetup {
 		tmproto.Header{ChainID: "test", Time: blockTime},
 		false, log.NewNopLogger()).WithTxBytes(txBytes)
 
-	cheqdHandler := cheqd.NewHandler(*cheqdKeeper)
-	resourceHandler := resource.NewHandler(*resourceKeeper, *cheqdKeeper)
+	// Init servers
+	cheqdMsgServer := cheqdkeeper.NewMsgServer(*cheqdKeeper)
+	cheqdQueryServer := cheqdkeeper.NewQueryServer(*cheqdKeeper)
+
+	msgServer := keeper.NewMsgServer(*resourceKeeper, *cheqdKeeper)
+	queryServer := keeper.NewQueryServer(*resourceKeeper, *cheqdKeeper)
 
 	setup := TestSetup{
 		TestSetup: cheqdtests.TestSetup{
-			Cdc:     cdc,
-			Ctx:     ctx,
-			Keeper:  *cheqdKeeper,
-			Handler: cheqdHandler,
+			Cdc: cdc,
+
+			SdkCtx: ctx,
+			StdCtx: sdk.WrapSDKContext(ctx),
+
+			Keeper:      *cheqdKeeper,
+			MsgServer:   cheqdMsgServer,
+			QueryServer: cheqdQueryServer,
 		},
-		ResourceKeeper:  *resourceKeeper,
-		ResourceHandler: resourceHandler,
-		QueryServer:     queryServer,
+
+		ResourceKeeper:      *resourceKeeper,
+		ResourceMsgServer:   msgServer,
+		ResourceQueryServer: queryServer,
 	}
 
-	setup.Keeper.SetDidNamespace(&ctx, "test")
+	setup.Keeper.SetDidNamespace(&ctx, cheqdtests.DID_NAMESPACE)
 	return setup
 }
 
@@ -116,13 +121,18 @@ func (s *TestSetup) WrapCreateRequest(payload *types.MsgCreateResourcePayload, k
 }
 
 func (s *TestSetup) SendCreateResource(msg *types.MsgCreateResourcePayload, keys map[string]ed25519.PrivateKey) (*types.Resource, error) {
-	_, err := s.ResourceHandler(s.Ctx, s.WrapCreateRequest(msg, keys))
+	_, err := s.ResourceMsgServer.CreateResource(s.StdCtx, s.WrapCreateRequest(msg, keys))
 	if err != nil {
 		return nil, err
 	}
 
-	created, _ := s.ResourceKeeper.GetResource(&s.Ctx, msg.CollectionId, msg.Id)
-	return &created, nil
+	req := &types.QueryGetResourceRequest{
+		CollectionId: msg.CollectionId,
+		Id:           msg.Id,
+	}
+
+	created, _ := s.ResourceQueryServer.Resource(s.StdCtx, req)
+	return created.Resource, nil
 }
 
 func GenerateTestKeys() map[string]cheqdtests.KeyPair {

From f084839b69bb77ce030e298cb4e68da9504abbaf Mon Sep 17 00:00:00 2001
From: Alexandr Kolesov <kolesov.alex.s@gmail.com>
Date: Tue, 11 Oct 2022 16:13:20 +0500
Subject: [PATCH 28/76] Cleaning up

---
 x/cheqd/tests/create_did_test.go              | 135 ++++++++----------
 x/cheqd/tests/setup.go                        |  43 +++---
 x/cheqd/tests/signature_verification_test.go  |   4 +-
 x/cheqd/tests/utils.go                        |   7 +
 x/resource/tests/create_resource_test.go      |   2 +-
 .../tests/query_all_resource_versions_test.go |   2 +-
 .../tests/query_collection_resources_test.go  |   2 +-
 x/resource/tests/query_resource_test.go       |   2 +-
 8 files changed, 91 insertions(+), 106 deletions(-)

diff --git a/x/cheqd/tests/create_did_test.go b/x/cheqd/tests/create_did_test.go
index 0cb4a7bad..4840f0814 100644
--- a/x/cheqd/tests/create_did_test.go
+++ b/x/cheqd/tests/create_did_test.go
@@ -13,82 +13,65 @@ import (
 	"github.com/multiformats/go-multibase"
 )
 
-var _ = Describe("Create DID tests new", func() {
-	// params for cases
-	var valid bool
-	var keys map[string]KeyPair
-	var signers []string
-	var msg *types.MsgCreateDidPayload
-	errMsg := ""
-
-	var setup TestSetup
-	var err error
-	mainKeys := GenerateTestKeys()
-
-	BeforeEach(func() {
-		// setup
-		valid = false
-		keys = map[string]KeyPair{}
-		signers = []string{}
-		msg = &types.MsgCreateDidPayload{}
-		errMsg = ""
-	})
-
-	AfterEach(func() {
-		setup = InitEnv(mainKeys)
-
-		for _, vm := range msg.VerificationMethod {
-			if vm.PublicKeyMultibase == "" {
-				vm.PublicKeyMultibase, err = multibase.Encode(multibase.Base58BTC, keys[vm.Id].Public)
-			}
-			Expect(err).To(BeNil())
-		}
-
-		signerKeys := map[string]ed25519.PrivateKey{}
-		for _, signer := range signers {
-			signerKeys[signer] = keys[signer].Private
-		}
-
-		did, err := setup.SendCreateDid(msg, signerKeys)
-
-		if valid {
-			Expect(err).To(BeNil())
-			Expect(msg.Id).To(Equal(did.Id))
-			Expect(msg.Controller).To(Equal(did.Controller))
-			Expect(msg.VerificationMethod).To(Equal(did.VerificationMethod))
-			Expect(msg.Authentication).To(Equal(did.Authentication))
-			Expect(msg.AssertionMethod).To(Equal(did.AssertionMethod))
-			Expect(msg.CapabilityInvocation).To(Equal(did.CapabilityInvocation))
-			Expect(msg.CapabilityDelegation).To(Equal(did.CapabilityDelegation))
-			Expect(msg.KeyAgreement).To(Equal(did.KeyAgreement))
-			Expect(msg.AlsoKnownAs).To(Equal(did.AlsoKnownAs))
-			Expect(msg.Service).To(Equal(did.Service))
-			Expect(msg.Context).To(Equal(did.Context))
-		} else {
-			Expect(err).To(HaveOccurred())
-			Expect(errMsg).To(Equal(err.Error()))
-		}
-	})
-
-	It("Valid: Works", func() {
-		valid = true
-		keys = map[string]KeyPair{
-			ImposterKey1: GenerateKeyPair(),
-		}
-		signers = []string{ImposterKey1}
-		msg = &types.MsgCreateDidPayload{
-			Id:             ImposterDID,
-			Authentication: []string{ImposterKey1},
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:         ImposterKey1,
-					Type:       Ed25519VerificationKey2020,
-					Controller: ImposterDID,
-				},
-			},
-		}
-	})
-})
+// var _ = Describe("Create DID tests new", func() {
+// 	var setup TestSetup
+
+// 	BeforeEach(func() {
+// 		setup = Setup()
+// 	})
+
+// 	It("Valid: Works", func() {
+// 		valid = true
+// 		keys = map[string]KeyPair{
+// 			ImposterKey1: GenerateKeyPair(),
+// 		}
+// 		signers = []string{ImposterKey1}
+// 		msg = &types.MsgCreateDidPayload{
+// 			Id:             ImposterDID,
+// 			Authentication: []string{ImposterKey1},
+// 			VerificationMethod: []*types.VerificationMethod{
+// 				{
+// 					Id:         ImposterKey1,
+// 					Type:       Ed25519VerificationKey2020,
+// 					Controller: ImposterDID,
+// 				},
+// 			},
+// 		}
+
+// 		for _, vm := range msg.VerificationMethod {
+// 			if vm.PublicKeyMultibase == "" {
+// 				vm.PublicKeyMultibase, err = multibase.Encode(multibase.Base58BTC, keys[vm.Id].Public)
+// 			}
+// 			Expect(err).To(BeNil())
+// 		}
+
+// 		signerKeys := map[string]ed25519.PrivateKey{}
+// 		for _, signer := range signers {
+// 			signerKeys[signer] = keys[signer].Private
+// 		}
+
+// 		did, err := setup.SendCreateDid(msg, signerKeys)
+
+// 		if valid {
+// 			Expect(err).To(BeNil())
+// 			Expect(msg.Id).To(Equal(did.Id))
+// 			Expect(msg.Controller).To(Equal(did.Controller))
+// 			Expect(msg.VerificationMethod).To(Equal(did.VerificationMethod))
+// 			Expect(msg.Authentication).To(Equal(did.Authentication))
+// 			Expect(msg.AssertionMethod).To(Equal(did.AssertionMethod))
+// 			Expect(msg.CapabilityInvocation).To(Equal(did.CapabilityInvocation))
+// 			Expect(msg.CapabilityDelegation).To(Equal(did.CapabilityDelegation))
+// 			Expect(msg.KeyAgreement).To(Equal(did.KeyAgreement))
+// 			Expect(msg.AlsoKnownAs).To(Equal(did.AlsoKnownAs))
+// 			Expect(msg.Service).To(Equal(did.Service))
+// 			Expect(msg.Context).To(Equal(did.Context))
+// 		} else {
+// 			Expect(err).To(HaveOccurred())
+// 			Expect(errMsg).To(Equal(err.Error()))
+// 		}
+
+// 	})
+// })
 
 var _ = Describe("Create DID tests", func() {
 	// params for cases
diff --git a/x/cheqd/tests/setup.go b/x/cheqd/tests/setup.go
index 2bde90df9..8aa457efd 100644
--- a/x/cheqd/tests/setup.go
+++ b/x/cheqd/tests/setup.go
@@ -78,29 +78,18 @@ func Setup() TestSetup {
 	return setup
 }
 
-func (s *TestSetup) CreateDid(pubKey ed25519.PublicKey, did string) *types.MsgCreateDidPayload {
-	PublicKeyMultibase, err := multibase.Encode(multibase.Base58BTC, pubKey)
-	if err != nil {
-		panic(err)
-	}
-
-	VerificationMethod := types.VerificationMethod{
-		Id:                 did + "#key-1",
-		Type:               Ed25519VerificationKey2020,
-		Controller:         did,
-		PublicKeyMultibase: PublicKeyMultibase,
-	}
-
-	Service := types.Service{
-		Id:              did + "#service-2",
-		Type:            "DIDCommMessaging",
-		ServiceEndpoint: "endpoint",
-	}
-
+func (s *TestSetup) BuildMsgCreateDidPayload(did string, key ed25519.PublicKey) *types.MsgCreateDidPayload {
 	return &types.MsgCreateDidPayload{
-		Id:                   did,
-		Controller:           nil,
-		VerificationMethod:   []*types.VerificationMethod{&VerificationMethod},
+		Id:         did,
+		Controller: nil,
+		VerificationMethod: []*types.VerificationMethod{
+			{
+				Id:                 did + "#key-1",
+				Type:               Ed25519VerificationKey2020,
+				Controller:         did,
+				PublicKeyMultibase: MustEncodeBase58(key),
+			},
+		},
 		Authentication:       []string{did + "#key-1"},
 		AssertionMethod:      []string{did + "#key-1"},
 		CapabilityInvocation: []string{did + "#key-1"},
@@ -108,7 +97,13 @@ func (s *TestSetup) CreateDid(pubKey ed25519.PublicKey, did string) *types.MsgCr
 		KeyAgreement:         []string{did + "#key-1"},
 		AlsoKnownAs:          []string{did + "#key-1"},
 		Context:              []string{"Context"},
-		Service:              []*types.Service{&Service},
+		Service: []*types.Service{
+			{
+				Id:              did + "#service-2",
+				Type:            "DIDCommMessaging",
+				ServiceEndpoint: "endpoint",
+			},
+		},
 	}
 }
 
@@ -168,7 +163,7 @@ func (s *TestSetup) InitDid(did string) (map[string]ed25519.PrivateKey, *types.M
 	pubKey, privKey, _ := ed25519.GenerateKey(rand.Reader)
 
 	// add new Did
-	didMsg := s.CreateDid(pubKey, did)
+	didMsg := s.BuildMsgCreateDidPayload(did, pubKey)
 
 	keyId := did + "#key-1"
 	keys := map[string]ed25519.PrivateKey{keyId: privKey}
diff --git a/x/cheqd/tests/signature_verification_test.go b/x/cheqd/tests/signature_verification_test.go
index e3c8bd531..09ffb2148 100644
--- a/x/cheqd/tests/signature_verification_test.go
+++ b/x/cheqd/tests/signature_verification_test.go
@@ -80,8 +80,8 @@ var _ = Describe("Signature Verification. Remove signature/VM", func() {
 		BpubKey, BprivKey, _ = ed25519.GenerateKey(rand.Reader)
 
 		// Create dids
-		aliceDid = setup.CreateDid(ApubKey, AliceDID)
-		bobDid = setup.CreateDid(BpubKey, BobDID)
+		aliceDid = setup.BuildMsgCreateDidPayload(AliceDID, ApubKey)
+		bobDid = setup.BuildMsgCreateDidPayload(BobDID, BpubKey)
 
 		// Collect private keys
 		aliceKeys = map[string]ed25519.PrivateKey{AliceKey1: AprivKey, BobKey1: BprivKey}
diff --git a/x/cheqd/tests/utils.go b/x/cheqd/tests/utils.go
index ff1d6e28c..01206dbdb 100644
--- a/x/cheqd/tests/utils.go
+++ b/x/cheqd/tests/utils.go
@@ -5,6 +5,7 @@ import (
 	"crypto/rand"
 	mathrand "math/rand"
 
+	"github.com/multiformats/go-multibase"
 	. "github.com/onsi/gomega"
 )
 
@@ -52,3 +53,9 @@ func GenerateKeyPair() KeyPair {
 	PublicKey, PrivateKey, _ := ed25519.GenerateKey(rand.Reader)
 	return KeyPair{PrivateKey, PublicKey}
 }
+
+func MustEncodeBase58(data []byte) string {
+	encoded, err := multibase.Encode(multibase.Base58BTC, data)
+	Expect(err).To(BeNil())
+	return encoded
+}
diff --git a/x/resource/tests/create_resource_test.go b/x/resource/tests/create_resource_test.go
index 285ae1d50..e329f6374 100644
--- a/x/resource/tests/create_resource_test.go
+++ b/x/resource/tests/create_resource_test.go
@@ -20,7 +20,7 @@ var _ = Describe("CreateResource", func() {
 		keys := GenerateTestKeys()
 		BeforeEach(func() {
 			setup = Setup()
-			didDoc := setup.CreateDid(keys[ExistingDIDKey].Public, ExistingDID)
+			didDoc := setup.BuildMsgCreateDidPayload(ExistingDID, keys[ExistingDIDKey].Public)
 			_, err = setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
 			resourcePayload := GenerateCreateResourcePayload(ExistingResource())
diff --git a/x/resource/tests/query_all_resource_versions_test.go b/x/resource/tests/query_all_resource_versions_test.go
index a92be3701..4b69777cf 100644
--- a/x/resource/tests/query_all_resource_versions_test.go
+++ b/x/resource/tests/query_all_resource_versions_test.go
@@ -16,7 +16,7 @@ var _ = Describe("QueryAllResourceVersions", func() {
 		keys := GenerateTestKeys()
 		BeforeEach(func() {
 			setup = Setup()
-			didDoc := setup.CreateDid(keys[ExistingDIDKey].Public, ExistingDID)
+			didDoc := setup.BuildMsgCreateDidPayload(ExistingDID, keys[ExistingDIDKey].Public)
 			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
 			payload := GenerateCreateResourcePayload(ExistingResource())
diff --git a/x/resource/tests/query_collection_resources_test.go b/x/resource/tests/query_collection_resources_test.go
index 10431db91..c8e04e0e3 100644
--- a/x/resource/tests/query_collection_resources_test.go
+++ b/x/resource/tests/query_collection_resources_test.go
@@ -16,7 +16,7 @@ var _ = Describe("QueryCollectionResources", func() {
 		keys := GenerateTestKeys()
 		BeforeEach(func() {
 			setup = Setup()
-			didDoc := setup.CreateDid(keys[ExistingDIDKey].Public, ExistingDID)
+			didDoc := setup.BuildMsgCreateDidPayload(ExistingDID, keys[ExistingDIDKey].Public)
 			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
 			payload := GenerateCreateResourcePayload(ExistingResource())
diff --git a/x/resource/tests/query_resource_test.go b/x/resource/tests/query_resource_test.go
index ba8a8be47..f9a8e17e4 100644
--- a/x/resource/tests/query_resource_test.go
+++ b/x/resource/tests/query_resource_test.go
@@ -17,7 +17,7 @@ var _ = Describe("QueryGetResource", func() {
 		existingResource := ExistingResource()
 		BeforeEach(func() {
 			setup = Setup()
-			didDoc := setup.CreateDid(keys[ExistingDIDKey].Public, ExistingDID)
+			didDoc := setup.BuildMsgCreateDidPayload(ExistingDID, keys[ExistingDIDKey].Public)
 			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
 			payload := GenerateCreateResourcePayload(ExistingResource())

From ad96be90bd3d1129d73e8166df26d4287b0fd528 Mon Sep 17 00:00:00 2001
From: Alexandr Kolesov <kolesov.alex.s@gmail.com>
Date: Tue, 11 Oct 2022 18:05:41 +0500
Subject: [PATCH 29/76] Improving tests structure

---
 x/cheqd/tests/const.go                        |   2 +-
 x/cheqd/tests/create_did_test.go              | 170 ++++++++++--------
 x/cheqd/tests/setup.go                        | 107 ++++++++---
 x/cheqd/tests/signature_verification_test.go  |  11 +-
 x/cheqd/tests/update_did_test.go              |  54 +++---
 x/cheqd/tests/utils.go                        |  26 ++-
 x/resource/tests/create_resource_test.go      |   2 +-
 .../tests/query_all_resource_versions_test.go |   2 +-
 .../tests/query_collection_resources_test.go  |   2 +-
 x/resource/tests/query_resource_test.go       |   2 +-
 10 files changed, 230 insertions(+), 148 deletions(-)

diff --git a/x/cheqd/tests/const.go b/x/cheqd/tests/const.go
index cd5394f9c..2b33e2506 100644
--- a/x/cheqd/tests/const.go
+++ b/x/cheqd/tests/const.go
@@ -1,3 +1,3 @@
 package tests
 
-const Ed25519VerificationKey2020 = "Ed25519VerificationKey2020"
+// const Ed25519VerificationKey2020 = "Ed25519VerificationKey2020"
diff --git a/x/cheqd/tests/create_did_test.go b/x/cheqd/tests/create_did_test.go
index 4840f0814..f498d40c9 100644
--- a/x/cheqd/tests/create_did_test.go
+++ b/x/cheqd/tests/create_did_test.go
@@ -7,71 +7,89 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/btcsuite/btcutil/base58"
-
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
 	"github.com/multiformats/go-multibase"
 )
 
-// var _ = Describe("Create DID tests new", func() {
-// 	var setup TestSetup
-
-// 	BeforeEach(func() {
-// 		setup = Setup()
-// 	})
-
-// 	It("Valid: Works", func() {
-// 		valid = true
-// 		keys = map[string]KeyPair{
-// 			ImposterKey1: GenerateKeyPair(),
-// 		}
-// 		signers = []string{ImposterKey1}
-// 		msg = &types.MsgCreateDidPayload{
-// 			Id:             ImposterDID,
-// 			Authentication: []string{ImposterKey1},
-// 			VerificationMethod: []*types.VerificationMethod{
-// 				{
-// 					Id:         ImposterKey1,
-// 					Type:       Ed25519VerificationKey2020,
-// 					Controller: ImposterDID,
-// 				},
-// 			},
-// 		}
-
-// 		for _, vm := range msg.VerificationMethod {
-// 			if vm.PublicKeyMultibase == "" {
-// 				vm.PublicKeyMultibase, err = multibase.Encode(multibase.Base58BTC, keys[vm.Id].Public)
-// 			}
-// 			Expect(err).To(BeNil())
-// 		}
-
-// 		signerKeys := map[string]ed25519.PrivateKey{}
-// 		for _, signer := range signers {
-// 			signerKeys[signer] = keys[signer].Private
-// 		}
-
-// 		did, err := setup.SendCreateDid(msg, signerKeys)
-
-// 		if valid {
-// 			Expect(err).To(BeNil())
-// 			Expect(msg.Id).To(Equal(did.Id))
-// 			Expect(msg.Controller).To(Equal(did.Controller))
-// 			Expect(msg.VerificationMethod).To(Equal(did.VerificationMethod))
-// 			Expect(msg.Authentication).To(Equal(did.Authentication))
-// 			Expect(msg.AssertionMethod).To(Equal(did.AssertionMethod))
-// 			Expect(msg.CapabilityInvocation).To(Equal(did.CapabilityInvocation))
-// 			Expect(msg.CapabilityDelegation).To(Equal(did.CapabilityDelegation))
-// 			Expect(msg.KeyAgreement).To(Equal(did.KeyAgreement))
-// 			Expect(msg.AlsoKnownAs).To(Equal(did.AlsoKnownAs))
-// 			Expect(msg.Service).To(Equal(did.Service))
-// 			Expect(msg.Context).To(Equal(did.Context))
-// 		} else {
-// 			Expect(err).To(HaveOccurred())
-// 			Expect(errMsg).To(Equal(err.Error()))
-// 		}
-
-// 	})
-// })
+var _ = Describe("Create DID tests new", func() {
+	var setup TestSetup
+
+	BeforeEach(func() {
+		setup = Setup()
+	})
+
+	It("Valid: Works", func() {
+		did := GenerateDID(Base58_16chars)
+		keypair := GenerateKeyPair()
+		keyId := did + "#key-1"
+
+		msg := &types.MsgCreateDidPayload{
+			Id:             did,
+			Authentication: []string{keyId},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:                 keyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         did,
+					PublicKeyMultibase: MustEncodeBase58(keypair.Public),
+				},
+			},
+		}
+
+		signatures := []SignInput{
+			{
+				VerificationMethodId: keyId,
+				Key:                  keypair.Private,
+			},
+		}
+
+		_, err := setup.CreateDid(msg, signatures)
+		Expect(err).To(BeNil())
+
+		// check
+		created, err := setup.QueryDid(did)
+		Expect(err).To(BeNil())
+		Expect(msg.ToDid()).To(Equal(*created.Did))
+	})
+
+	// **************************
+	// ***** Negative cases *****
+	// **************************
+
+	It("Not Valid: Second controller did not sign request", func() {
+		// Alice
+		aliceDid, _, _ := setup.CreateTestDid()
+
+		// Bob
+		bobDid := GenerateDID(Base58_16chars)
+		bobKeypair := GenerateKeyPair()
+		bobKeyId := bobDid + "#key-1"
+
+		msg := &types.MsgCreateDidPayload{
+			Id:             bobDid,
+			Controller:     []string{aliceDid, bobDid},
+			Authentication: []string{bobKeyId},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:                 bobKeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         bobDid,
+					PublicKeyMultibase: MustEncodeBase58(bobKeypair.Public),
+				},
+			},
+		}
+
+		signatures := []SignInput{
+			{
+				VerificationMethodId: bobKeyId,
+				Key:                  bobKeypair.Private,
+			},
+		}
+
+		_, err := setup.CreateDid(msg, signatures)
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("signer: %s: signature is required but not found", aliceDid)))
+	})
+})
 
 var _ = Describe("Create DID tests", func() {
 	// params for cases
@@ -142,7 +160,7 @@ var _ = Describe("Create DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         ImposterKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: ImposterDID,
 				},
 			},
@@ -163,7 +181,7 @@ var _ = Describe("Create DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         ImposterKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: ImposterDID,
 				},
 			},
@@ -184,7 +202,7 @@ var _ = Describe("Create DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         ImposterKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: ImposterDID,
 				},
 			},
@@ -205,7 +223,7 @@ var _ = Describe("Create DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         ImposterKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: ImposterDID,
 				},
 			},
@@ -226,7 +244,7 @@ var _ = Describe("Create DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         ImposterKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: ImposterDID,
 				},
 			},
@@ -295,17 +313,17 @@ var _ = Describe("Create DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-1",
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
 				},
 				{
 					Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-2",
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
 				},
 				{
 					Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-3",
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
 				},
 				{
@@ -383,9 +401,9 @@ var _ = Describe("Create DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:                 ImposterKey1,
-					Type:               Ed25519VerificationKey2020,
+					Type:               types.Ed25519VerificationKey2020,
 					Controller:         ImposterDID,
-					PublicKeyMultibase: "z" + base58.Encode(mainKeys[ImposterKey1].Public),
+					PublicKeyMultibase: MustEncodeBase58(mainKeys[ImposterKey1].Public),
 				},
 			},
 		}
@@ -404,9 +422,9 @@ var _ = Describe("Create DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:                 ImposterKey1,
-					Type:               Ed25519VerificationKey2020,
+					Type:               types.Ed25519VerificationKey2020,
 					Controller:         ImposterDID,
-					PublicKeyMultibase: "z" + base58.Encode(mainKeys[ImposterKey1].Public),
+					PublicKeyMultibase: MustEncodeBase58(mainKeys[ImposterKey1].Public),
 				},
 			},
 		}
@@ -426,9 +444,9 @@ var _ = Describe("Create DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:                 ImposterKey1,
-					Type:               Ed25519VerificationKey2020,
+					Type:               types.Ed25519VerificationKey2020,
 					Controller:         ImposterDID,
-					PublicKeyMultibase: "z" + base58.Encode(mainKeys[ImposterKey1].Public),
+					PublicKeyMultibase: MustEncodeBase58(mainKeys[ImposterKey1].Public),
 				},
 			},
 		}
@@ -452,7 +470,7 @@ var _ = Describe("Create DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         CharlieKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: CharlieDID,
 				},
 			},
diff --git a/x/cheqd/tests/setup.go b/x/cheqd/tests/setup.go
index 8aa457efd..9c5631ef4 100644
--- a/x/cheqd/tests/setup.go
+++ b/x/cheqd/tests/setup.go
@@ -78,32 +78,18 @@ func Setup() TestSetup {
 	return setup
 }
 
-func (s *TestSetup) BuildMsgCreateDidPayload(did string, key ed25519.PublicKey) *types.MsgCreateDidPayload {
+func (s *TestSetup) BuildMsgCreateDidPayload(did string, keyId string, key ed25519.PublicKey) *types.MsgCreateDidPayload {
 	return &types.MsgCreateDidPayload{
-		Id:         did,
-		Controller: nil,
+		Id: did,
 		VerificationMethod: []*types.VerificationMethod{
 			{
-				Id:                 did + "#key-1",
-				Type:               Ed25519VerificationKey2020,
+				Id:                 keyId,
+				Type:               types.Ed25519VerificationKey2020,
 				Controller:         did,
 				PublicKeyMultibase: MustEncodeBase58(key),
 			},
 		},
-		Authentication:       []string{did + "#key-1"},
-		AssertionMethod:      []string{did + "#key-1"},
-		CapabilityInvocation: []string{did + "#key-1"},
-		CapabilityDelegation: []string{did + "#key-1"},
-		KeyAgreement:         []string{did + "#key-1"},
-		AlsoKnownAs:          []string{did + "#key-1"},
-		Context:              []string{"Context"},
-		Service: []*types.Service{
-			{
-				Id:              did + "#service-2",
-				Type:            "DIDCommMessaging",
-				ServiceEndpoint: "endpoint",
-			},
-		},
+		Authentication: []string{keyId},
 	}
 }
 
@@ -123,6 +109,7 @@ func (s *TestSetup) CreateToUpdateDid(did *types.MsgCreateDidPayload) *types.Msg
 	}
 }
 
+// TODO: Remove
 func (s *TestSetup) WrapCreateRequest(payload *types.MsgCreateDidPayload, keys map[string]ed25519.PrivateKey) *types.MsgCreateDid {
 	var signatures []*types.SignInfo
 	signingInput := payload.GetSignBytes()
@@ -141,6 +128,68 @@ func (s *TestSetup) WrapCreateRequest(payload *types.MsgCreateDidPayload, keys m
 	}
 }
 
+func (s *TestSetup) CreateDid(payload *types.MsgCreateDidPayload, signInputs []SignInput) (*types.MsgCreateDidResponse, error) {
+	signBytes := payload.GetSignBytes()
+	var signatures []*types.SignInfo
+
+	for _, input := range signInputs {
+		signature := ed25519.Sign(input.Key, signBytes)
+
+		signatures = append(signatures, &types.SignInfo{
+			VerificationMethodId: input.VerificationMethodId,
+			Signature:            base64.StdEncoding.EncodeToString(signature),
+		})
+	}
+
+	msg := &types.MsgCreateDid{
+		Payload:    payload,
+		Signatures: signatures,
+	}
+
+	return s.MsgServer.CreateDid(s.StdCtx, msg)
+}
+
+func (s *TestSetup) CreateTestDid() (string, KeyPair, string) {
+	did := GenerateDID(Base58_16chars)
+	keypair := GenerateKeyPair()
+	keyId := did + "#key-1"
+
+	msg := types.MsgCreateDidPayload{
+		Id: did,
+		VerificationMethod: []*types.VerificationMethod{
+			{
+				Id:                 keyId,
+				Type:               types.Ed25519VerificationKey2020,
+				Controller:         did,
+				PublicKeyMultibase: MustEncodeBase58(keypair.Public),
+			},
+		},
+		Authentication: []string{keyId},
+	}
+
+	signatures := []SignInput{
+		{
+			VerificationMethodId: keyId,
+			Key:                  keypair.Private,
+		},
+	}
+
+	_, err := s.CreateDid(&msg, signatures)
+	if err != nil {
+		panic(err)
+	}
+
+	return did, keypair, keyId
+}
+
+func (s *TestSetup) QueryDid(did string) (*types.QueryGetDidResponse, error) {
+	req := &types.QueryGetDidRequest{
+		Id: did,
+	}
+
+	return s.QueryServer.Did(s.StdCtx, req)
+}
+
 func (s *TestSetup) WrapUpdateRequest(payload *types.MsgUpdateDidPayload, keys []SignInput) *types.MsgUpdateDid {
 	var signatures []*types.SignInfo
 	signingInput := payload.GetSignBytes()
@@ -161,11 +210,11 @@ func (s *TestSetup) WrapUpdateRequest(payload *types.MsgUpdateDidPayload, keys [
 
 func (s *TestSetup) InitDid(did string) (map[string]ed25519.PrivateKey, *types.MsgCreateDidPayload, error) {
 	pubKey, privKey, _ := ed25519.GenerateKey(rand.Reader)
+	keyId := did + "#key-1"
 
 	// add new Did
-	didMsg := s.BuildMsgCreateDidPayload(did, pubKey)
+	didMsg := s.BuildMsgCreateDidPayload(did, keyId, pubKey)
 
-	keyId := did + "#key-1"
 	keys := map[string]ed25519.PrivateKey{keyId: privKey}
 
 	_, err := s.MsgServer.CreateDid(s.StdCtx, s.WrapCreateRequest(didMsg, keys))
@@ -245,7 +294,7 @@ func (s TestSetup) CreateTestDIDs(keys map[string]KeyPair) error {
 				VerificationMethod: []*types.VerificationMethod{
 					{
 						Id:         AliceKey1,
-						Type:       Ed25519VerificationKey2020,
+						Type:       types.Ed25519VerificationKey2020,
 						Controller: AliceDID,
 					},
 				},
@@ -266,22 +315,22 @@ func (s TestSetup) CreateTestDIDs(keys map[string]KeyPair) error {
 				VerificationMethod: []*types.VerificationMethod{
 					{
 						Id:         BobKey1,
-						Type:       Ed25519VerificationKey2020,
+						Type:       types.Ed25519VerificationKey2020,
 						Controller: BobDID,
 					},
 					{
 						Id:         BobKey2,
-						Type:       Ed25519VerificationKey2020,
+						Type:       types.Ed25519VerificationKey2020,
 						Controller: BobDID,
 					},
 					{
 						Id:         BobKey3,
-						Type:       Ed25519VerificationKey2020,
+						Type:       types.Ed25519VerificationKey2020,
 						Controller: BobDID,
 					},
 					{
 						Id:         BobKey4,
-						Type:       Ed25519VerificationKey2020,
+						Type:       types.Ed25519VerificationKey2020,
 						Controller: BobDID,
 					},
 				},
@@ -299,17 +348,17 @@ func (s TestSetup) CreateTestDIDs(keys map[string]KeyPair) error {
 				VerificationMethod: []*types.VerificationMethod{
 					{
 						Id:         CharlieKey1,
-						Type:       Ed25519VerificationKey2020,
+						Type:       types.Ed25519VerificationKey2020,
 						Controller: BobDID,
 					},
 					{
 						Id:         CharlieKey2,
-						Type:       Ed25519VerificationKey2020,
+						Type:       types.Ed25519VerificationKey2020,
 						Controller: BobDID,
 					},
 					{
 						Id:         CharlieKey3,
-						Type:       Ed25519VerificationKey2020,
+						Type:       types.Ed25519VerificationKey2020,
 						Controller: BobDID,
 					},
 				},
diff --git a/x/cheqd/tests/signature_verification_test.go b/x/cheqd/tests/signature_verification_test.go
index 09ffb2148..fb1ecca8e 100644
--- a/x/cheqd/tests/signature_verification_test.go
+++ b/x/cheqd/tests/signature_verification_test.go
@@ -9,7 +9,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/btcsuite/btcutil/base58"
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
 )
 
@@ -36,7 +35,7 @@ var _ = Describe("Signature Verification while updating DID", func() {
 	When("Old signature in verification method is absent", func() {
 		It("should fail", func() {
 			updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-			updatedDidDoc.VerificationMethod[0].Type = Ed25519VerificationKey2020
+			updatedDidDoc.VerificationMethod[0].Type = types.Ed25519VerificationKey2020
 			_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
 
 			// check
@@ -80,8 +79,8 @@ var _ = Describe("Signature Verification. Remove signature/VM", func() {
 		BpubKey, BprivKey, _ = ed25519.GenerateKey(rand.Reader)
 
 		// Create dids
-		aliceDid = setup.BuildMsgCreateDidPayload(AliceDID, ApubKey)
-		bobDid = setup.BuildMsgCreateDidPayload(BobDID, BpubKey)
+		aliceDid = setup.BuildMsgCreateDidPayload(AliceDID, AliceKey1, ApubKey)
+		bobDid = setup.BuildMsgCreateDidPayload(BobDID, BobKey1, BpubKey)
 
 		// Collect private keys
 		aliceKeys = map[string]ed25519.PrivateKey{AliceKey1: AprivKey, BobKey1: BprivKey}
@@ -91,8 +90,8 @@ var _ = Describe("Signature Verification. Remove signature/VM", func() {
 		aliceDid.VerificationMethod = append(aliceDid.VerificationMethod, &types.VerificationMethod{
 			Id:                 AliceKey2,
 			Controller:         BobDID,
-			Type:               Ed25519VerificationKey2020,
-			PublicKeyMultibase: "z" + base58.Encode(BpubKey),
+			Type:               types.Ed25519VerificationKey2020,
+			PublicKeyMultibase: MustEncodeBase58(BpubKey),
 		})
 	})
 
diff --git a/x/cheqd/tests/update_did_test.go b/x/cheqd/tests/update_did_test.go
index 244fc1db5..cd4049328 100644
--- a/x/cheqd/tests/update_did_test.go
+++ b/x/cheqd/tests/update_did_test.go
@@ -104,7 +104,7 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 					// TODO: Use multibase encoding
 					PublicKeyMultibase: "z" + base58.Encode(mainKeys[AliceKey2].Public),
@@ -122,7 +122,7 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey2,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 			},
@@ -139,7 +139,7 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey2,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 			},
@@ -167,7 +167,7 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: BobDID,
 				},
 			},
@@ -182,7 +182,7 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: BobDID,
 				},
 			},
@@ -198,7 +198,7 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey2,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 			},
@@ -213,7 +213,7 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey2,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 			},
@@ -229,7 +229,7 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey2,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 			},
@@ -247,12 +247,12 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 				{
 					Id:         AliceKey2,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: BobDID,
 				},
 			},
@@ -268,12 +268,12 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 				{
 					Id:         AliceKey2,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: BobDID,
 				},
 			},
@@ -290,12 +290,12 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 				{
 					Id:         AliceKey2,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 			},
@@ -321,7 +321,7 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 			},
@@ -337,7 +337,7 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 			},
@@ -354,7 +354,7 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 			},
@@ -373,7 +373,7 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 			},
@@ -389,7 +389,7 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 			},
@@ -406,7 +406,7 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 			},
@@ -423,12 +423,12 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         AliceKey2,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 				{
 					Id:         AliceKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: AliceDID,
 				},
 			},
@@ -449,22 +449,22 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         CharlieKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: BobDID,
 				},
 				{
 					Id:         CharlieKey2,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: BobDID,
 				},
 				{
 					Id:         CharlieKey3,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: BobDID,
 				},
 				{
 					Id:         CharlieKey4,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: CharlieDID,
 				},
 			},
@@ -479,7 +479,7 @@ var _ = Describe("Update DID tests", func() {
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:         BobKey1,
-					Type:       Ed25519VerificationKey2020,
+					Type:       types.Ed25519VerificationKey2020,
 					Controller: BobDID,
 				},
 			},
diff --git a/x/cheqd/tests/utils.go b/x/cheqd/tests/utils.go
index 01206dbdb..9ac2e2848 100644
--- a/x/cheqd/tests/utils.go
+++ b/x/cheqd/tests/utils.go
@@ -5,6 +5,7 @@ import (
 	"crypto/rand"
 	mathrand "math/rand"
 
+	"github.com/google/uuid"
 	"github.com/multiformats/go-multibase"
 	. "github.com/onsi/gomega"
 )
@@ -19,12 +20,27 @@ func randBase58Seq(n int) string {
 	return string(b)
 }
 
-func GenerateDID() string {
-	return "did:cheqd:test:" + randBase58Seq(16)
-}
+type IDType int
+
+const (
+	Base58_16chars IDType = iota
+	Base58_32chars IDType = iota
+	UUID           IDType = iota
+)
 
-func GenerateFragment(did string) string {
-	return did + "#key-1"
+func GenerateDID(idtype IDType) string {
+	prefix := "did:cheqd:" + DID_NAMESPACE + ":"
+
+	switch idtype {
+	case Base58_16chars:
+		return prefix + randBase58Seq(16)
+	case Base58_32chars:
+		return prefix + randBase58Seq(32)
+	case UUID:
+		return prefix + uuid.NewString()
+	default:
+		panic("Unknown ID type")
+	}
 }
 
 func GenerateTestKeys() map[string]KeyPair {
diff --git a/x/resource/tests/create_resource_test.go b/x/resource/tests/create_resource_test.go
index e329f6374..692fefe81 100644
--- a/x/resource/tests/create_resource_test.go
+++ b/x/resource/tests/create_resource_test.go
@@ -20,7 +20,7 @@ var _ = Describe("CreateResource", func() {
 		keys := GenerateTestKeys()
 		BeforeEach(func() {
 			setup = Setup()
-			didDoc := setup.BuildMsgCreateDidPayload(ExistingDID, keys[ExistingDIDKey].Public)
+			didDoc := setup.BuildMsgCreateDidPayload(ExistingDID, ExistingDIDKey, keys[ExistingDIDKey].Public)
 			_, err = setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
 			resourcePayload := GenerateCreateResourcePayload(ExistingResource())
diff --git a/x/resource/tests/query_all_resource_versions_test.go b/x/resource/tests/query_all_resource_versions_test.go
index 4b69777cf..750a6938b 100644
--- a/x/resource/tests/query_all_resource_versions_test.go
+++ b/x/resource/tests/query_all_resource_versions_test.go
@@ -16,7 +16,7 @@ var _ = Describe("QueryAllResourceVersions", func() {
 		keys := GenerateTestKeys()
 		BeforeEach(func() {
 			setup = Setup()
-			didDoc := setup.BuildMsgCreateDidPayload(ExistingDID, keys[ExistingDIDKey].Public)
+			didDoc := setup.BuildMsgCreateDidPayload(ExistingDID, ExistingDIDKey, keys[ExistingDIDKey].Public)
 			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
 			payload := GenerateCreateResourcePayload(ExistingResource())
diff --git a/x/resource/tests/query_collection_resources_test.go b/x/resource/tests/query_collection_resources_test.go
index c8e04e0e3..18036de72 100644
--- a/x/resource/tests/query_collection_resources_test.go
+++ b/x/resource/tests/query_collection_resources_test.go
@@ -16,7 +16,7 @@ var _ = Describe("QueryCollectionResources", func() {
 		keys := GenerateTestKeys()
 		BeforeEach(func() {
 			setup = Setup()
-			didDoc := setup.BuildMsgCreateDidPayload(ExistingDID, keys[ExistingDIDKey].Public)
+			didDoc := setup.BuildMsgCreateDidPayload(ExistingDID, ExistingDIDKey, keys[ExistingDIDKey].Public)
 			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
 			payload := GenerateCreateResourcePayload(ExistingResource())
diff --git a/x/resource/tests/query_resource_test.go b/x/resource/tests/query_resource_test.go
index f9a8e17e4..0d87dd13a 100644
--- a/x/resource/tests/query_resource_test.go
+++ b/x/resource/tests/query_resource_test.go
@@ -17,7 +17,7 @@ var _ = Describe("QueryGetResource", func() {
 		existingResource := ExistingResource()
 		BeforeEach(func() {
 			setup = Setup()
-			didDoc := setup.BuildMsgCreateDidPayload(ExistingDID, keys[ExistingDIDKey].Public)
+			didDoc := setup.BuildMsgCreateDidPayload(ExistingDID, ExistingDIDKey, keys[ExistingDIDKey].Public)
 			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
 			payload := GenerateCreateResourcePayload(ExistingResource())

From 9f381d36d66b64cd419f0a94ff39d7a4c8c6f0db Mon Sep 17 00:00:00 2001
From: Alexandr Kolesov <kolesov.alex.s@gmail.com>
Date: Tue, 11 Oct 2022 19:39:06 +0500
Subject: [PATCH 30/76] Improve did creation tests

---
 x/cheqd/tests/create_did_test.go | 562 +++++++++++++------------------
 1 file changed, 229 insertions(+), 333 deletions(-)

diff --git a/x/cheqd/tests/create_did_test.go b/x/cheqd/tests/create_did_test.go
index f498d40c9..e71969bcd 100644
--- a/x/cheqd/tests/create_did_test.go
+++ b/x/cheqd/tests/create_did_test.go
@@ -1,14 +1,12 @@
 package tests
 
 import (
-	"crypto/ed25519"
 	"fmt"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
-	"github.com/multiformats/go-multibase"
 )
 
 var _ = Describe("Create DID tests new", func() {
@@ -18,7 +16,7 @@ var _ = Describe("Create DID tests new", func() {
 		setup = Setup()
 	})
 
-	It("Valid: Works", func() {
+	It("Valid: Works for simple did doc", func() {
 		did := GenerateDID(Base58_16chars)
 		keypair := GenerateKeyPair()
 		keyId := did + "#key-1"
@@ -52,13 +50,10 @@ var _ = Describe("Create DID tests new", func() {
 		Expect(msg.ToDid()).To(Equal(*created.Did))
 	})
 
-	// **************************
-	// ***** Negative cases *****
-	// **************************
-
-	It("Not Valid: Second controller did not sign request", func() {
+	It("Valid: DID with external controllers", func() {
 		// Alice
-		aliceDid, _, _ := setup.CreateTestDid()
+		aliceDid, aliceKeypair, aliceKeyId := setup.CreateTestDid()
+		annaDid, annaKeypair, annaKeyId := setup.CreateTestDid()
 
 		// Bob
 		bobDid := GenerateDID(Base58_16chars)
@@ -67,13 +62,13 @@ var _ = Describe("Create DID tests new", func() {
 
 		msg := &types.MsgCreateDidPayload{
 			Id:             bobDid,
-			Controller:     []string{aliceDid, bobDid},
+			Controller:     []string{aliceDid, annaDid},
 			Authentication: []string{bobKeyId},
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:                 bobKeyId,
 					Type:               types.Ed25519VerificationKey2020,
-					Controller:         bobDid,
+					Controller:         annaDid,
 					PublicKeyMultibase: MustEncodeBase58(bobKeypair.Public),
 				},
 			},
@@ -81,412 +76,313 @@ var _ = Describe("Create DID tests new", func() {
 
 		signatures := []SignInput{
 			{
-				VerificationMethodId: bobKeyId,
-				Key:                  bobKeypair.Private,
+				VerificationMethodId: aliceKeyId,
+				Key:                  aliceKeypair.Private,
+			},
+			{
+				VerificationMethodId: annaKeyId,
+				Key:                  annaKeypair.Private,
 			},
 		}
 
 		_, err := setup.CreateDid(msg, signatures)
-		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("signer: %s: signature is required but not found", aliceDid)))
-	})
-})
-
-var _ = Describe("Create DID tests", func() {
-	// params for cases
-	var valid bool
-	var keys map[string]KeyPair
-	var signers []string
-	var msg *types.MsgCreateDidPayload
-	errMsg := ""
-
-	var setup TestSetup
-	var err error
-	mainKeys := GenerateTestKeys()
+		Expect(err).To(BeNil())
 
-	BeforeEach(func() {
-		// setup
-		valid = false
-		keys = map[string]KeyPair{}
-		signers = []string{}
-		msg = &types.MsgCreateDidPayload{}
-		errMsg = ""
+		// check
+		created, err := setup.QueryDid(bobDid)
+		Expect(err).To(BeNil())
+		Expect(msg.ToDid()).To(Equal(*created.Did))
 	})
 
-	AfterEach(func() {
-		setup = InitEnv(mainKeys)
+	It("Valid: Works for the did doc witha all properties", func() {
+		did := GenerateDID(Base58_16chars)
 
-		for _, vm := range msg.VerificationMethod {
-			if vm.PublicKeyMultibase == "" {
-				vm.PublicKeyMultibase, err = multibase.Encode(multibase.Base58BTC, keys[vm.Id].Public)
-			}
-			Expect(err).To(BeNil())
-		}
+		keypair1 := GenerateKeyPair()
+		keyId1 := did + "#key-1"
 
-		signerKeys := map[string]ed25519.PrivateKey{}
-		for _, signer := range signers {
-			signerKeys[signer] = keys[signer].Private
-		}
+		keypair2 := GenerateKeyPair()
+		keyId2 := did + "#key-2"
 
-		did, err := setup.SendCreateDid(msg, signerKeys)
-
-		if valid {
-			Expect(err).To(BeNil())
-			Expect(msg.Id).To(Equal(did.Id))
-			Expect(msg.Controller).To(Equal(did.Controller))
-			Expect(msg.VerificationMethod).To(Equal(did.VerificationMethod))
-			Expect(msg.Authentication).To(Equal(did.Authentication))
-			Expect(msg.AssertionMethod).To(Equal(did.AssertionMethod))
-			Expect(msg.CapabilityInvocation).To(Equal(did.CapabilityInvocation))
-			Expect(msg.CapabilityDelegation).To(Equal(did.CapabilityDelegation))
-			Expect(msg.KeyAgreement).To(Equal(did.KeyAgreement))
-			Expect(msg.AlsoKnownAs).To(Equal(did.AlsoKnownAs))
-			Expect(msg.Service).To(Equal(did.Service))
-			Expect(msg.Context).To(Equal(did.Context))
-		} else {
-			Expect(err).To(HaveOccurred())
-			Expect(errMsg).To(Equal(err.Error()))
-		}
-	})
+		keypair3 := GenerateKeyPair()
+		keyId3 := did + "#key-3"
 
-	It("Valid: Works", func() {
-		valid = true
-		keys = map[string]KeyPair{
-			ImposterKey1: GenerateKeyPair(),
-		}
-		signers = []string{ImposterKey1}
-		msg = &types.MsgCreateDidPayload{
-			Id:             ImposterDID,
-			Authentication: []string{ImposterKey1},
+		keypair4 := GenerateKeyPair()
+		keyId4 := did + "#key-4"
+
+		msg := &types.MsgCreateDidPayload{
+			Context:    []string{"abc", "def"},
+			Id:         did,
+			Controller: []string{did},
 			VerificationMethod: []*types.VerificationMethod{
 				{
-					Id:         ImposterKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: ImposterDID,
+					Id:                 keyId1,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         did,
+					PublicKeyMultibase: MustEncodeBase58(keypair1.Public),
 				},
-			},
-		}
-	})
-
-	It("Valid: Works with Key Agreement", func() {
-		valid = true
-		keys = map[string]KeyPair{
-			ImposterKey1: GenerateKeyPair(),
-			AliceKey1:    mainKeys[AliceKey1],
-		}
-		signers = []string{ImposterKey1, AliceKey1}
-		msg = &types.MsgCreateDidPayload{
-			Id:           ImposterDID,
-			KeyAgreement: []string{ImposterKey1},
-			Controller:   []string{AliceDID},
-			VerificationMethod: []*types.VerificationMethod{
 				{
-					Id:         ImposterKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: ImposterDID,
+					Id:                 keyId2,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         did,
+					PublicKeyMultibase: MustEncodeBase58(keypair2.Public),
+				},
+				{
+					Id:                 keyId3,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         did,
+					PublicKeyMultibase: MustEncodeBase58(keypair3.Public),
+				},
+				{
+					Id:                 keyId4,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         did,
+					PublicKeyMultibase: MustEncodeBase58(keypair4.Public),
 				},
 			},
-		}
-	})
-
-	It("Valid: Works with Assertion Method", func() {
-		valid = true
-		keys = map[string]KeyPair{
-			ImposterKey1: GenerateKeyPair(),
-			AliceKey1:    mainKeys[AliceKey1],
-		}
-		signers = []string{AliceKey1, ImposterKey1}
-		msg = &types.MsgCreateDidPayload{
-			Id:              ImposterDID,
-			AssertionMethod: []string{ImposterKey1},
-			Controller:      []string{AliceDID},
-			VerificationMethod: []*types.VerificationMethod{
+			Authentication:       []string{keyId1, keyId2},
+			AssertionMethod:      []string{keyId3},
+			CapabilityInvocation: []string{keyId4, keyId1},
+			CapabilityDelegation: []string{keyId4, keyId2},
+			KeyAgreement:         []string{keyId1, keyId2, keyId3, keyId4},
+			Service: []*types.Service{
 				{
-					Id:         ImposterKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: ImposterDID,
+					Id:              did + "#service-1",
+					Type:            "type-1",
+					ServiceEndpoint: "endpoint-1",
 				},
 			},
+			AlsoKnownAs: []string{"alias-1", "alias-2"},
 		}
-	})
 
-	It("Valid: Works with Capability Delegation", func() {
-		valid = true
-		keys = map[string]KeyPair{
-			ImposterKey1: GenerateKeyPair(),
-			AliceKey1:    mainKeys[AliceKey1],
-		}
-		signers = []string{AliceKey1, ImposterKey1}
-		msg = &types.MsgCreateDidPayload{
-			Id:                   ImposterDID,
-			CapabilityDelegation: []string{ImposterKey1},
-			Controller:           []string{AliceDID},
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:         ImposterKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: ImposterDID,
-				},
+		signatures := []SignInput{
+			{
+				VerificationMethodId: keyId1,
+				Key:                  keypair1.Private,
 			},
 		}
+
+		_, err := setup.CreateDid(msg, signatures)
+		Expect(err).To(BeNil())
+
+		// check
+		created, err := setup.QueryDid(did)
+		Expect(err).To(BeNil())
+		Expect(msg.ToDid()).To(Equal(*created.Did))
 	})
 
-	It("Valid: Works with Capability Invocation", func() {
-		valid = true
-		keys = map[string]KeyPair{
-			ImposterKey1: GenerateKeyPair(),
-			AliceKey1:    mainKeys[AliceKey1],
-		}
-		signers = []string{AliceKey1, ImposterKey1}
-		msg = &types.MsgCreateDidPayload{
-			Id:                   ImposterDID,
-			CapabilityInvocation: []string{ImposterKey1},
-			Controller:           []string{AliceDID},
+	// **************************
+	// ***** Negative cases *****
+	// **************************
+
+	It("Not Valid: Second controller did not sign request", func() {
+		// Alice
+		aliceDid, _, _ := setup.CreateTestDid()
+
+		// Bob
+		bobDid := GenerateDID(Base58_16chars)
+		bobKeypair := GenerateKeyPair()
+		bobKeyId := bobDid + "#key-1"
+
+		msg := &types.MsgCreateDidPayload{
+			Id:             bobDid,
+			Controller:     []string{aliceDid, bobDid},
+			Authentication: []string{bobKeyId},
 			VerificationMethod: []*types.VerificationMethod{
 				{
-					Id:         ImposterKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: ImposterDID,
+					Id:                 bobKeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         bobDid,
+					PublicKeyMultibase: MustEncodeBase58(bobKeypair.Public),
 				},
 			},
 		}
-	})
 
-	It("Valid: With controller works", func() {
-		valid = true
-		msg = &types.MsgCreateDidPayload{
-			Id:         ImposterDID,
-			Controller: []string{AliceDID, BobDID},
-		}
-		signers = []string{AliceKey1, BobKey3}
-		keys = map[string]KeyPair{
-			AliceKey1: mainKeys[AliceKey1],
-			BobKey3:   mainKeys[BobKey3],
+		signatures := []SignInput{
+			{
+				VerificationMethodId: bobKeyId,
+				Key:                  bobKeypair.Private,
+			},
 		}
+
+		_, err := setup.CreateDid(msg, signatures)
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("signer: %s: signature is required but not found", aliceDid)))
 	})
 
-	It("Valid: Full message works", func() {
-		valid = true
-		keys = map[string]KeyPair{
-			"did:cheqd:test:yyyyyyyyyyyyyyyy#key-1": GenerateKeyPair(),
-			"did:cheqd:test:yyyyyyyyyyyyyyyy#key-2": GenerateKeyPair(),
-			"did:cheqd:test:yyyyyyyyyyyyyyyy#key-3": GenerateKeyPair(),
-			"did:cheqd:test:yyyyyyyyyyyyyyyy#key-4": GenerateKeyPair(),
-			"did:cheqd:test:yyyyyyyyyyyyyyyy#key-5": GenerateKeyPair(),
-			AliceKey1:                               mainKeys[AliceKey1],
-			BobKey1:                                 mainKeys[BobKey1],
-			BobKey2:                                 mainKeys[BobKey2],
-			BobKey3:                                 mainKeys[BobKey3],
-			CharlieKey1:                             mainKeys[CharlieKey1],
-			CharlieKey2:                             mainKeys[CharlieKey2],
-			CharlieKey3:                             mainKeys[CharlieKey3],
-		}
-		signers = []string{
-			"did:cheqd:test:yyyyyyyyyyyyyyyy#key-1",
-			"did:cheqd:test:yyyyyyyyyyyyyyyy#key-5",
-			AliceKey1,
-			BobKey1,
-			BobKey2,
-			BobKey3,
-			CharlieKey1,
-			CharlieKey2,
-			CharlieKey3,
-		}
-		msg = &types.MsgCreateDidPayload{
-			Id: "did:cheqd:test:yyyyyyyyyyyyyyyy",
-			Authentication: []string{
-				"did:cheqd:test:yyyyyyyyyyyyyyyy#key-1",
-				"did:cheqd:test:yyyyyyyyyyyyyyyy#key-5",
-			},
-			Context:              []string{"abc", "de"},
-			CapabilityInvocation: []string{"did:cheqd:test:yyyyyyyyyyyyyyyy#key-2"},
-			CapabilityDelegation: []string{"did:cheqd:test:yyyyyyyyyyyyyyyy#key-3"},
-			KeyAgreement:         []string{"did:cheqd:test:yyyyyyyyyyyyyyyy#key-4"},
-			AlsoKnownAs:          []string{"SomeUri"},
-			Service: []*types.Service{
-				{
-					Id:              "did:cheqd:test:yyyyyyyyyyyyyyyy#service-1",
-					Type:            "DIDCommMessaging",
-					ServiceEndpoint: "ServiceEndpoint",
-				},
-			},
-			Controller: []string{"did:cheqd:test:yyyyyyyyyyyyyyyy", AliceDID, BobDID, CharlieDID},
+	It("Not Valid: No signature", func() {
+		did := GenerateDID(Base58_16chars)
+		keypair := GenerateKeyPair()
+		keyId := did + "#key-1"
+
+		msg := &types.MsgCreateDidPayload{
+			Id:             did,
+			Controller:     []string{did},
+			Authentication: []string{keyId},
 			VerificationMethod: []*types.VerificationMethod{
 				{
-					Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-1",
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
-				},
-				{
-					Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-2",
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
-				},
-				{
-					Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-3",
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
-				},
-				{
-					Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-4",
-					Type:       "Ed25519VerificationKey2020",
-					Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
-				},
-				{
-					Id:         "did:cheqd:test:yyyyyyyyyyyyyyyy#key-5",
-					Type:       "Ed25519VerificationKey2020",
-					Controller: "did:cheqd:test:yyyyyyyyyyyyyyyy",
+					Id:                 keyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         did,
+					PublicKeyMultibase: MustEncodeBase58(keypair.Public),
 				},
 			},
 		}
-	})
-
-	// **************************
-	// ***** Negative cases *****
-	// **************************
 
-	It("Not Valid: Second controller did not sign request", func() {
-		valid = false
-		msg = &types.MsgCreateDidPayload{
-			Id:         ImposterDID,
-			Controller: []string{AliceDID, BobDID},
-		}
-		signers = []string{AliceKey1}
-		keys = map[string]KeyPair{
-			AliceKey1: mainKeys[AliceKey1],
-		}
-		errMsg = fmt.Sprintf("signer: %s: signature is required but not found", BobDID)
-	})
+		signatures := []SignInput{}
 
-	It("Not Valid: No signature", func() {
-		valid = false
-		msg = &types.MsgCreateDidPayload{
-			Id:         ImposterDID,
-			Controller: []string{AliceDID, BobDID},
-		}
-		errMsg = fmt.Sprintf("signer: %s: signature is required but not found", AliceDID)
+		_, err := setup.CreateDid(msg, signatures)
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("signer: %s: signature is required but not found", did)))
 	})
 
 	It("Not Valid: Controller not found", func() {
-		valid = false
-		msg = &types.MsgCreateDidPayload{
-			Id:         ImposterDID,
-			Controller: []string{AliceDID, NotFounDID},
-		}
-		signers = []string{AliceKey1, ImposterKey1}
-		keys = map[string]KeyPair{
-			AliceKey1:    mainKeys[AliceKey1],
-			ImposterKey1: GenerateKeyPair(),
+		did := GenerateDID(Base58_16chars)
+		keypair := GenerateKeyPair()
+		keyId := did + "#key-1"
+
+		nonExistingDid := GenerateDID(Base58_16chars)
+
+		msg := &types.MsgCreateDidPayload{
+			Id:             did,
+			Controller:     []string{nonExistingDid},
+			Authentication: []string{keyId},
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:                 keyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         did,
+					PublicKeyMultibase: MustEncodeBase58(keypair.Public),
+				},
+			},
 		}
-		errMsg = fmt.Sprintf("%s: DID Doc not found", NotFounDID)
+
+		signatures := []SignInput{}
+
+		_, err := setup.CreateDid(msg, signatures)
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("%s: DID Doc not found", nonExistingDid)))
 	})
 
 	It("Not Valid: Wrong signature", func() {
-		valid = false
-		msg = &types.MsgCreateDidPayload{
-			Id:         ImposterDID,
-			Controller: []string{AliceDID},
-		}
-		signers = []string{AliceKey1}
-		keys = map[string]KeyPair{
-			AliceKey1: mainKeys[BobKey1],
-		}
-		errMsg = fmt.Sprintf("method id: %s: invalid signature detected", AliceKey1)
-	})
+		did := GenerateDID(Base58_16chars)
+		keypair := GenerateKeyPair()
+		keyId := did + "#key-1"
 
-	It("Not Valid: DID signed by wrong controller", func() {
-		valid = false
-		msg = &types.MsgCreateDidPayload{
-			Id:             ImposterDID,
-			Authentication: []string{ImposterKey1},
+		msg := &types.MsgCreateDidPayload{
+			Id:             did,
+			Controller:     []string{did},
+			Authentication: []string{keyId},
 			VerificationMethod: []*types.VerificationMethod{
 				{
-					Id:                 ImposterKey1,
+					Id:                 keyId,
 					Type:               types.Ed25519VerificationKey2020,
-					Controller:         ImposterDID,
-					PublicKeyMultibase: MustEncodeBase58(mainKeys[ImposterKey1].Public),
+					Controller:         did,
+					PublicKeyMultibase: MustEncodeBase58(keypair.Public),
 				},
 			},
 		}
-		signers = []string{AliceKey1}
-		keys = map[string]KeyPair{
-			AliceKey1: mainKeys[AliceKey1],
+
+		invalidKey := GenerateKeyPair()
+
+		signatures := []SignInput{
+			{
+				VerificationMethodId: keyId,
+				Key:                  invalidKey.Private,
+			},
 		}
-		errMsg = fmt.Sprintf("signer: %s: signature is required but not found", ImposterDID)
+
+		_, err := setup.CreateDid(msg, signatures)
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("method id: %s: invalid signature detected", keyId)))
 	})
 
-	It("Not Valid: DID self-signed by not existing verification method", func() {
-		valid = false
-		msg = &types.MsgCreateDidPayload{
-			Id:             ImposterDID,
-			Authentication: []string{ImposterKey1},
+	It("Not Valid: DID signed by wrong controller", func() {
+		// Alice
+		_, aliceKeypair, aliceKeyId := setup.CreateTestDid()
+
+		// Bob
+		bobDid := GenerateDID(Base58_16chars)
+		bobKeypair := GenerateKeyPair()
+		bobKeyId := bobDid + "#key-1"
+
+		msg := &types.MsgCreateDidPayload{
+			Id:             bobDid,
+			Controller:     []string{bobDid},
+			Authentication: []string{bobKeyId},
 			VerificationMethod: []*types.VerificationMethod{
 				{
-					Id:                 ImposterKey1,
+					Id:                 bobKeyId,
 					Type:               types.Ed25519VerificationKey2020,
-					Controller:         ImposterDID,
-					PublicKeyMultibase: MustEncodeBase58(mainKeys[ImposterKey1].Public),
+					Controller:         bobDid,
+					PublicKeyMultibase: MustEncodeBase58(bobKeypair.Public),
 				},
 			},
 		}
-		signers = []string{ImposterKey2}
-		keys = map[string]KeyPair{
-			ImposterKey2: GenerateKeyPair(),
+
+		signatures := []SignInput{
+			{
+				VerificationMethodId: aliceKeyId,
+				Key:                  aliceKeypair.Private,
+			},
 		}
-		errMsg = fmt.Sprintf("%s: verification method not found", ImposterKey2)
+
+		_, err := setup.CreateDid(msg, signatures)
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("signer: %s: signature is required but not found", bobDid)))
 	})
 
-	It("Not Valid: Self-signature not found", func() {
-		valid = false
-		msg = &types.MsgCreateDidPayload{
-			Id:             ImposterDID,
-			Controller:     []string{AliceDID, ImposterDID},
-			Authentication: []string{ImposterKey1},
+	It("Not Valid: DID self-signed by not existing verification method", func() {
+		did := GenerateDID(Base58_16chars)
+		keypair := GenerateKeyPair()
+		keyId := did + "#key-1"
+
+		msg := &types.MsgCreateDidPayload{
+			Id:             did,
+			Controller:     []string{did},
+			Authentication: []string{keyId},
 			VerificationMethod: []*types.VerificationMethod{
 				{
-					Id:                 ImposterKey1,
+					Id:                 keyId,
 					Type:               types.Ed25519VerificationKey2020,
-					Controller:         ImposterDID,
-					PublicKeyMultibase: MustEncodeBase58(mainKeys[ImposterKey1].Public),
+					Controller:         did,
+					PublicKeyMultibase: MustEncodeBase58(keypair.Public),
 				},
 			},
 		}
-		signers = []string{AliceKey1, ImposterKey2}
-		keys = map[string]KeyPair{
-			AliceKey1:    mainKeys[AliceKey1],
-			ImposterKey2: GenerateKeyPair(),
+
+		invalidKeyId := did + "#key-2"
+
+		signatures := []SignInput{
+			{
+				VerificationMethodId: invalidKeyId,
+				Key:                  keypair.Private,
+			},
 		}
-		errMsg = fmt.Sprintf("%s: verification method not found", ImposterKey2)
+
+		_, err := setup.CreateDid(msg, signatures)
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("%s: verification method not found", invalidKeyId)))
 	})
 
 	It("Not Valid: DID Doc already exists", func() {
-		valid = false
-		keys = map[string]KeyPair{
-			CharlieKey1: GenerateKeyPair(),
-		}
-		signers = []string{CharlieKey1}
-		msg = &types.MsgCreateDidPayload{
-			Id:             CharlieDID,
-			Authentication: []string{CharlieKey1},
+		// Alice
+		aliceDid, aliceKeypair, aliceKeyId := setup.CreateTestDid()
+
+		msg := &types.MsgCreateDidPayload{
+			Id:             aliceDid,
+			Authentication: []string{aliceKeyId},
 			VerificationMethod: []*types.VerificationMethod{
 				{
-					Id:         CharlieKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: CharlieDID,
+					Id:                 aliceKeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         aliceDid,
+					PublicKeyMultibase: MustEncodeBase58(aliceKeypair.Public),
 				},
 			},
 		}
-		errMsg = fmt.Sprintf("%s: DID Doc exists", CharlieDID)
-	})
-})
-
-var _ = Describe("TestHandler", func() {
-	It("Fails cause DIDDoc is already exists", func() {
-		setup := Setup()
 
-		_, _, _ = setup.InitDid(AliceDID)
-		_, _, err := setup.InitDid(AliceDID)
+		signatures := []SignInput{
+			{
+				VerificationMethodId: aliceKeyId,
+				Key:                  aliceKeypair.Private,
+			},
+		}
 
-		Expect(err).To(HaveOccurred())
-		Expect(err.Error()).To(Equal(fmt.Sprintf("%s: DID Doc exists", AliceDID)))
+		_, err := setup.CreateDid(msg, signatures)
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("%s: DID Doc exists", aliceDid)))
 	})
 })

From 3d773d5e42554a25ae787b066b1d6f467aa2e3a0 Mon Sep 17 00:00:00 2001
From: Alexandr Kolesov <kolesov.alex.s@gmail.com>
Date: Wed, 12 Oct 2022 00:12:48 +0500
Subject: [PATCH 31/76] Fix bug with VM update

---
 x/cheqd/keeper/msg_server_update_did.go       |  11 +-
 x/cheqd/tests/create_did_test.go              |  57 +-
 x/cheqd/tests/setup.go                        |  94 --
 x/cheqd/tests/setup_create_did.go             | 100 ++
 x/cheqd/tests/setup_query_did.go              |  11 +
 x/cheqd/tests/setup_update_did.go             |  29 +
 x/cheqd/tests/signature_verification_test.go  | 129 ---
 x/cheqd/tests/types.go                        |  19 +-
 x/cheqd/tests/update_did_test.go              | 932 ++++++++++--------
 x/cheqd/types/did_did.go                      |  13 +-
 x/cheqd/types/did_verification_method.go      |  20 +-
 x/resource/tests/create_resource_test.go      |   2 +-
 .../tests/query_all_resource_versions_test.go |   2 +-
 .../tests/query_collection_resources_test.go  |   2 +-
 x/resource/tests/query_resource_test.go       |   2 +-
 15 files changed, 730 insertions(+), 693 deletions(-)
 create mode 100644 x/cheqd/tests/setup_create_did.go
 create mode 100644 x/cheqd/tests/setup_query_did.go
 create mode 100644 x/cheqd/tests/setup_update_did.go
 delete mode 100644 x/cheqd/tests/signature_verification_test.go

diff --git a/x/cheqd/keeper/msg_server_update_did.go b/x/cheqd/keeper/msg_server_update_did.go
index 8e7fcaea7..3cff40319 100644
--- a/x/cheqd/keeper/msg_server_update_did.go
+++ b/x/cheqd/keeper/msg_server_update_did.go
@@ -2,6 +2,7 @@ package keeper
 
 import (
 	"context"
+	"reflect"
 
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
 	"github.com/cheqd/cheqd-node/x/cheqd/utils"
@@ -151,9 +152,13 @@ func GetSignerDIDsForDIDUpdate(existingDid types.Did, updatedDid types.Did) []st
 		}
 
 		// VM updated
-		// We don't compare ids because they will be different after replacing ids on the updated version of DID.
-		// Fragments equality is checked above.
-		if !types.CompareVerificationMethodsWithoutIds(existingVM, *updatedVM) {
+		// We have to revert renaming before comparing veriifcation methods.
+		// Otherwise we will detect id and controller change
+		// for non changed VMs because of `-updated` postfix.
+		originalUpdatedVM := *updatedVM
+		originalUpdatedVM.ReplaceIds(updatedDid.Id, existingDid.Id)
+
+		if !reflect.DeepEqual(existingVM, originalUpdatedVM) {
 			signers = append(signers, existingVM.Controller, updatedVM.Controller)
 			continue
 		}
diff --git a/x/cheqd/tests/create_did_test.go b/x/cheqd/tests/create_did_test.go
index e71969bcd..a83204ea6 100644
--- a/x/cheqd/tests/create_did_test.go
+++ b/x/cheqd/tests/create_did_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
 )
 
-var _ = Describe("Create DID tests new", func() {
+var _ = Describe("Create DID tests", func() {
 	var setup TestSetup
 
 	BeforeEach(func() {
@@ -52,8 +52,8 @@ var _ = Describe("Create DID tests new", func() {
 
 	It("Valid: DID with external controllers", func() {
 		// Alice
-		aliceDid, aliceKeypair, aliceKeyId := setup.CreateTestDid()
-		annaDid, annaKeypair, annaKeyId := setup.CreateTestDid()
+		alice := setup.CreateSimpleDid()
+		anna := setup.CreateSimpleDid()
 
 		// Bob
 		bobDid := GenerateDID(Base58_16chars)
@@ -62,28 +62,19 @@ var _ = Describe("Create DID tests new", func() {
 
 		msg := &types.MsgCreateDidPayload{
 			Id:             bobDid,
-			Controller:     []string{aliceDid, annaDid},
+			Controller:     []string{alice.Did, anna.Did},
 			Authentication: []string{bobKeyId},
 			VerificationMethod: []*types.VerificationMethod{
 				{
 					Id:                 bobKeyId,
 					Type:               types.Ed25519VerificationKey2020,
-					Controller:         annaDid,
+					Controller:         anna.Did,
 					PublicKeyMultibase: MustEncodeBase58(bobKeypair.Public),
 				},
 			},
 		}
 
-		signatures := []SignInput{
-			{
-				VerificationMethodId: aliceKeyId,
-				Key:                  aliceKeypair.Private,
-			},
-			{
-				VerificationMethodId: annaKeyId,
-				Key:                  annaKeypair.Private,
-			},
-		}
+		signatures := []SignInput{alice.SignInput, anna.SignInput}
 
 		_, err := setup.CreateDid(msg, signatures)
 		Expect(err).To(BeNil())
@@ -176,7 +167,7 @@ var _ = Describe("Create DID tests new", func() {
 
 	It("Not Valid: Second controller did not sign request", func() {
 		// Alice
-		aliceDid, _, _ := setup.CreateTestDid()
+		alice := setup.CreateSimpleDid()
 
 		// Bob
 		bobDid := GenerateDID(Base58_16chars)
@@ -185,7 +176,7 @@ var _ = Describe("Create DID tests new", func() {
 
 		msg := &types.MsgCreateDidPayload{
 			Id:             bobDid,
-			Controller:     []string{aliceDid, bobDid},
+			Controller:     []string{alice.Did, bobDid},
 			Authentication: []string{bobKeyId},
 			VerificationMethod: []*types.VerificationMethod{
 				{
@@ -205,7 +196,7 @@ var _ = Describe("Create DID tests new", func() {
 		}
 
 		_, err := setup.CreateDid(msg, signatures)
-		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("signer: %s: signature is required but not found", aliceDid)))
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("signer: %s: signature is required but not found", alice.Did)))
 	})
 
 	It("Not Valid: No signature", func() {
@@ -294,7 +285,7 @@ var _ = Describe("Create DID tests new", func() {
 
 	It("Not Valid: DID signed by wrong controller", func() {
 		// Alice
-		_, aliceKeypair, aliceKeyId := setup.CreateTestDid()
+		alice := setup.CreateSimpleDid()
 
 		// Bob
 		bobDid := GenerateDID(Base58_16chars)
@@ -315,12 +306,7 @@ var _ = Describe("Create DID tests new", func() {
 			},
 		}
 
-		signatures := []SignInput{
-			{
-				VerificationMethodId: aliceKeyId,
-				Key:                  aliceKeypair.Private,
-			},
-		}
+		signatures := []SignInput{alice.SignInput}
 
 		_, err := setup.CreateDid(msg, signatures)
 		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("signer: %s: signature is required but not found", bobDid)))
@@ -360,29 +346,24 @@ var _ = Describe("Create DID tests new", func() {
 
 	It("Not Valid: DID Doc already exists", func() {
 		// Alice
-		aliceDid, aliceKeypair, aliceKeyId := setup.CreateTestDid()
+		alice := setup.CreateSimpleDid()
 
 		msg := &types.MsgCreateDidPayload{
-			Id:             aliceDid,
-			Authentication: []string{aliceKeyId},
+			Id:             alice.Did,
+			Authentication: []string{alice.KeyId},
 			VerificationMethod: []*types.VerificationMethod{
 				{
-					Id:                 aliceKeyId,
+					Id:                 alice.KeyId,
 					Type:               types.Ed25519VerificationKey2020,
-					Controller:         aliceDid,
-					PublicKeyMultibase: MustEncodeBase58(aliceKeypair.Public),
+					Controller:         alice.Did,
+					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
 				},
 			},
 		}
 
-		signatures := []SignInput{
-			{
-				VerificationMethodId: aliceKeyId,
-				Key:                  aliceKeypair.Private,
-			},
-		}
+		signatures := []SignInput{alice.SignInput}
 
 		_, err := setup.CreateDid(msg, signatures)
-		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("%s: DID Doc exists", aliceDid)))
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("%s: DID Doc exists", alice.Did)))
 	})
 })
diff --git a/x/cheqd/tests/setup.go b/x/cheqd/tests/setup.go
index 9c5631ef4..d7881e7b0 100644
--- a/x/cheqd/tests/setup.go
+++ b/x/cheqd/tests/setup.go
@@ -78,21 +78,6 @@ func Setup() TestSetup {
 	return setup
 }
 
-func (s *TestSetup) BuildMsgCreateDidPayload(did string, keyId string, key ed25519.PublicKey) *types.MsgCreateDidPayload {
-	return &types.MsgCreateDidPayload{
-		Id: did,
-		VerificationMethod: []*types.VerificationMethod{
-			{
-				Id:                 keyId,
-				Type:               types.Ed25519VerificationKey2020,
-				Controller:         did,
-				PublicKeyMultibase: MustEncodeBase58(key),
-			},
-		},
-		Authentication: []string{keyId},
-	}
-}
-
 func (s *TestSetup) CreateToUpdateDid(did *types.MsgCreateDidPayload) *types.MsgUpdateDidPayload {
 	return &types.MsgUpdateDidPayload{
 		Id:                   did.Id,
@@ -128,68 +113,6 @@ func (s *TestSetup) WrapCreateRequest(payload *types.MsgCreateDidPayload, keys m
 	}
 }
 
-func (s *TestSetup) CreateDid(payload *types.MsgCreateDidPayload, signInputs []SignInput) (*types.MsgCreateDidResponse, error) {
-	signBytes := payload.GetSignBytes()
-	var signatures []*types.SignInfo
-
-	for _, input := range signInputs {
-		signature := ed25519.Sign(input.Key, signBytes)
-
-		signatures = append(signatures, &types.SignInfo{
-			VerificationMethodId: input.VerificationMethodId,
-			Signature:            base64.StdEncoding.EncodeToString(signature),
-		})
-	}
-
-	msg := &types.MsgCreateDid{
-		Payload:    payload,
-		Signatures: signatures,
-	}
-
-	return s.MsgServer.CreateDid(s.StdCtx, msg)
-}
-
-func (s *TestSetup) CreateTestDid() (string, KeyPair, string) {
-	did := GenerateDID(Base58_16chars)
-	keypair := GenerateKeyPair()
-	keyId := did + "#key-1"
-
-	msg := types.MsgCreateDidPayload{
-		Id: did,
-		VerificationMethod: []*types.VerificationMethod{
-			{
-				Id:                 keyId,
-				Type:               types.Ed25519VerificationKey2020,
-				Controller:         did,
-				PublicKeyMultibase: MustEncodeBase58(keypair.Public),
-			},
-		},
-		Authentication: []string{keyId},
-	}
-
-	signatures := []SignInput{
-		{
-			VerificationMethodId: keyId,
-			Key:                  keypair.Private,
-		},
-	}
-
-	_, err := s.CreateDid(&msg, signatures)
-	if err != nil {
-		panic(err)
-	}
-
-	return did, keypair, keyId
-}
-
-func (s *TestSetup) QueryDid(did string) (*types.QueryGetDidResponse, error) {
-	req := &types.QueryGetDidRequest{
-		Id: did,
-	}
-
-	return s.QueryServer.Did(s.StdCtx, req)
-}
-
 func (s *TestSetup) WrapUpdateRequest(payload *types.MsgUpdateDidPayload, keys []SignInput) *types.MsgUpdateDid {
 	var signatures []*types.SignInfo
 	signingInput := payload.GetSignBytes()
@@ -208,23 +131,6 @@ func (s *TestSetup) WrapUpdateRequest(payload *types.MsgUpdateDidPayload, keys [
 	}
 }
 
-func (s *TestSetup) InitDid(did string) (map[string]ed25519.PrivateKey, *types.MsgCreateDidPayload, error) {
-	pubKey, privKey, _ := ed25519.GenerateKey(rand.Reader)
-	keyId := did + "#key-1"
-
-	// add new Did
-	didMsg := s.BuildMsgCreateDidPayload(did, keyId, pubKey)
-
-	keys := map[string]ed25519.PrivateKey{keyId: privKey}
-
-	_, err := s.MsgServer.CreateDid(s.StdCtx, s.WrapCreateRequest(didMsg, keys))
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return keys, didMsg, nil
-}
-
 func (s *TestSetup) SendUpdateDid(msg *types.MsgUpdateDidPayload, keys []SignInput) (*types.Did, error) {
 	req := types.QueryGetDidRequest{
 		Id: msg.Id,
diff --git a/x/cheqd/tests/setup_create_did.go b/x/cheqd/tests/setup_create_did.go
new file mode 100644
index 000000000..28fc3d003
--- /dev/null
+++ b/x/cheqd/tests/setup_create_did.go
@@ -0,0 +1,100 @@
+package tests
+
+import (
+	"crypto/ed25519"
+	"encoding/base64"
+
+	"github.com/cheqd/cheqd-node/x/cheqd/types"
+)
+
+func (s *TestSetup) CreateDid(payload *types.MsgCreateDidPayload, signInputs []SignInput) (*types.MsgCreateDidResponse, error) {
+	signBytes := payload.GetSignBytes()
+	var signatures []*types.SignInfo
+
+	for _, input := range signInputs {
+		signature := ed25519.Sign(input.Key, signBytes)
+
+		signatures = append(signatures, &types.SignInfo{
+			VerificationMethodId: input.VerificationMethodId,
+			Signature:            base64.StdEncoding.EncodeToString(signature),
+		})
+	}
+
+	msg := &types.MsgCreateDid{
+		Payload:    payload,
+		Signatures: signatures,
+	}
+
+	return s.MsgServer.CreateDid(s.StdCtx, msg)
+}
+
+func (s *TestSetup) BuildSimpleDid() DidInfo {
+	did := GenerateDID(Base58_16chars)
+	keyPair := GenerateKeyPair()
+	keyId := did + "#key-1"
+
+	msg := &types.MsgCreateDidPayload{
+		Id: did,
+		VerificationMethod: []*types.VerificationMethod{
+			{
+				Id:                 keyId,
+				Type:               types.Ed25519VerificationKey2020,
+				Controller:         did,
+				PublicKeyMultibase: MustEncodeBase58(keyPair.Public),
+			},
+		},
+		Authentication: []string{keyId},
+	}
+
+	signInput := SignInput{
+		VerificationMethodId: keyId,
+		Key:                  keyPair.Private,
+	}
+
+	return DidInfo{
+		Did:       did,
+		KeyPair:   keyPair,
+		KeyId:     keyId,
+		Msg:       msg,
+		SignInput: signInput,
+	}
+}
+
+func (s *TestSetup) CreateSimpleDid() CreatedDidInfo {
+	did := s.BuildSimpleDid()
+
+	_, err := s.CreateDid(did.Msg, []SignInput{did.SignInput})
+	if err != nil {
+		panic(err)
+	}
+
+	created, err := s.QueryDid(did.Did)
+	if err != nil {
+		panic(err)
+	}
+
+	return CreatedDidInfo{
+		DidInfo:   did,
+		VersionId: created.Metadata.VersionId,
+	}
+}
+
+func (s *TestSetup) CreateDidWithExternalConterllers(controllers []string, signInputs []SignInput) CreatedDidInfo {
+	did := s.BuildSimpleDid()
+	did.Msg.Controller = append(did.Msg.Controller, controllers...)
+
+	_, err := s.CreateDid(did.Msg, append(signInputs, did.SignInput))
+	if err != nil {
+		panic(err)
+	}
+
+	created, err := s.QueryDid(did.Did)
+	if err != nil {
+		panic(err)
+	}
+
+	return CreatedDidInfo{
+		DidInfo:   did,
+		VersionId: created.Metadata.VersionId,
+	}
+}
diff --git a/x/cheqd/tests/setup_query_did.go b/x/cheqd/tests/setup_query_did.go
new file mode 100644
index 000000000..d1618eb23
--- /dev/null
+++ b/x/cheqd/tests/setup_query_did.go
@@ -0,0 +1,11 @@
+package tests
+
+import "github.com/cheqd/cheqd-node/x/cheqd/types"
+
+func (s *TestSetup) QueryDid(did string) (*types.QueryGetDidResponse, error) {
+	req := &types.QueryGetDidRequest{
+		Id: did,
+	}
+
+	return s.QueryServer.Did(s.StdCtx, req)
+}
diff --git a/x/cheqd/tests/setup_update_did.go b/x/cheqd/tests/setup_update_did.go
new file mode 100644
index 000000000..c703ec859
--- /dev/null
+++ b/x/cheqd/tests/setup_update_did.go
@@ -0,0 +1,29 @@
+package tests
+
+import (
+	"crypto/ed25519"
+	"encoding/base64"
+
+	"github.com/cheqd/cheqd-node/x/cheqd/types"
+)
+
+func (s *TestSetup) UpdateDid(payload *types.MsgUpdateDidPayload, signInputs []SignInput) (*types.MsgUpdateDidResponse, error) {
+	signBytes := payload.GetSignBytes()
+	var signatures []*types.SignInfo
+
+	for _, input := range signInputs {
+		signature := ed25519.Sign(input.Key, signBytes)
+
+		signatures = append(signatures, &types.SignInfo{
+			VerificationMethodId: input.VerificationMethodId,
+			Signature:            base64.StdEncoding.EncodeToString(signature),
+		})
+	}
+
+	msg := &types.MsgUpdateDid{
+		Payload:    payload,
+		Signatures: signatures,
+	}
+
+	return s.MsgServer.UpdateDid(s.StdCtx, msg)
+}
diff --git a/x/cheqd/tests/signature_verification_test.go b/x/cheqd/tests/signature_verification_test.go
deleted file mode 100644
index fb1ecca8e..000000000
--- a/x/cheqd/tests/signature_verification_test.go
+++ /dev/null
@@ -1,129 +0,0 @@
-package tests
-
-import (
-	"crypto/ed25519"
-	"crypto/rand"
-	"fmt"
-	"reflect"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-
-	"github.com/cheqd/cheqd-node/x/cheqd/types"
-)
-
-var _ = Describe("Signature Verification while updating DID", func() {
-	var setup TestSetup
-	var aliceKeys, bobKeys map[string]ed25519.PrivateKey
-	var aliceDid *types.MsgCreateDidPayload
-	BeforeEach(func() {
-		setup = Setup()
-		aliceKeys, aliceDid, _ = setup.InitDid(AliceDID)
-		bobKeys, _, _ = setup.InitDid(BobDID)
-	})
-
-	It("should have changed DIDDoc controller", func() {
-		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-		updatedDidDoc.Controller = append(updatedDidDoc.Controller, BobDID)
-		receivedDid, _ := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(ConcatKeys(aliceKeys, bobKeys)))
-
-		Expect(aliceDid.Controller).To(Not(Equal(receivedDid.Controller)))
-		Expect([]string{AliceDID, BobDID}).To(Not(Equal(receivedDid.Controller)))
-		Expect([]string{BobDID}, receivedDid.Controller)
-	})
-
-	When("Old signature in verification method is absent", func() {
-		It("should fail", func() {
-			updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-			updatedDidDoc.VerificationMethod[0].Type = types.Ed25519VerificationKey2020
-			_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
-
-			// check
-			Expect(err).To(Not(BeNil()))
-			Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
-		})
-	})
-
-	It("should fails cause we need old signature for changing verification method controller", func() {
-		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-		updatedDidDoc.VerificationMethod[0].Controller = BobDID
-		_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
-
-		// check
-		Expect(err).To(Not(BeNil()))
-		Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
-	})
-
-	It("should fails cause we need old signature for changing DIDDoc controller", func() {
-		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-		updatedDidDoc.Controller = append(updatedDidDoc.Controller, BobDID)
-		_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
-
-		// check
-		Expect(err).To(Not(BeNil()))
-		Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
-	})
-})
-
-var _ = Describe("Signature Verification. Remove signature/VM", func() {
-	var setup TestSetup
-	var ApubKey, BpubKey ed25519.PublicKey
-	var AprivKey, BprivKey ed25519.PrivateKey
-	var aliceDid, bobDid *types.MsgCreateDidPayload
-	var aliceKeys, bobKeys map[string]ed25519.PrivateKey
-
-	BeforeEach(func() {
-		setup = Setup()
-		// Generate keys
-		ApubKey, AprivKey, _ = ed25519.GenerateKey(rand.Reader)
-		BpubKey, BprivKey, _ = ed25519.GenerateKey(rand.Reader)
-
-		// Create dids
-		aliceDid = setup.BuildMsgCreateDidPayload(AliceDID, AliceKey1, ApubKey)
-		bobDid = setup.BuildMsgCreateDidPayload(BobDID, BobKey1, BpubKey)
-
-		// Collect private keys
-		aliceKeys = map[string]ed25519.PrivateKey{AliceKey1: AprivKey, BobKey1: BprivKey}
-		bobKeys = map[string]ed25519.PrivateKey{BobKey1: BprivKey}
-
-		// Add verification method
-		aliceDid.VerificationMethod = append(aliceDid.VerificationMethod, &types.VerificationMethod{
-			Id:                 AliceKey2,
-			Controller:         BobDID,
-			Type:               types.Ed25519VerificationKey2020,
-			PublicKeyMultibase: MustEncodeBase58(BpubKey),
-		})
-	})
-
-	It("should fails cause old signature is required for removing this signature", func() {
-		// Send dids
-		_, _ = setup.SendCreateDid(bobDid, bobKeys)
-		_, _ = setup.SendCreateDid(aliceDid, aliceKeys)
-
-		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-		updatedDidDoc.VerificationMethod = []*types.VerificationMethod{aliceDid.VerificationMethod[0]}
-		updatedDidDoc.Authentication = []string{aliceDid.Authentication[0]}
-		_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
-
-		// check
-		Expect(err).To(Not(BeNil()))
-		Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
-	})
-
-	It("should not fails while removing the whole verification method", func() {
-		aliceDid.Authentication = append(aliceDid.Authentication, AliceKey2)
-
-		// Send dids
-		_, _ = setup.SendCreateDid(bobDid, bobKeys)
-		_, _ = setup.SendCreateDid(aliceDid, aliceKeys)
-
-		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-		updatedDidDoc.Authentication = []string{aliceDid.Authentication[0]}
-		updatedDidDoc.VerificationMethod = []*types.VerificationMethod{aliceDid.VerificationMethod[0]}
-		receivedDid, _ := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(ConcatKeys(aliceKeys, bobKeys)))
-
-		// check
-		Expect(len(aliceDid.VerificationMethod)).To(Not(Equal(len(receivedDid.VerificationMethod))))
-		Expect(reflect.DeepEqual(aliceDid.VerificationMethod[0], receivedDid.VerificationMethod[0])).To(BeTrue())
-	})
-})
diff --git a/x/cheqd/tests/types.go b/x/cheqd/tests/types.go
index ddafef7bd..0aa97baee 100644
--- a/x/cheqd/tests/types.go
+++ b/x/cheqd/tests/types.go
@@ -1,6 +1,10 @@
 package tests
 
-import "crypto/ed25519"
+import (
+	"crypto/ed25519"
+
+	"github.com/cheqd/cheqd-node/x/cheqd/types"
+)
 
 type KeyPair struct {
 	Private ed25519.PrivateKey
@@ -11,3 +15,16 @@ type SignInput struct {
 	VerificationMethodId string
 	Key                  ed25519.PrivateKey
 }
+
+type DidInfo struct {
+	Msg       *types.MsgCreateDidPayload
+	Did       string
+	KeyPair   KeyPair
+	KeyId     string
+	SignInput SignInput
+}
+
+type CreatedDidInfo struct {
+	DidInfo
+	VersionId string
+}
diff --git a/x/cheqd/tests/update_did_test.go b/x/cheqd/tests/update_did_test.go
index cd4049328..158ee6605 100644
--- a/x/cheqd/tests/update_did_test.go
+++ b/x/cheqd/tests/update_did_test.go
@@ -6,152 +6,119 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/btcsuite/btcutil/base58"
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
-	"github.com/multiformats/go-multibase"
 )
 
 var _ = Describe("Update DID tests", func() {
-	// params for cases
-	var valid bool
-	var signers []string
-	var signerKeys []SignInput
-	var msg *types.MsgUpdateDidPayload
-	errMsg := ""
-
 	var setup TestSetup
-	var err error
-	mainKeys := map[string]KeyPair{
-		AliceKey1:    GenerateKeyPair(),
-		AliceKey2:    GenerateKeyPair(),
-		BobKey1:      GenerateKeyPair(),
-		BobKey2:      GenerateKeyPair(),
-		BobKey3:      GenerateKeyPair(),
-		BobKey4:      GenerateKeyPair(),
-		CharlieKey1:  GenerateKeyPair(),
-		CharlieKey2:  GenerateKeyPair(),
-		CharlieKey3:  GenerateKeyPair(),
-		CharlieKey4:  GenerateKeyPair(),
-		ImposterKey1: GenerateKeyPair(),
-	}
 
 	BeforeEach(func() {
-		// setup
-		valid = false
-		signers = []string{}
-		signerKeys = []SignInput{}
-		msg = &types.MsgUpdateDidPayload{}
-		errMsg = ""
+		setup = Setup()
 	})
 
-	AfterEach(func() {
-		setup = InitEnv(mainKeys)
-
-		for _, vm := range msg.VerificationMethod {
-			if vm.PublicKeyMultibase == "" {
-				vm.PublicKeyMultibase, err = multibase.Encode(multibase.Base58BTC, mainKeys[vm.Id].Public)
-			}
-			Expect(err).To(BeNil())
-		}
-
-		compiledKeys := []SignInput{}
-		if len(signerKeys) > 0 {
-			compiledKeys = signerKeys
-		} else {
-			for _, signer := range signers {
-				compiledKeys = append(compiledKeys, SignInput{
-					VerificationMethodId: signer,
-					Key:                  mainKeys[signer].Private,
-				})
-			}
-		}
+	It("Valid: Key rotation works", func() {
+		// Create did
+		did := setup.CreateSimpleDid()
 
-		did, err := setup.SendUpdateDid(msg, compiledKeys)
-
-		if valid {
-			Expect(err).To(BeNil())
-			Expect(msg.Id).To(Equal(did.Id))
-			Expect(msg.Controller).To(Equal(did.Controller))
-			Expect(msg.VerificationMethod).To(Equal(did.VerificationMethod))
-			Expect(msg.Authentication).To(Equal(did.Authentication))
-			Expect(msg.AssertionMethod).To(Equal(did.AssertionMethod))
-			Expect(msg.CapabilityInvocation).To(Equal(did.CapabilityInvocation))
-			Expect(msg.CapabilityDelegation).To(Equal(did.CapabilityDelegation))
-			Expect(msg.KeyAgreement).To(Equal(did.KeyAgreement))
-			Expect(msg.AlsoKnownAs).To(Equal(did.AlsoKnownAs))
-			Expect(msg.Service).To(Equal(did.Service))
-			Expect(msg.Context).To(Equal(did.Context))
-		} else {
-			Expect(err).To(HaveOccurred())
-			Expect(errMsg).To(Equal(err.Error()))
-		}
-	})
+		// Update did
+		newKeyPair := GenerateKeyPair()
 
-	It("Valid: Key rotation works", func() {
-		valid = true
-		signerKeys = []SignInput{
-			{
-				VerificationMethodId: AliceKey1,
-				Key:                  mainKeys[AliceKey1].Private,
-			},
-			{
-				VerificationMethodId: AliceKey1,
-				Key:                  mainKeys[AliceKey2].Private,
-			},
-		}
-		msg = &types.MsgUpdateDidPayload{
-			Id: AliceDID,
+		msg := &types.MsgUpdateDidPayload{
+			Id: did.Did,
 			VerificationMethod: []*types.VerificationMethod{
 				{
-					Id:         AliceKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
-					// TODO: Use multibase encoding
-					PublicKeyMultibase: "z" + base58.Encode(mainKeys[AliceKey2].Public),
+					Id:                 did.KeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         did.Did,
+					PublicKeyMultibase: MustEncodeBase58(newKeyPair.Public),
 				},
 			},
+			VersionId: did.VersionId,
+		}
+
+		signatures := []SignInput{
+			did.SignInput, // Old signature
+			{
+				VerificationMethodId: did.KeyId, // New signature
+				Key:                  newKeyPair.Private,
+			},
 		}
+
+		_, err := setup.UpdateDid(msg, signatures)
+		Expect(err).To(BeNil())
+
+		// check
+		created, err := setup.QueryDid(did.Did)
+		Expect(err).To(BeNil())
+		Expect(msg.ToDid()).To(Equal(*created.Did))
 	})
 
-	It("Not Valid: replacing controller and Verification method ID does not work without new sign", func() {
-		valid = false
-		signers = []string{AliceKey2, BobKey1, AliceKey1}
-		msg = &types.MsgUpdateDidPayload{
-			Id:         AliceDID,
-			Controller: []string{CharlieDID},
+	It("Not Valid: Did doc update does not work without DID doc controllers signature", func() {
+		// Setup
+		alice := setup.CreateSimpleDid()
+		bob := setup.CreateDidWithExternalConterllers([]string{alice.Did}, []SignInput{alice.SignInput})
+
+		// Update did
+		msg := &types.MsgUpdateDidPayload{
+			Id:         bob.Did,
+			Controller: []string{alice.Did},
 			VerificationMethod: []*types.VerificationMethod{
 				{
-					Id:         AliceKey2,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
+					Id:                 bob.KeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         bob.Did,
+					PublicKeyMultibase: MustEncodeBase58(bob.KeyPair.Public),
 				},
 			},
+			Authentication:  []string{bob.KeyId},
+			AssertionMethod: []string{bob.KeyId},
+			VersionId:       bob.VersionId,
 		}
-		errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", CharlieDID)
+
+		signatures := []SignInput{}
+
+		_, err := setup.UpdateDid(msg, signatures)
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", alice.Did)))
 	})
 
-	It("Valid: replacing controller and Verification method ID works with all signatures", func() {
-		valid = true
-		signers = []string{AliceKey1, CharlieKey1, AliceKey2}
-		msg = &types.MsgUpdateDidPayload{
-			Id:         AliceDID,
-			Controller: []string{CharlieDID},
+	It("Valid: Did doc update does not works with DID doc controllers signature", func() {
+		// Setup
+		alice := setup.CreateSimpleDid()
+		bob := setup.CreateDidWithExternalConterllers([]string{alice.Did}, []SignInput{alice.SignInput})
+
+		// Update did
+		msg := &types.MsgUpdateDidPayload{
+			Id:         bob.Did,
+			Controller: []string{alice.Did},
 			VerificationMethod: []*types.VerificationMethod{
 				{
-					Id:         AliceKey2,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
+					Id:                 bob.KeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         bob.Did,
+					PublicKeyMultibase: MustEncodeBase58(bob.KeyPair.Public),
 				},
 			},
+			Authentication:  []string{bob.KeyId},
+			AssertionMethod: []string{bob.KeyId},
+			VersionId:       bob.VersionId,
 		}
-		errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", CharlieDID)
+
+		signatures := []SignInput{alice.SignInput}
+
+		_, err := setup.UpdateDid(msg, signatures)
+		Expect(err).To(BeNil())
+
+		// check
+		created, err := setup.QueryDid(bob.Did)
+		Expect(err).To(BeNil())
+		Expect(msg.ToDid()).To(Equal(*created.Did))
 	})
 
 	// Verification method's tests
 	// cases:
 	// - replacing VM controller works
 	// - replacing VM controller does not work without new signature
-	// - replacing VM controller does not work without old signature     ??????
+	// - replacing VM controller does not work without old signature
 	// - replacing VM doesn't work without new signature
 	// - replacing VM doesn't work without old signature
 	// - replacing VM works with all signatures
@@ -159,331 +126,484 @@ var _ = Describe("Update DID tests", func() {
 	// --- adding new VM without new signature
 	// --- adding new VM without old signature
 
-	It("Valid: Replacing VM controller works with one signature", func() {
-		valid = true
-		signers = []string{AliceKey1, BobKey1}
-		msg = &types.MsgUpdateDidPayload{
-			Id: AliceDID,
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:         AliceKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: BobDID,
-				},
-			},
-		}
-	})
+	It("Valid: Replacing VM controller works with two signatures", func() {
+		// Setup
+		alice := setup.CreateSimpleDid()
+		bob := setup.CreateSimpleDid()
 
-	It("Not Valid: Replacing VM controller does not work without new signature", func() {
-		valid = false
-		signers = []string{AliceKey1}
-		msg = &types.MsgUpdateDidPayload{
-			Id: AliceDID,
+		// Update did
+		msg := &types.MsgUpdateDidPayload{
+			Id: alice.Did,
 			VerificationMethod: []*types.VerificationMethod{
 				{
-					Id:         AliceKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: BobDID,
+					Id:                 alice.KeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         bob.Did,
+					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
 				},
 			},
+			Authentication: []string{alice.KeyId},
+			VersionId:      alice.VersionId,
 		}
-		errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)
-	})
 
-	It("Not Valid: Replacing VM does not work without new signature", func() {
-		valid = false
-		signers = []string{AliceKey1}
-		msg = &types.MsgUpdateDidPayload{
-			Id: AliceDID,
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:         AliceKey2,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
-				},
-			},
-		}
-		errMsg = fmt.Sprintf("there should be at least one valid signature by %s (new version): invalid signature detected", AliceDID)
-	})
-	It("Not Valid: Replacing VM does not work without old signature", func() {
-		valid = false
-		signers = []string{AliceKey2}
-		msg = &types.MsgUpdateDidPayload{
-			Id: AliceDID,
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:         AliceKey2,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
-				},
-			},
-		}
-		errMsg = fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", AliceDID)
-	})
-
-	It("Not Valid: Replacing VM works with all signatures", func() {
-		valid = true
-		signers = []string{AliceKey1, AliceKey2}
-		msg = &types.MsgUpdateDidPayload{
-			Id: AliceDID,
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:         AliceKey2,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
-				},
-			},
-		}
-	})
+		signatures := []SignInput{alice.SignInput, bob.SignInput}
 
-	// Adding VM
+		_, err := setup.UpdateDid(msg, signatures)
+		Expect(err).To(BeNil())
 
-	It("Valid: Adding another verification method", func() {
-		valid = true
-		signers = []string{AliceKey1, BobKey1}
-		msg = &types.MsgUpdateDidPayload{
-			Id:         AliceDID,
-			Controller: []string{AliceDID},
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:         AliceKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
-				},
-				{
-					Id:         AliceKey2,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: BobDID,
-				},
-			},
-		}
+		// check
+		updated, err := setup.QueryDid(alice.Did)
+		Expect(err).To(BeNil())
+		Expect(*updated.Did).To(Equal(msg.ToDid()))
 	})
 
-	It("Not Valid: Adding another verification method without new sign", func() {
-		valid = false
-		signers = []string{AliceKey1}
-		msg = &types.MsgUpdateDidPayload{
-			Id:         AliceDID,
-			Controller: []string{AliceDID},
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:         AliceKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
-				},
-				{
-					Id:         AliceKey2,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: BobDID,
-				},
-			},
-		}
-		errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)
-	})
-
-	It("Not Valid: Adding another verification method without old sign", func() {
-		valid = false
-		signers = []string{AliceKey2}
-		msg = &types.MsgUpdateDidPayload{
-			Id:         AliceDID,
-			Controller: []string{AliceDID},
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:         AliceKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
-				},
-				{
-					Id:         AliceKey2,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
-				},
-			},
-		}
-		errMsg = fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", AliceDID)
-	})
-
-	// Controller's tests
-	// cases:
-	// - replacing Controller works with all signatures
-	// - replacing Controller doesn't work without old signature
-	// - replacing Controller doesn't work without new signature
-	// --- adding Controller works with all signatures
-	// --- adding Controller doesn't work without old signature
-	// --- adding Controller doesn't work without new signature
-
-	It("Valid: Replace controller works with all signatures", func() {
-		valid = true
-		signers = []string{BobKey1, AliceKey1}
-		msg = &types.MsgUpdateDidPayload{
-			Id:         AliceDID,
-			Controller: []string{BobDID},
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:         AliceKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
-				},
-			},
-		}
-	})
+	It("Not Valid: Replacing VM controller does not work without new signature", func() {
+		// Setup
+		alice := setup.CreateSimpleDid()
+		bob := setup.CreateSimpleDid()
 
-	It("Not Valid: Replace controller doesn't work without old signatures", func() {
-		valid = false
-		signers = []string{BobKey1}
-		msg = &types.MsgUpdateDidPayload{
-			Id:         AliceDID,
-			Controller: []string{BobDID},
+		// Update did
+		msg := &types.MsgUpdateDidPayload{
+			Id: alice.Did,
 			VerificationMethod: []*types.VerificationMethod{
 				{
-					Id:         AliceKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
+					Id:                 alice.KeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         bob.Did,
+					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
 				},
 			},
+			Authentication: []string{alice.KeyId},
+			VersionId:      alice.VersionId,
 		}
-		errMsg = fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)
-	})
 
-	It("Not Valid: Replace controller doesn't work without new signatures", func() {
-		valid = false
-		signers = []string{AliceKey1}
-		msg = &types.MsgUpdateDidPayload{
-			Id:         AliceDID,
-			Controller: []string{BobDID},
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:         AliceKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
-				},
-			},
-		}
-		errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)
-	})
-
-	// add controller
-
-	It("Valid: Adding second controller works", func() {
-		valid = true
-		signers = []string{AliceKey1, CharlieKey3}
-		msg = &types.MsgUpdateDidPayload{
-			Id:         AliceDID,
-			Controller: []string{AliceDID, CharlieDID},
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:         AliceKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
-				},
-			},
-		}
-	})
+		signatures := []SignInput{alice.SignInput}
 
-	It("Not Valid: Adding controller without old signature", func() {
-		valid = false
-		signers = []string{BobKey1}
-		msg = &types.MsgUpdateDidPayload{
-			Id:         AliceDID,
-			Controller: []string{AliceDID, BobDID},
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:         AliceKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
-				},
-			},
-		}
-		errMsg = fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)
+		_, err := setup.UpdateDid(msg, signatures)
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", bob.Did)))
 	})
 
-	It("Not Valid: Add controller without new signature doesn't work", func() {
-		valid = false
-		signers = []string{AliceKey1}
-		msg = &types.MsgUpdateDidPayload{
-			Id:         AliceDID,
-			Controller: []string{AliceDID, BobDID},
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:         AliceKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
-				},
-			},
-		}
-		errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)
-	})
+	It("Not Valid: Replacing VM does not work without new signature", func() {
+		// Setup
+		alice := setup.CreateSimpleDid()
+		bob := setup.CreateSimpleDid()
 
-	It("Valid: Adding verification method with the same controller works", func() {
-		valid = true
-		signers = []string{AliceKey1, AliceKey2}
-		msg = &types.MsgUpdateDidPayload{
-			Id:         AliceDID,
-			Controller: []string{AliceDID},
+		// Update did
+		msg := &types.MsgUpdateDidPayload{
+			Id: alice.Did,
 			VerificationMethod: []*types.VerificationMethod{
 				{
-					Id:         AliceKey2,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
-				},
-				{
-					Id:         AliceKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: AliceDID,
+					Id:                 alice.KeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         bob.Did,
+					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
 				},
 			},
+			Authentication: []string{alice.KeyId},
+			VersionId:      alice.VersionId,
 		}
-	})
 
-	It("Valid: Keeping VM with controller different then subject untouched during update should not require Bob signature", func() {
-		valid = true
-		signers = []string{CharlieKey1}
-		msg = &types.MsgUpdateDidPayload{
-			Id: CharlieDID,
-			Authentication: []string{
-				CharlieKey1,
-				CharlieKey2,
-				CharlieKey3,
-			},
+		signatures := []SignInput{bob.SignInput}
 
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:         CharlieKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: BobDID,
-				},
-				{
-					Id:         CharlieKey2,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: BobDID,
-				},
-				{
-					Id:         CharlieKey3,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: BobDID,
-				},
-				{
-					Id:         CharlieKey4,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: CharlieDID,
-				},
-			},
-		}
+		_, err := setup.UpdateDid(msg, signatures)
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", alice.Did)))
 	})
 
-	It("Valid: Removing verification method is possible with any kind of valid Bob's key", func() {
-		valid = true
-		signers = []string{BobKey1}
-		msg = &types.MsgUpdateDidPayload{
-			Id: BobDID,
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:         BobKey1,
-					Type:       types.Ed25519VerificationKey2020,
-					Controller: BobDID,
-				},
-			},
-		}
-		errMsg = fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", BobDID)
-	})
+	// It("Not Valid: Replacing VM does not work without old signature", func() {
+	// 	valid = false
+	// 	signers = []string{AliceKey2}
+	// 	msg = &types.MsgUpdateDidPayload{
+	// 		Id: AliceDID,
+	// 		VerificationMethod: []*types.VerificationMethod{
+	// 			{
+	// 				Id:         AliceKey2,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: AliceDID,
+	// 			},
+	// 		},
+	// 	}
+	// 	errMsg = fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", AliceDID)
+	// })
+
+	// It("Not Valid: Replacing VM works with all signatures", func() {
+	// 	valid = true
+	// 	signers = []string{AliceKey1, AliceKey2}
+	// 	msg = &types.MsgUpdateDidPayload{
+	// 		Id: AliceDID,
+	// 		VerificationMethod: []*types.VerificationMethod{
+	// 			{
+	// 				Id:         AliceKey2,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: AliceDID,
+	// 			},
+	// 		},
+	// 	}
+	// })
+
+	// // Adding VM
+
+	// It("Valid: Adding another verification method", func() {
+	// 	valid = true
+	// 	signers = []string{AliceKey1, BobKey1}
+	// 	msg = &types.MsgUpdateDidPayload{
+	// 		Id:         AliceDID,
+	// 		Controller: []string{AliceDID},
+	// 		VerificationMethod: []*types.VerificationMethod{
+	// 			{
+	// 				Id:         AliceKey1,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: AliceDID,
+	// 			},
+	// 			{
+	// 				Id:         AliceKey2,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: BobDID,
+	// 			},
+	// 		},
+	// 	}
+	// })
+
+	// It("Not Valid: Adding another verification method without new sign", func() {
+	// 	valid = false
+	// 	signers = []string{AliceKey1}
+	// 	msg = &types.MsgUpdateDidPayload{
+	// 		Id:         AliceDID,
+	// 		Controller: []string{AliceDID},
+	// 		VerificationMethod: []*types.VerificationMethod{
+	// 			{
+	// 				Id:         AliceKey1,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: AliceDID,
+	// 			},
+	// 			{
+	// 				Id:         AliceKey2,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: BobDID,
+	// 			},
+	// 		},
+	// 	}
+	// 	errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)
+	// })
+
+	// It("Not Valid: Adding another verification method without old sign", func() {
+	// 	valid = false
+	// 	signers = []string{AliceKey2}
+	// 	msg = &types.MsgUpdateDidPayload{
+	// 		Id:         AliceDID,
+	// 		Controller: []string{AliceDID},
+	// 		VerificationMethod: []*types.VerificationMethod{
+	// 			{
+	// 				Id:         AliceKey1,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: AliceDID,
+	// 			},
+	// 			{
+	// 				Id:         AliceKey2,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: AliceDID,
+	// 			},
+	// 		},
+	// 	}
+	// 	errMsg = fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", AliceDID)
+	// })
+
+	// // Controller's tests
+	// // cases:
+	// // - replacing Controller works with all signatures
+	// // - replacing Controller doesn't work without old signature
+	// // - replacing Controller doesn't work without new signature
+	// // --- adding Controller works with all signatures
+	// // --- adding Controller doesn't work without old signature
+	// // --- adding Controller doesn't work without new signature
+
+	// It("Valid: Replace controller works with all signatures", func() {
+	// 	valid = true
+	// 	signers = []string{BobKey1, AliceKey1}
+	// 	msg = &types.MsgUpdateDidPayload{
+	// 		Id:         AliceDID,
+	// 		Controller: []string{BobDID},
+	// 		VerificationMethod: []*types.VerificationMethod{
+	// 			{
+	// 				Id:         AliceKey1,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: AliceDID,
+	// 			},
+	// 		},
+	// 	}
+	// })
+
+	// It("Not Valid: Replace controller doesn't work without old signatures", func() {
+	// 	valid = false
+	// 	signers = []string{BobKey1}
+	// 	msg = &types.MsgUpdateDidPayload{
+	// 		Id:         AliceDID,
+	// 		Controller: []string{BobDID},
+	// 		VerificationMethod: []*types.VerificationMethod{
+	// 			{
+	// 				Id:         AliceKey1,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: AliceDID,
+	// 			},
+	// 		},
+	// 	}
+	// 	errMsg = fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)
+	// })
+
+	// It("Not Valid: Replace controller doesn't work without new signatures", func() {
+	// 	valid = false
+	// 	signers = []string{AliceKey1}
+	// 	msg = &types.MsgUpdateDidPayload{
+	// 		Id:         AliceDID,
+	// 		Controller: []string{BobDID},
+	// 		VerificationMethod: []*types.VerificationMethod{
+	// 			{
+	// 				Id:         AliceKey1,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: AliceDID,
+	// 			},
+	// 		},
+	// 	}
+	// 	errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)
+	// })
+
+	// // add controller
+
+	// It("Valid: Adding second controller works", func() {
+	// 	valid = true
+	// 	signers = []string{AliceKey1, CharlieKey3}
+	// 	msg = &types.MsgUpdateDidPayload{
+	// 		Id:         AliceDID,
+	// 		Controller: []string{AliceDID, CharlieDID},
+	// 		VerificationMethod: []*types.VerificationMethod{
+	// 			{
+	// 				Id:         AliceKey1,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: AliceDID,
+	// 			},
+	// 		},
+	// 	}
+	// })
+
+	// It("Not Valid: Adding controller without old signature", func() {
+	// 	valid = false
+	// 	signers = []string{BobKey1}
+	// 	msg = &types.MsgUpdateDidPayload{
+	// 		Id:         AliceDID,
+	// 		Controller: []string{AliceDID, BobDID},
+	// 		VerificationMethod: []*types.VerificationMethod{
+	// 			{
+	// 				Id:         AliceKey1,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: AliceDID,
+	// 			},
+	// 		},
+	// 	}
+	// 	errMsg = fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)
+	// })
+
+	// It("Not Valid: Add controller without new signature doesn't work", func() {
+	// 	valid = false
+	// 	signers = []string{AliceKey1}
+	// 	msg = &types.MsgUpdateDidPayload{
+	// 		Id:         AliceDID,
+	// 		Controller: []string{AliceDID, BobDID},
+	// 		VerificationMethod: []*types.VerificationMethod{
+	// 			{
+	// 				Id:         AliceKey1,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: AliceDID,
+	// 			},
+	// 		},
+	// 	}
+	// 	errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)
+	// })
+
+	// It("Valid: Adding verification method with the same controller works", func() {
+	// 	valid = true
+	// 	signers = []string{AliceKey1, AliceKey2}
+	// 	msg = &types.MsgUpdateDidPayload{
+	// 		Id:         AliceDID,
+	// 		Controller: []string{AliceDID},
+	// 		VerificationMethod: []*types.VerificationMethod{
+	// 			{
+	// 				Id:         AliceKey2,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: AliceDID,
+	// 			},
+	// 			{
+	// 				Id:         AliceKey1,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: AliceDID,
+	// 			},
+	// 		},
+	// 	}
+	// })
+
+	// It("Valid: Keeping VM with controller different then subject untouched during update should not require Bob signature", func() {
+	// 	valid = true
+	// 	signers = []string{CharlieKey1}
+	// 	msg = &types.MsgUpdateDidPayload{
+	// 		Id: CharlieDID,
+	// 		Authentication: []string{
+	// 			CharlieKey1,
+	// 			CharlieKey2,
+	// 			CharlieKey3,
+	// 		},
+
+	// 		VerificationMethod: []*types.VerificationMethod{
+	// 			{
+	// 				Id:         CharlieKey1,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: BobDID,
+	// 			},
+	// 			{
+	// 				Id:         CharlieKey2,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: BobDID,
+	// 			},
+	// 			{
+	// 				Id:         CharlieKey3,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: BobDID,
+	// 			},
+	// 			{
+	// 				Id:         CharlieKey4,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: CharlieDID,
+	// 			},
+	// 		},
+	// 	}
+	// })
+
+	// It("Valid: Removing verification method is possible with any kind of valid Bob's key", func() {
+	// 	valid = true
+	// 	signers = []string{BobKey1}
+	// 	msg = &types.MsgUpdateDidPayload{
+	// 		Id: BobDID,
+	// 		VerificationMethod: []*types.VerificationMethod{
+	// 			{
+	// 				Id:         BobKey1,
+	// 				Type:       types.Ed25519VerificationKey2020,
+	// 				Controller: BobDID,
+	// 			},
+	// 		},
+	// 	}
+	// 	errMsg = fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", BobDID)
+	// })
 })
+
+// var _ = Describe("Signature Verification while updating DID", func() {
+// 	var setup TestSetup
+// 	var aliceKeys, bobKeys map[string]ed25519.PrivateKey
+// 	var aliceDid *types.MsgCreateDidPayload
+// 	BeforeEach(func() {
+// 		setup = Setup()
+// 		aliceKeys, aliceDid, _ = setup.InitDid(AliceDID)
+// 		bobKeys, _, _ = setup.InitDid(BobDID)
+// 	})
+
+// 	It("should have changed DIDDoc controller", func() {
+// 		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
+// 		updatedDidDoc.Controller = append(updatedDidDoc.Controller, BobDID)
+// 		receivedDid, _ := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(ConcatKeys(aliceKeys, bobKeys)))
+
+// 		Expect(aliceDid.Controller).To(Not(Equal(receivedDid.Controller)))
+// 		Expect([]string{AliceDID, BobDID}).To(Not(Equal(receivedDid.Controller)))
+// 		Expect([]string{BobDID}, receivedDid.Controller)
+// 	})
+
+// 	When("Old signature in verification method is absent", func() {
+// 		It("should fail", func() {
+// 			updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
+// 			updatedDidDoc.VerificationMethod[0].Type = types.Ed25519VerificationKey2020
+// 			_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
+
+// 			// check
+// 			Expect(err).To(Not(BeNil()))
+// 			Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
+// 		})
+// 	})
+
+// 	It("should fails cause we need old signature for changing verification method controller", func() {
+// 		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
+// 		updatedDidDoc.VerificationMethod[0].Controller = BobDID
+// 		_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
+
+// 		// check
+// 		Expect(err).To(Not(BeNil()))
+// 		Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
+// 	})
+
+// 	It("should fails cause we need old signature for changing DIDDoc controller", func() {
+// 		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
+// 		updatedDidDoc.Controller = append(updatedDidDoc.Controller, BobDID)
+// 		_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
+
+// 		// check
+// 		Expect(err).To(Not(BeNil()))
+// 		Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
+// 	})
+// })
+
+// var _ = Describe("Signature Verification. Remove signature/VM", func() {
+// 	var setup TestSetup
+// 	var ApubKey, BpubKey ed25519.PublicKey
+// 	var AprivKey, BprivKey ed25519.PrivateKey
+// 	var aliceDid, bobDid *types.MsgCreateDidPayload
+// 	var aliceKeys, bobKeys map[string]ed25519.PrivateKey
+
+// 	BeforeEach(func() {
+// 		setup = Setup()
+// 		// Generate keys
+// 		ApubKey, AprivKey, _ = ed25519.GenerateKey(rand.Reader)
+// 		BpubKey, BprivKey, _ = ed25519.GenerateKey(rand.Reader)
+
+// 		// Create dids
+// 		aliceDid = setup.BuildSimpleCreateDidPayload(AliceDID, AliceKey1, ApubKey)
+// 		bobDid = setup.BuildSimpleCreateDidPayload(BobDID, BobKey1, BpubKey)
+
+// 		// Collect private keys
+// 		aliceKeys = map[string]ed25519.PrivateKey{AliceKey1: AprivKey, BobKey1: BprivKey}
+// 		bobKeys = map[string]ed25519.PrivateKey{BobKey1: BprivKey}
+
+// 		// Add verification method
+// 		aliceDid.VerificationMethod = append(aliceDid.VerificationMethod, &types.VerificationMethod{
+// 			Id:                 AliceKey2,
+// 			Controller:         BobDID,
+// 			Type:               types.Ed25519VerificationKey2020,
+// 			PublicKeyMultibase: MustEncodeBase58(BpubKey),
+// 		})
+// 	})
+
+// 	It("should fails cause old signature is required for removing this signature", func() {
+// 		// Send dids
+// 		_, _ = setup.SendCreateDid(bobDid, bobKeys)
+// 		_, _ = setup.SendCreateDid(aliceDid, aliceKeys)
+
+// 		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
+// 		updatedDidDoc.VerificationMethod = []*types.VerificationMethod{aliceDid.VerificationMethod[0]}
+// 		updatedDidDoc.Authentication = []string{aliceDid.Authentication[0]}
+// 		_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
+
+// 		// check
+// 		Expect(err).To(Not(BeNil()))
+// 		Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
+// 	})
+
+// 	It("should not fails while removing the whole verification method", func() {
+// 		aliceDid.Authentication = append(aliceDid.Authentication, AliceKey2)
+
+// 		// Send dids
+// 		_, _ = setup.SendCreateDid(bobDid, bobKeys)
+// 		_, _ = setup.SendCreateDid(aliceDid, aliceKeys)
+
+// 		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
+// 		updatedDidDoc.Authentication = []string{aliceDid.Authentication[0]}
+// 		updatedDidDoc.VerificationMethod = []*types.VerificationMethod{aliceDid.VerificationMethod[0]}
+// 		receivedDid, _ := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(ConcatKeys(aliceKeys, bobKeys)))
+
+// 		// check
+// 		Expect(len(aliceDid.VerificationMethod)).To(Not(Equal(len(receivedDid.VerificationMethod))))
+// 		Expect(reflect.DeepEqual(aliceDid.VerificationMethod[0], receivedDid.VerificationMethod[0])).To(BeTrue())
+// 	})
+// })
diff --git a/x/cheqd/types/did_did.go b/x/cheqd/types/did_did.go
index d0c8238e6..2e5d1ce41 100644
--- a/x/cheqd/types/did_did.go
+++ b/x/cheqd/types/did_did.go
@@ -47,18 +47,7 @@ func (did *Did) ReplaceIds(old, new string) {
 	}
 
 	for _, vm := range did.VerificationMethod {
-		// Controller
-		if vm.Controller == old {
-			vm.Controller = new
-		}
-
-		// Id
-		did, path, query, fragment := utils.MustSplitDIDUrl(vm.Id)
-		if did == old {
-			did = new
-		}
-
-		vm.Id = utils.JoinDIDUrl(did, path, query, fragment)
+		vm.ReplaceIds(old, new)
 	}
 }
 
diff --git a/x/cheqd/types/did_verification_method.go b/x/cheqd/types/did_verification_method.go
index 93114a620..f67414271 100644
--- a/x/cheqd/types/did_verification_method.go
+++ b/x/cheqd/types/did_verification_method.go
@@ -6,7 +6,6 @@ import (
 	"crypto/rsa"
 	"errors"
 	"fmt"
-	"reflect"
 
 	"github.com/cheqd/cheqd-node/x/cheqd/utils"
 	validation "github.com/go-ozzo/ozzo-validation/v4"
@@ -121,11 +120,20 @@ func VerificationMethodListToMapByFragment(vms []*VerificationMethod) map[string
 	return result
 }
 
-func CompareVerificationMethodsWithoutIds(vm1, vm2 VerificationMethod) bool {
-	// We can override ids because  on local copies
-	vm1.Id = ""
-	vm2.Id = ""
-	return reflect.DeepEqual(vm1, vm2)
+// ReplaceIds replaces ids in all fields
+func (vm *VerificationMethod) ReplaceIds(old, new string) {
+	// Controller
+	if vm.Controller == old {
+		vm.Controller = new
+	}
+
+	// Id
+	did, path, query, fragment := utils.MustSplitDIDUrl(vm.Id)
+	if did == old {
+		did = new
+	}
+
+	vm.Id = utils.JoinDIDUrl(did, path, query, fragment)
 }
 
 // Validation
diff --git a/x/resource/tests/create_resource_test.go b/x/resource/tests/create_resource_test.go
index 692fefe81..dc01850fa 100644
--- a/x/resource/tests/create_resource_test.go
+++ b/x/resource/tests/create_resource_test.go
@@ -20,7 +20,7 @@ var _ = Describe("CreateResource", func() {
 		keys := GenerateTestKeys()
 		BeforeEach(func() {
 			setup = Setup()
-			didDoc := setup.BuildMsgCreateDidPayload(ExistingDID, ExistingDIDKey, keys[ExistingDIDKey].Public)
+			didDoc := setup.BuildSimpleCreateDidPayload(ExistingDID, ExistingDIDKey, keys[ExistingDIDKey].Public)
 			_, err = setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
 			resourcePayload := GenerateCreateResourcePayload(ExistingResource())
diff --git a/x/resource/tests/query_all_resource_versions_test.go b/x/resource/tests/query_all_resource_versions_test.go
index 750a6938b..e27f534c8 100644
--- a/x/resource/tests/query_all_resource_versions_test.go
+++ b/x/resource/tests/query_all_resource_versions_test.go
@@ -16,7 +16,7 @@ var _ = Describe("QueryAllResourceVersions", func() {
 		keys := GenerateTestKeys()
 		BeforeEach(func() {
 			setup = Setup()
-			didDoc := setup.BuildMsgCreateDidPayload(ExistingDID, ExistingDIDKey, keys[ExistingDIDKey].Public)
+			didDoc := setup.BuildSimpleCreateDidPayload(ExistingDID, ExistingDIDKey, keys[ExistingDIDKey].Public)
 			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
 			payload := GenerateCreateResourcePayload(ExistingResource())
diff --git a/x/resource/tests/query_collection_resources_test.go b/x/resource/tests/query_collection_resources_test.go
index 18036de72..4c8b19b2f 100644
--- a/x/resource/tests/query_collection_resources_test.go
+++ b/x/resource/tests/query_collection_resources_test.go
@@ -16,7 +16,7 @@ var _ = Describe("QueryCollectionResources", func() {
 		keys := GenerateTestKeys()
 		BeforeEach(func() {
 			setup = Setup()
-			didDoc := setup.BuildMsgCreateDidPayload(ExistingDID, ExistingDIDKey, keys[ExistingDIDKey].Public)
+			didDoc := setup.BuildSimpleCreateDidPayload(ExistingDID, ExistingDIDKey, keys[ExistingDIDKey].Public)
 			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
 			payload := GenerateCreateResourcePayload(ExistingResource())
diff --git a/x/resource/tests/query_resource_test.go b/x/resource/tests/query_resource_test.go
index 0d87dd13a..1c3d57f15 100644
--- a/x/resource/tests/query_resource_test.go
+++ b/x/resource/tests/query_resource_test.go
@@ -17,7 +17,7 @@ var _ = Describe("QueryGetResource", func() {
 		existingResource := ExistingResource()
 		BeforeEach(func() {
 			setup = Setup()
-			didDoc := setup.BuildMsgCreateDidPayload(ExistingDID, ExistingDIDKey, keys[ExistingDIDKey].Public)
+			didDoc := setup.BuildSimpleCreateDidPayload(ExistingDID, ExistingDIDKey, keys[ExistingDIDKey].Public)
 			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
 			Expect(err).To(BeNil())
 			payload := GenerateCreateResourcePayload(ExistingResource())

From 3ac56e73f2237243fc1801d117a6d994941ee0c6 Mon Sep 17 00:00:00 2001
From: Alexandr Kolesov <kolesov.alex.s@gmail.com>
Date: Wed, 12 Oct 2022 13:13:26 +0500
Subject: [PATCH 32/76] WIP

---
 x/cheqd/tests/const.go           |   3 -
 x/cheqd/tests/update_did_test.go | 307 +++++++++++++++++++++----------
 2 files changed, 214 insertions(+), 96 deletions(-)
 delete mode 100644 x/cheqd/tests/const.go

diff --git a/x/cheqd/tests/const.go b/x/cheqd/tests/const.go
deleted file mode 100644
index 2b33e2506..000000000
--- a/x/cheqd/tests/const.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package tests
-
-// const Ed25519VerificationKey2020 = "Ed25519VerificationKey2020"
diff --git a/x/cheqd/tests/update_did_test.go b/x/cheqd/tests/update_did_test.go
index 158ee6605..4d9fdd49d 100644
--- a/x/cheqd/tests/update_did_test.go
+++ b/x/cheqd/tests/update_did_test.go
@@ -169,7 +169,7 @@ var _ = Describe("Update DID tests", func() {
 				{
 					Id:                 alice.KeyId,
 					Type:               types.Ed25519VerificationKey2020,
-					Controller:         bob.Did,
+					Controller:         bob.Did, // Previously alice
 					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
 				},
 			},
@@ -183,7 +183,7 @@ var _ = Describe("Update DID tests", func() {
 		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", bob.Did)))
 	})
 
-	It("Not Valid: Replacing VM does not work without new signature", func() {
+	It("Not Valid: Replacing VM controller does not work without old signature", func() {
 		// Setup
 		alice := setup.CreateSimpleDid()
 		bob := setup.CreateSimpleDid()
@@ -209,103 +209,224 @@ var _ = Describe("Update DID tests", func() {
 		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", alice.Did)))
 	})
 
-	// It("Not Valid: Replacing VM does not work without old signature", func() {
-	// 	valid = false
-	// 	signers = []string{AliceKey2}
-	// 	msg = &types.MsgUpdateDidPayload{
-	// 		Id: AliceDID,
-	// 		VerificationMethod: []*types.VerificationMethod{
-	// 			{
-	// 				Id:         AliceKey2,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: AliceDID,
-	// 			},
-	// 		},
-	// 	}
-	// 	errMsg = fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", AliceDID)
-	// })
+	It("Not Valid: Replacing VM does not work without new signature", func() {
+		// Setup
+		alice := setup.CreateSimpleDid()
 
-	// It("Not Valid: Replacing VM works with all signatures", func() {
-	// 	valid = true
-	// 	signers = []string{AliceKey1, AliceKey2}
-	// 	msg = &types.MsgUpdateDidPayload{
-	// 		Id: AliceDID,
-	// 		VerificationMethod: []*types.VerificationMethod{
-	// 			{
-	// 				Id:         AliceKey2,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: AliceDID,
-	// 			},
-	// 		},
-	// 	}
-	// })
+		// Update did
+		newKeyId := alice.Did + "#key-2"
+
+		msg := &types.MsgUpdateDidPayload{
+			Id: alice.Did,
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:                 newKeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         alice.Did,
+					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+				},
+			},
+			Authentication: []string{alice.KeyId},
+			VersionId:      alice.VersionId,
+		}
+
+		signatures := []SignInput{alice.SignInput}
+
+		_, err := setup.UpdateDid(msg, signatures)
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one valid signature by %s (new version): invalid signature detected", alice.Did)))
+	})
+
+	It("Not Valid: Replacing VM does not work without old signature", func() {
+		// Setup
+		alice := setup.CreateSimpleDid()
+
+		// Update did
+		newKeyId := alice.Did + "#key-2"
+
+		msg := &types.MsgUpdateDidPayload{
+			Id: alice.Did,
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:                 newKeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         alice.Did,
+					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+				},
+			},
+			Authentication: []string{alice.KeyId},
+			VersionId:      alice.VersionId,
+		}
+
+		signatures := []SignInput{
+			{
+				VerificationMethodId: newKeyId,
+				Key:                  alice.KeyPair.Private,
+			},
+		}
+
+		_, err := setup.UpdateDid(msg, signatures)
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", alice.Did)))
+	})
+
+	It("Not Valid: Replacing VM works with all signatures", func() {
+		// Setup
+		alice := setup.CreateSimpleDid()
+
+		// Update did
+		newKeyId := alice.Did + "#key-2"
+
+		msg := &types.MsgUpdateDidPayload{
+			Id: alice.Did,
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:                 newKeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         alice.Did,
+					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+				},
+			},
+			Authentication: []string{alice.KeyId},
+			VersionId:      alice.VersionId,
+		}
+
+		signatures := []SignInput{
+			alice.SignInput,
+			{
+				VerificationMethodId: newKeyId,
+				Key:                  alice.KeyPair.Private,
+			},
+		}
+
+		_, err := setup.UpdateDid(msg, signatures)
+		Expect(err).To(BeNil())
+
+		// check
+		created, err := setup.QueryDid(alice.Did)
+		Expect(err).To(BeNil())
+		Expect(*created).ToNot(Equal(msg.ToDid()))
+	})
 
 	// // Adding VM
 
-	// It("Valid: Adding another verification method", func() {
-	// 	valid = true
-	// 	signers = []string{AliceKey1, BobKey1}
-	// 	msg = &types.MsgUpdateDidPayload{
-	// 		Id:         AliceDID,
-	// 		Controller: []string{AliceDID},
-	// 		VerificationMethod: []*types.VerificationMethod{
-	// 			{
-	// 				Id:         AliceKey1,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: AliceDID,
-	// 			},
-	// 			{
-	// 				Id:         AliceKey2,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: BobDID,
-	// 			},
-	// 		},
-	// 	}
-	// })
+	It("Valid: Adding another verification method", func() {
+		// Setup
+		alice := setup.CreateSimpleDid()
 
-	// It("Not Valid: Adding another verification method without new sign", func() {
-	// 	valid = false
-	// 	signers = []string{AliceKey1}
-	// 	msg = &types.MsgUpdateDidPayload{
-	// 		Id:         AliceDID,
-	// 		Controller: []string{AliceDID},
-	// 		VerificationMethod: []*types.VerificationMethod{
-	// 			{
-	// 				Id:         AliceKey1,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: AliceDID,
-	// 			},
-	// 			{
-	// 				Id:         AliceKey2,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: BobDID,
-	// 			},
-	// 		},
-	// 	}
-	// 	errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)
-	// })
+		// Update did
+		newKeyId := alice.Did + "#key-2"
+		newKey := GenerateKeyPair()
 
-	// It("Not Valid: Adding another verification method without old sign", func() {
-	// 	valid = false
-	// 	signers = []string{AliceKey2}
-	// 	msg = &types.MsgUpdateDidPayload{
-	// 		Id:         AliceDID,
-	// 		Controller: []string{AliceDID},
-	// 		VerificationMethod: []*types.VerificationMethod{
-	// 			{
-	// 				Id:         AliceKey1,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: AliceDID,
-	// 			},
-	// 			{
-	// 				Id:         AliceKey2,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: AliceDID,
-	// 			},
-	// 		},
-	// 	}
-	// 	errMsg = fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", AliceDID)
-	// })
+		msg := &types.MsgUpdateDidPayload{
+			Id: alice.Did,
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:                 alice.KeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         alice.Did,
+					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+				},
+				{
+					Id:                 newKeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         alice.Did,
+					PublicKeyMultibase: MustEncodeBase58(newKey.Public),
+				},
+			},
+			Authentication: []string{alice.KeyId},
+			VersionId:      alice.VersionId,
+		}
+
+		signatures := []SignInput{
+			alice.SignInput,
+			{
+				VerificationMethodId: newKeyId,
+				Key:                  newKey.Private,
+			},
+		}
+
+		_, err := setup.UpdateDid(msg, signatures)
+		Expect(err).To(BeNil())
+
+		// check
+		created, err := setup.QueryDid(alice.Did)
+		Expect(err).To(BeNil())
+		Expect(*created).ToNot(Equal(msg.ToDid()))
+	})
+
+	It("Not Valid: Adding another verification method without new sign", func() {
+		// Setup
+		alice := setup.CreateSimpleDid()
+
+		// Update did
+		newKeyId := alice.Did + "#key-2"
+		newKey := GenerateKeyPair()
+
+		msg := &types.MsgUpdateDidPayload{
+			Id: alice.Did,
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:                 alice.KeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         alice.Did,
+					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+				},
+				{
+					Id:                 newKeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         alice.Did,
+					PublicKeyMultibase: MustEncodeBase58(newKey.Public),
+				},
+			},
+			Authentication: []string{alice.KeyId},
+			VersionId:      alice.VersionId,
+		}
+
+		signatures := []SignInput{
+			alice.SignInput,
+		}
+
+		_, err := setup.UpdateDid(msg, signatures)
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)))
+	})
+
+	It("Not Valid: Adding another verification method without old sign", func() {
+		// Setup
+		alice := setup.CreateSimpleDid()
+
+		// Update did
+		newKeyId := alice.Did + "#key-2"
+		newKey := GenerateKeyPair()
+
+		msg := &types.MsgUpdateDidPayload{
+			Id: alice.Did,
+			VerificationMethod: []*types.VerificationMethod{
+				{
+					Id:                 alice.KeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         alice.Did,
+					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+				},
+				{
+					Id:                 newKeyId,
+					Type:               types.Ed25519VerificationKey2020,
+					Controller:         alice.Did,
+					PublicKeyMultibase: MustEncodeBase58(newKey.Public),
+				},
+			},
+			Authentication: []string{alice.KeyId},
+			VersionId:      alice.VersionId,
+		}
+
+		signatures := []SignInput{
+			{
+				VerificationMethodId: newKeyId,
+				Key:                  newKey.Private,
+			},
+		}
+
+		_, err := setup.UpdateDid(msg, signatures)
+		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", AliceDID)))
+	})
 
 	// // Controller's tests
 	// // cases:

From e57999b354c249fd012703f417cf1c84cb9e8350 Mon Sep 17 00:00:00 2001
From: Alexandr Kolesov <kolesov.alex.s@gmail.com>
Date: Thu, 13 Oct 2022 15:08:27 +0500
Subject: [PATCH 33/76] Implementation

---
 x/cheqd/tests/update_did_test.go | 211 +++++++++++++++++--------------
 1 file changed, 116 insertions(+), 95 deletions(-)

diff --git a/x/cheqd/tests/update_did_test.go b/x/cheqd/tests/update_did_test.go
index 4d9fdd49d..49a604474 100644
--- a/x/cheqd/tests/update_did_test.go
+++ b/x/cheqd/tests/update_did_test.go
@@ -9,48 +9,69 @@ import (
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
 )
 
-var _ = Describe("Update DID tests", func() {
+var _ = Describe("DID Doc update", func() {
 	var setup TestSetup
 
 	BeforeEach(func() {
 		setup = Setup()
 	})
 
-	It("Valid: Key rotation works", func() {
-		// Create did
-		did := setup.CreateSimpleDid()
-
-		// Update did
-		newKeyPair := GenerateKeyPair()
+	Describe("Key rotation", func() {
+		var did CreatedDidInfo
+		var newKeyPair KeyPair
+		var msg *types.MsgUpdateDidPayload
+
+		BeforeEach(func() {
+			did = setup.CreateSimpleDid()
+			newKeyPair = GenerateKeyPair()
+			msg = &types.MsgUpdateDidPayload{
+				Id: did.Did,
+				VerificationMethod: []*types.VerificationMethod{
+					{
+						Id:                 did.KeyId,
+						Type:               types.Ed25519VerificationKey2020,
+						Controller:         did.Did,
+						PublicKeyMultibase: MustEncodeBase58(newKeyPair.Public),
+					},
+				},
+				VersionId: did.VersionId,
+			}
+		})
 
-		msg := &types.MsgUpdateDidPayload{
-			Id: did.Did,
-			VerificationMethod: []*types.VerificationMethod{
+		It("Works with two signatures", func() {
+			signatures := []SignInput{
+				did.SignInput, // Old signature
 				{
-					Id:                 did.KeyId,
-					Type:               types.Ed25519VerificationKey2020,
-					Controller:         did.Did,
-					PublicKeyMultibase: MustEncodeBase58(newKeyPair.Public),
+					VerificationMethodId: did.KeyId, // New signature
+					Key:                  newKeyPair.Private,
 				},
-			},
-			VersionId: did.VersionId,
-		}
+			}
 
-		signatures := []SignInput{
-			did.SignInput, // Old signature
-			{
-				VerificationMethodId: did.KeyId, // New signature
-				Key:                  newKeyPair.Private,
-			},
-		}
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err).To(BeNil())
 
-		_, err := setup.UpdateDid(msg, signatures)
-		Expect(err).To(BeNil())
+			// check
+			created, err := setup.QueryDid(did.Did)
+			Expect(err).To(BeNil())
+			Expect(msg.ToDid()).To(Equal(*created.Did))
+		})
 
-		// check
-		created, err := setup.QueryDid(did.Did)
-		Expect(err).To(BeNil())
-		Expect(msg.ToDid()).To(Equal(*created.Did))
+		It("Doesn't work without new signature", func() {
+			signatures := []SignInput{did.SignInput}
+
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one valid signature by %s (new version): invalid signature detected", did.Did)))
+		})
+
+		It("Doesn't work without old signature", func() {
+			signatures := []SignInput{{
+				VerificationMethodId: did.KeyId,
+				Key:                  newKeyPair.Private,
+			}}
+
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", did.Did)))
+		})
 	})
 
 	It("Not Valid: Did doc update does not work without DID doc controllers signature", func() {
@@ -353,80 +374,80 @@ var _ = Describe("Update DID tests", func() {
 		Expect(*created).ToNot(Equal(msg.ToDid()))
 	})
 
-	It("Not Valid: Adding another verification method without new sign", func() {
-		// Setup
-		alice := setup.CreateSimpleDid()
+	// It("Not Valid: Adding another verification method without new sign", func() {
+	// 	// Setup
+	// 	alice := setup.CreateSimpleDid()
 
-		// Update did
-		newKeyId := alice.Did + "#key-2"
-		newKey := GenerateKeyPair()
+	// 	// Update did
+	// 	newKeyId := alice.Did + "#key-2"
+	// 	newKey := GenerateKeyPair()
 
-		msg := &types.MsgUpdateDidPayload{
-			Id: alice.Did,
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:                 alice.KeyId,
-					Type:               types.Ed25519VerificationKey2020,
-					Controller:         alice.Did,
-					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
-				},
-				{
-					Id:                 newKeyId,
-					Type:               types.Ed25519VerificationKey2020,
-					Controller:         alice.Did,
-					PublicKeyMultibase: MustEncodeBase58(newKey.Public),
-				},
-			},
-			Authentication: []string{alice.KeyId},
-			VersionId:      alice.VersionId,
-		}
+	// 	msg := &types.MsgUpdateDidPayload{
+	// 		Id: alice.Did,
+	// 		VerificationMethod: []*types.VerificationMethod{
+	// 			{
+	// 				Id:                 alice.KeyId,
+	// 				Type:               types.Ed25519VerificationKey2020,
+	// 				Controller:         alice.Did,
+	// 				PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+	// 			},
+	// 			{
+	// 				Id:                 newKeyId,
+	// 				Type:               types.Ed25519VerificationKey2020,
+	// 				Controller:         alice.Did,
+	// 				PublicKeyMultibase: MustEncodeBase58(newKey.Public),
+	// 			},
+	// 		},
+	// 		Authentication: []string{alice.KeyId},
+	// 		VersionId:      alice.VersionId,
+	// 	}
 
-		signatures := []SignInput{
-			alice.SignInput,
-		}
+	// 	signatures := []SignInput{
+	// 		alice.SignInput,
+	// 	}
 
-		_, err := setup.UpdateDid(msg, signatures)
-		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)))
-	})
+	// 	_, err := setup.UpdateDid(msg, signatures)
+	// 	Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)))
+	// })
 
-	It("Not Valid: Adding another verification method without old sign", func() {
-		// Setup
-		alice := setup.CreateSimpleDid()
+	// It("Not Valid: Adding another verification method without old sign", func() {
+	// 	// Setup
+	// 	alice := setup.CreateSimpleDid()
 
-		// Update did
-		newKeyId := alice.Did + "#key-2"
-		newKey := GenerateKeyPair()
+	// 	// Update did
+	// 	newKeyId := alice.Did + "#key-2"
+	// 	newKey := GenerateKeyPair()
 
-		msg := &types.MsgUpdateDidPayload{
-			Id: alice.Did,
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:                 alice.KeyId,
-					Type:               types.Ed25519VerificationKey2020,
-					Controller:         alice.Did,
-					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
-				},
-				{
-					Id:                 newKeyId,
-					Type:               types.Ed25519VerificationKey2020,
-					Controller:         alice.Did,
-					PublicKeyMultibase: MustEncodeBase58(newKey.Public),
-				},
-			},
-			Authentication: []string{alice.KeyId},
-			VersionId:      alice.VersionId,
-		}
+	// 	msg := &types.MsgUpdateDidPayload{
+	// 		Id: alice.Did,
+	// 		VerificationMethod: []*types.VerificationMethod{
+	// 			{
+	// 				Id:                 alice.KeyId,
+	// 				Type:               types.Ed25519VerificationKey2020,
+	// 				Controller:         alice.Did,
+	// 				PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+	// 			},
+	// 			{
+	// 				Id:                 newKeyId,
+	// 				Type:               types.Ed25519VerificationKey2020,
+	// 				Controller:         alice.Did,
+	// 				PublicKeyMultibase: MustEncodeBase58(newKey.Public),
+	// 			},
+	// 		},
+	// 		Authentication: []string{alice.KeyId},
+	// 		VersionId:      alice.VersionId,
+	// 	}
 
-		signatures := []SignInput{
-			{
-				VerificationMethodId: newKeyId,
-				Key:                  newKey.Private,
-			},
-		}
+	// 	signatures := []SignInput{
+	// 		{
+	// 			VerificationMethodId: newKeyId,
+	// 			Key:                  newKey.Private,
+	// 		},
+	// 	}
 
-		_, err := setup.UpdateDid(msg, signatures)
-		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", AliceDID)))
-	})
+	// 	_, err := setup.UpdateDid(msg, signatures)
+	// 	Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", AliceDID)))
+	// })
 
 	// // Controller's tests
 	// // cases:

From 9f3fc8f2326441e26c6209f97e6511b3565c7ebb Mon Sep 17 00:00:00 2001
From: Alexandr Kolesov <kolesov.alex.s@gmail.com>
Date: Fri, 14 Oct 2022 17:45:26 +0500
Subject: [PATCH 34/76] Finish cheqd module tests

---
 x/cheqd/tests/update_did_test.go | 1038 ++++++++++++------------------
 1 file changed, 408 insertions(+), 630 deletions(-)

diff --git a/x/cheqd/tests/update_did_test.go b/x/cheqd/tests/update_did_test.go
index 49a604474..238fff23d 100644
--- a/x/cheqd/tests/update_did_test.go
+++ b/x/cheqd/tests/update_did_test.go
@@ -16,7 +16,210 @@ var _ = Describe("DID Doc update", func() {
 		setup = Setup()
 	})
 
-	Describe("Key rotation", func() {
+	Describe("DIDDoc: update verification relationship", func() {
+		var alice CreatedDidInfo
+		var bob CreatedDidInfo
+		var msg *types.MsgUpdateDidPayload
+
+		BeforeEach(func() {
+			alice = setup.CreateSimpleDid()
+			bob = setup.CreateDidWithExternalConterllers([]string{alice.Did}, []SignInput{alice.SignInput})
+
+			msg = &types.MsgUpdateDidPayload{
+				Id:         bob.Did,
+				Controller: []string{alice.Did},
+				VerificationMethod: []*types.VerificationMethod{
+					{
+						Id:                 bob.KeyId,
+						Type:               types.Ed25519VerificationKey2020,
+						Controller:         bob.Did,
+						PublicKeyMultibase: MustEncodeBase58(bob.KeyPair.Public),
+					},
+				},
+				Authentication:  []string{bob.KeyId},
+				AssertionMethod: []string{bob.KeyId},
+				VersionId:       bob.VersionId,
+			}
+		})
+
+		It("Works with DID doc controllers signature", func() {
+			signatures := []SignInput{alice.SignInput}
+
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err).To(BeNil())
+
+			// check
+			created, err := setup.QueryDid(bob.Did)
+			Expect(err).To(BeNil())
+			Expect(msg.ToDid()).To(Equal(*created.Did))
+		})
+
+		It("Doesn't work without controllers signatures", func() {
+			signatures := []SignInput{}
+
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", alice.Did)))
+		})
+	})
+
+	Describe("DIDDoc: replacing controller", func() {
+		var alice CreatedDidInfo
+		var bob CreatedDidInfo
+		var msg *types.MsgUpdateDidPayload
+
+		BeforeEach(func() {
+			alice = setup.CreateSimpleDid()
+			bob = setup.CreateSimpleDid()
+
+			msg = &types.MsgUpdateDidPayload{
+				Id:         alice.Did,
+				Controller: []string{bob.Did},
+				VerificationMethod: []*types.VerificationMethod{
+					{
+						Id:                 alice.KeyId,
+						Type:               types.Ed25519VerificationKey2020,
+						Controller:         alice.Did,
+						PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+					},
+				},
+				VersionId: alice.VersionId,
+			}
+		})
+
+		It("Works with old and new signatures", func() {
+			signatures := []SignInput{
+				alice.SignInput,
+				bob.SignInput,
+			}
+
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err).To(BeNil())
+
+			// check
+			updated, err := setup.QueryDid(alice.Did)
+			Expect(err).To(BeNil())
+			Expect(*updated.Did).To(Equal(msg.ToDid()))
+		})
+
+		It("Doesn't work with only new controller signature", func() {
+			signatures := []SignInput{
+				bob.SignInput,
+			}
+
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", alice.Did)))
+		})
+
+		It("Doesn't work with only old controller signature", func() {
+			signatures := []SignInput{
+				alice.SignInput,
+			}
+
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", bob.Did)))
+		})
+	})
+
+	Describe("DIDDoc: adding controller", func() {
+		var alice CreatedDidInfo
+		var bob CreatedDidInfo
+		var msg *types.MsgUpdateDidPayload
+
+		BeforeEach(func() {
+			alice = setup.CreateSimpleDid()
+			bob = setup.CreateSimpleDid()
+
+			msg = &types.MsgUpdateDidPayload{
+				Id:         alice.Did,
+				Controller: []string{alice.Did, bob.Did},
+				VerificationMethod: []*types.VerificationMethod{
+					{
+						Id:                 alice.KeyId,
+						Type:               types.Ed25519VerificationKey2020,
+						Controller:         alice.Did,
+						PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+					},
+				},
+				VersionId: alice.VersionId,
+			}
+		})
+
+		It("Works with old and new signatures", func() {
+			signatures := []SignInput{
+				alice.SignInput,
+				bob.SignInput,
+			}
+
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err).To(BeNil())
+
+			// check
+			updated, err := setup.QueryDid(alice.Did)
+			Expect(err).To(BeNil())
+			Expect(*updated.Did).To(Equal(msg.ToDid()))
+		})
+
+		It("Doesn't work with only new controller signatures", func() {
+			signatures := []SignInput{
+				bob.SignInput,
+			}
+
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", alice.Did)))
+		})
+
+		It("Doesn't work with only old controller signatures", func() {
+			signatures := []SignInput{
+				alice.SignInput,
+			}
+
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", bob.Did)))
+		})
+	})
+
+	Describe("DIDDoc: Keeping VM with controller different then subject untouched during update", func() {
+		var alice CreatedDidInfo
+		var bob CreatedDidInfo
+		var msg *types.MsgUpdateDidPayload
+
+		BeforeEach(func() {
+			bob = setup.CreateSimpleDid()
+			alice = setup.CreateDidWithExternalConterllers([]string{bob.Did}, []SignInput{bob.SignInput})
+
+			msg = &types.MsgUpdateDidPayload{
+				Id:         alice.Did,
+				Controller: []string{bob.Did},
+				VerificationMethod: []*types.VerificationMethod{
+					{
+						Id:                 alice.KeyId,
+						Type:               types.Ed25519VerificationKey2020,
+						Controller:         alice.Did,
+						PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+					},
+				},
+				Authentication:  []string{alice.KeyId},
+				AssertionMethod: []string{alice.KeyId}, // Adding new VM
+				VersionId:       alice.VersionId,
+			}
+		})
+
+		It("Doesn't require VM's controler signature", func() {
+			signatures := []SignInput{
+				bob.SignInput,
+			}
+
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err).To(BeNil())
+
+			// check
+			created, err := setup.QueryDid(alice.Did)
+			Expect(err).To(BeNil())
+			Expect(*created).ToNot(Equal(msg.ToDid()))
+		})
+	})
+
+	Describe("Verification method: key udpate", func() {
 		var did CreatedDidInfo
 		var newKeyPair KeyPair
 		var msg *types.MsgUpdateDidPayload
@@ -74,678 +277,253 @@ var _ = Describe("DID Doc update", func() {
 		})
 	})
 
-	It("Not Valid: Did doc update does not work without DID doc controllers signature", func() {
-		// Setup
-		alice := setup.CreateSimpleDid()
-		bob := setup.CreateDidWithExternalConterllers([]string{alice.Did}, []SignInput{alice.SignInput})
+	Describe("Verification method: controller update", func() {
+		var alice CreatedDidInfo
+		var bob CreatedDidInfo
+		var msg *types.MsgUpdateDidPayload
 
-		// Update did
-		msg := &types.MsgUpdateDidPayload{
-			Id:         bob.Did,
-			Controller: []string{alice.Did},
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:                 bob.KeyId,
-					Type:               types.Ed25519VerificationKey2020,
-					Controller:         bob.Did,
-					PublicKeyMultibase: MustEncodeBase58(bob.KeyPair.Public),
+		BeforeEach(func() {
+			alice = setup.CreateSimpleDid()
+			bob = setup.CreateSimpleDid()
+
+			msg = &types.MsgUpdateDidPayload{
+				Id: alice.Did,
+				VerificationMethod: []*types.VerificationMethod{
+					{
+						Id:                 alice.KeyId,
+						Type:               types.Ed25519VerificationKey2020,
+						Controller:         bob.Did,
+						PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+					},
 				},
-			},
-			Authentication:  []string{bob.KeyId},
-			AssertionMethod: []string{bob.KeyId},
-			VersionId:       bob.VersionId,
-		}
+				Authentication: []string{alice.KeyId},
+				VersionId:      alice.VersionId,
+			}
+		})
 
-		signatures := []SignInput{}
+		It("Works with old and new controller signature", func() {
+			signatures := []SignInput{alice.SignInput, bob.SignInput}
 
-		_, err := setup.UpdateDid(msg, signatures)
-		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", alice.Did)))
-	})
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err).To(BeNil())
 
-	It("Valid: Did doc update does not works with DID doc controllers signature", func() {
-		// Setup
-		alice := setup.CreateSimpleDid()
-		bob := setup.CreateDidWithExternalConterllers([]string{alice.Did}, []SignInput{alice.SignInput})
+			// check
+			updated, err := setup.QueryDid(alice.Did)
+			Expect(err).To(BeNil())
+			Expect(*updated.Did).To(Equal(msg.ToDid()))
+		})
 
-		// Update did
-		msg := &types.MsgUpdateDidPayload{
-			Id:         bob.Did,
-			Controller: []string{alice.Did},
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:                 bob.KeyId,
-					Type:               types.Ed25519VerificationKey2020,
-					Controller:         bob.Did,
-					PublicKeyMultibase: MustEncodeBase58(bob.KeyPair.Public),
-				},
-			},
-			Authentication:  []string{bob.KeyId},
-			AssertionMethod: []string{bob.KeyId},
-			VersionId:       bob.VersionId,
-		}
+		It("Doesn't work without old controller signature", func() {
+			signatures := []SignInput{bob.SignInput}
 
-		signatures := []SignInput{alice.SignInput}
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", alice.Did)))
+		})
 
-		_, err := setup.UpdateDid(msg, signatures)
-		Expect(err).To(BeNil())
+		It("Doesn't work without new controller signature", func() {
+			signatures := []SignInput{alice.SignInput}
 
-		// check
-		created, err := setup.QueryDid(bob.Did)
-		Expect(err).To(BeNil())
-		Expect(msg.ToDid()).To(Equal(*created.Did))
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", bob.Did)))
+		})
 	})
 
-	// Verification method's tests
-	// cases:
-	// - replacing VM controller works
-	// - replacing VM controller does not work without new signature
-	// - replacing VM controller does not work without old signature
-	// - replacing VM doesn't work without new signature
-	// - replacing VM doesn't work without old signature
-	// - replacing VM works with all signatures
-	// --- adding new VM works
-	// --- adding new VM without new signature
-	// --- adding new VM without old signature
-
-	It("Valid: Replacing VM controller works with two signatures", func() {
-		// Setup
-		alice := setup.CreateSimpleDid()
-		bob := setup.CreateSimpleDid()
-
-		// Update did
-		msg := &types.MsgUpdateDidPayload{
-			Id: alice.Did,
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:                 alice.KeyId,
-					Type:               types.Ed25519VerificationKey2020,
-					Controller:         bob.Did,
-					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
-				},
-			},
-			Authentication: []string{alice.KeyId},
-			VersionId:      alice.VersionId,
-		}
+	Describe("Verification method: id update", func() {
+		var alice CreatedDidInfo
+		var newKeyId string
+		var msg *types.MsgUpdateDidPayload
 
-		signatures := []SignInput{alice.SignInput, bob.SignInput}
+		BeforeEach(func() {
+			alice = setup.CreateSimpleDid()
+			newKeyId = alice.Did + "#key-2"
 
-		_, err := setup.UpdateDid(msg, signatures)
-		Expect(err).To(BeNil())
+			msg = &types.MsgUpdateDidPayload{
+				Id: alice.Did,
+				VerificationMethod: []*types.VerificationMethod{
+					{
+						Id:                 newKeyId,
+						Type:               types.Ed25519VerificationKey2020,
+						Controller:         alice.Did,
+						PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+					},
+				},
+				Authentication: []string{alice.KeyId},
+				VersionId:      alice.VersionId,
+			}
+		})
 
-		// check
-		updated, err := setup.QueryDid(alice.Did)
-		Expect(err).To(BeNil())
-		Expect(*updated.Did).To(Equal(msg.ToDid()))
-	})
+		It("Doesn't work without new VM signature", func() {
+			signatures := []SignInput{alice.SignInput}
 
-	It("Not Valid: Replacing VM controller does not work without new signature", func() {
-		// Setup
-		alice := setup.CreateSimpleDid()
-		bob := setup.CreateSimpleDid()
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one valid signature by %s (new version): invalid signature detected", alice.Did)))
+		})
 
-		// Update did
-		msg := &types.MsgUpdateDidPayload{
-			Id: alice.Did,
-			VerificationMethod: []*types.VerificationMethod{
+		It("Doesn't work without old VM signature", func() {
+			signatures := []SignInput{
 				{
-					Id:                 alice.KeyId,
-					Type:               types.Ed25519VerificationKey2020,
-					Controller:         bob.Did, // Previously alice
-					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+					VerificationMethodId: newKeyId,
+					Key:                  alice.KeyPair.Private,
 				},
-			},
-			Authentication: []string{alice.KeyId},
-			VersionId:      alice.VersionId,
-		}
-
-		signatures := []SignInput{alice.SignInput}
-
-		_, err := setup.UpdateDid(msg, signatures)
-		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", bob.Did)))
-	})
+			}
 
-	It("Not Valid: Replacing VM controller does not work without old signature", func() {
-		// Setup
-		alice := setup.CreateSimpleDid()
-		bob := setup.CreateSimpleDid()
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", alice.Did)))
+		})
 
-		// Update did
-		msg := &types.MsgUpdateDidPayload{
-			Id: alice.Did,
-			VerificationMethod: []*types.VerificationMethod{
+		It("Works with new and old VM signature", func() {
+			signatures := []SignInput{
 				{
-					Id:                 alice.KeyId,
-					Type:               types.Ed25519VerificationKey2020,
-					Controller:         bob.Did,
-					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+					VerificationMethodId: newKeyId,
+					Key:                  alice.KeyPair.Private,
 				},
-			},
-			Authentication: []string{alice.KeyId},
-			VersionId:      alice.VersionId,
-		}
+				alice.SignInput,
+			}
 
-		signatures := []SignInput{bob.SignInput}
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err).To(BeNil())
 
-		_, err := setup.UpdateDid(msg, signatures)
-		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", alice.Did)))
+			// check
+			updated, err := setup.QueryDid(alice.Did)
+			Expect(err).To(BeNil())
+			Expect(*updated.Did).To(Equal(msg.ToDid()))
+		})
 	})
 
-	It("Not Valid: Replacing VM does not work without new signature", func() {
-		// Setup
-		alice := setup.CreateSimpleDid()
+	Describe("Verification method: adding a new one", func() {
+		var alice CreatedDidInfo
+		var newKeyId string
+		var newKey KeyPair
+		var msg *types.MsgUpdateDidPayload
 
-		// Update did
-		newKeyId := alice.Did + "#key-2"
+		BeforeEach(func() {
+			alice = setup.CreateSimpleDid()
 
-		msg := &types.MsgUpdateDidPayload{
-			Id: alice.Did,
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:                 newKeyId,
-					Type:               types.Ed25519VerificationKey2020,
-					Controller:         alice.Did,
-					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
-				},
-			},
-			Authentication: []string{alice.KeyId},
-			VersionId:      alice.VersionId,
-		}
+			newKeyId = alice.Did + "#key-2"
+			newKey = GenerateKeyPair()
 
-		signatures := []SignInput{alice.SignInput}
+			msg = &types.MsgUpdateDidPayload{
+				Id: alice.Did,
+				VerificationMethod: []*types.VerificationMethod{
+					{
+						Id:                 alice.KeyId,
+						Type:               types.Ed25519VerificationKey2020,
+						Controller:         alice.Did,
+						PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+					},
+					{
+						Id:                 newKeyId,
+						Type:               types.Ed25519VerificationKey2020,
+						Controller:         alice.Did,
+						PublicKeyMultibase: MustEncodeBase58(newKey.Public),
+					},
+				},
+				Authentication: []string{alice.KeyId},
+				VersionId:      alice.VersionId,
+			}
+		})
 
-		_, err := setup.UpdateDid(msg, signatures)
-		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one valid signature by %s (new version): invalid signature detected", alice.Did)))
-	})
+		It("Works with only old VM signature", func() {
+			signatures := []SignInput{
+				alice.SignInput,
+			}
 
-	It("Not Valid: Replacing VM does not work without old signature", func() {
-		// Setup
-		alice := setup.CreateSimpleDid()
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err).To(BeNil())
 
-		// Update did
-		newKeyId := alice.Did + "#key-2"
+			// check
+			created, err := setup.QueryDid(alice.Did)
+			Expect(err).To(BeNil())
+			Expect(*created).ToNot(Equal(msg.ToDid()))
+		})
 
-		msg := &types.MsgUpdateDidPayload{
-			Id: alice.Did,
-			VerificationMethod: []*types.VerificationMethod{
+		It("Doesn't work with only new VM signature", func() {
+			signatures := []SignInput{
 				{
-					Id:                 newKeyId,
-					Type:               types.Ed25519VerificationKey2020,
-					Controller:         alice.Did,
-					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+					VerificationMethodId: newKeyId,
+					Key:                  newKey.Private,
 				},
-			},
-			Authentication: []string{alice.KeyId},
-			VersionId:      alice.VersionId,
-		}
-
-		signatures := []SignInput{
-			{
-				VerificationMethodId: newKeyId,
-				Key:                  alice.KeyPair.Private,
-			},
-		}
-
-		_, err := setup.UpdateDid(msg, signatures)
-		Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", alice.Did)))
+			}
+
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", alice.Did)))
+		})
 	})
 
-	It("Not Valid: Replacing VM works with all signatures", func() {
-		// Setup
-		alice := setup.CreateSimpleDid()
+	Describe("Verification method: removing existing one", func() {
+		var alice CreatedDidInfo
+		var secondKeyId string
+		var secondKey KeyPair
+		var secondSignInput SignInput
+		var msg *types.MsgUpdateDidPayload
 
-		// Update did
-		newKeyId := alice.Did + "#key-2"
+		BeforeEach(func() {
+			alice = setup.CreateSimpleDid()
 
-		msg := &types.MsgUpdateDidPayload{
-			Id: alice.Did,
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:                 newKeyId,
-					Type:               types.Ed25519VerificationKey2020,
-					Controller:         alice.Did,
-					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+			secondKeyId = alice.Did + "#key-2"
+			secondKey = GenerateKeyPair()
+			secondSignInput = SignInput{
+				VerificationMethodId: secondKeyId,
+				Key:                  secondKey.Private,
+			}
+
+			addSecondKeyMsg := &types.MsgUpdateDidPayload{
+				Id: alice.Did,
+				VerificationMethod: []*types.VerificationMethod{
+					{
+						Id:                 alice.KeyId,
+						Type:               types.Ed25519VerificationKey2020,
+						Controller:         alice.Did,
+						PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+					},
+					{
+						Id:                 secondKeyId,
+						Type:               types.Ed25519VerificationKey2020,
+						Controller:         alice.Did,
+						PublicKeyMultibase: MustEncodeBase58(secondKey.Public),
+					},
 				},
-			},
-			Authentication: []string{alice.KeyId},
-			VersionId:      alice.VersionId,
-		}
-
-		signatures := []SignInput{
-			alice.SignInput,
-			{
-				VerificationMethodId: newKeyId,
-				Key:                  alice.KeyPair.Private,
-			},
-		}
-
-		_, err := setup.UpdateDid(msg, signatures)
-		Expect(err).To(BeNil())
-
-		// check
-		created, err := setup.QueryDid(alice.Did)
-		Expect(err).To(BeNil())
-		Expect(*created).ToNot(Equal(msg.ToDid()))
-	})
+				Authentication: []string{alice.KeyId},
+				VersionId:      alice.VersionId,
+			}
 
-	// // Adding VM
+			_, err := setup.UpdateDid(addSecondKeyMsg, []SignInput{alice.SignInput})
+			Expect(err).To(BeNil())
 
-	It("Valid: Adding another verification method", func() {
-		// Setup
-		alice := setup.CreateSimpleDid()
+			msg = &types.MsgUpdateDidPayload{
+				Id: alice.Did,
+				VerificationMethod: []*types.VerificationMethod{
+					{
+						Id:                 alice.KeyId,
+						Type:               types.Ed25519VerificationKey2020,
+						Controller:         alice.Did,
+						PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
+					},
+				},
+				Authentication: []string{alice.KeyId},
+				VersionId:      alice.VersionId,
+			}
+		})
 
-		// Update did
-		newKeyId := alice.Did + "#key-2"
-		newKey := GenerateKeyPair()
+		It("Works with only first VM signature", func() {
+			signatures := []SignInput{
+				alice.SignInput,
+			}
 
-		msg := &types.MsgUpdateDidPayload{
-			Id: alice.Did,
-			VerificationMethod: []*types.VerificationMethod{
-				{
-					Id:                 alice.KeyId,
-					Type:               types.Ed25519VerificationKey2020,
-					Controller:         alice.Did,
-					PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
-				},
-				{
-					Id:                 newKeyId,
-					Type:               types.Ed25519VerificationKey2020,
-					Controller:         alice.Did,
-					PublicKeyMultibase: MustEncodeBase58(newKey.Public),
-				},
-			},
-			Authentication: []string{alice.KeyId},
-			VersionId:      alice.VersionId,
-		}
-
-		signatures := []SignInput{
-			alice.SignInput,
-			{
-				VerificationMethodId: newKeyId,
-				Key:                  newKey.Private,
-			},
-		}
-
-		_, err := setup.UpdateDid(msg, signatures)
-		Expect(err).To(BeNil())
-
-		// check
-		created, err := setup.QueryDid(alice.Did)
-		Expect(err).To(BeNil())
-		Expect(*created).ToNot(Equal(msg.ToDid()))
-	})
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err).To(BeNil())
 
-	// It("Not Valid: Adding another verification method without new sign", func() {
-	// 	// Setup
-	// 	alice := setup.CreateSimpleDid()
-
-	// 	// Update did
-	// 	newKeyId := alice.Did + "#key-2"
-	// 	newKey := GenerateKeyPair()
-
-	// 	msg := &types.MsgUpdateDidPayload{
-	// 		Id: alice.Did,
-	// 		VerificationMethod: []*types.VerificationMethod{
-	// 			{
-	// 				Id:                 alice.KeyId,
-	// 				Type:               types.Ed25519VerificationKey2020,
-	// 				Controller:         alice.Did,
-	// 				PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
-	// 			},
-	// 			{
-	// 				Id:                 newKeyId,
-	// 				Type:               types.Ed25519VerificationKey2020,
-	// 				Controller:         alice.Did,
-	// 				PublicKeyMultibase: MustEncodeBase58(newKey.Public),
-	// 			},
-	// 		},
-	// 		Authentication: []string{alice.KeyId},
-	// 		VersionId:      alice.VersionId,
-	// 	}
-
-	// 	signatures := []SignInput{
-	// 		alice.SignInput,
-	// 	}
-
-	// 	_, err := setup.UpdateDid(msg, signatures)
-	// 	Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)))
-	// })
-
-	// It("Not Valid: Adding another verification method without old sign", func() {
-	// 	// Setup
-	// 	alice := setup.CreateSimpleDid()
-
-	// 	// Update did
-	// 	newKeyId := alice.Did + "#key-2"
-	// 	newKey := GenerateKeyPair()
-
-	// 	msg := &types.MsgUpdateDidPayload{
-	// 		Id: alice.Did,
-	// 		VerificationMethod: []*types.VerificationMethod{
-	// 			{
-	// 				Id:                 alice.KeyId,
-	// 				Type:               types.Ed25519VerificationKey2020,
-	// 				Controller:         alice.Did,
-	// 				PublicKeyMultibase: MustEncodeBase58(alice.KeyPair.Public),
-	// 			},
-	// 			{
-	// 				Id:                 newKeyId,
-	// 				Type:               types.Ed25519VerificationKey2020,
-	// 				Controller:         alice.Did,
-	// 				PublicKeyMultibase: MustEncodeBase58(newKey.Public),
-	// 			},
-	// 		},
-	// 		Authentication: []string{alice.KeyId},
-	// 		VersionId:      alice.VersionId,
-	// 	}
-
-	// 	signatures := []SignInput{
-	// 		{
-	// 			VerificationMethodId: newKeyId,
-	// 			Key:                  newKey.Private,
-	// 		},
-	// 	}
-
-	// 	_, err := setup.UpdateDid(msg, signatures)
-	// 	Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one valid signature by %s (old version): invalid signature detected", AliceDID)))
-	// })
-
-	// // Controller's tests
-	// // cases:
-	// // - replacing Controller works with all signatures
-	// // - replacing Controller doesn't work without old signature
-	// // - replacing Controller doesn't work without new signature
-	// // --- adding Controller works with all signatures
-	// // --- adding Controller doesn't work without old signature
-	// // --- adding Controller doesn't work without new signature
-
-	// It("Valid: Replace controller works with all signatures", func() {
-	// 	valid = true
-	// 	signers = []string{BobKey1, AliceKey1}
-	// 	msg = &types.MsgUpdateDidPayload{
-	// 		Id:         AliceDID,
-	// 		Controller: []string{BobDID},
-	// 		VerificationMethod: []*types.VerificationMethod{
-	// 			{
-	// 				Id:         AliceKey1,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: AliceDID,
-	// 			},
-	// 		},
-	// 	}
-	// })
-
-	// It("Not Valid: Replace controller doesn't work without old signatures", func() {
-	// 	valid = false
-	// 	signers = []string{BobKey1}
-	// 	msg = &types.MsgUpdateDidPayload{
-	// 		Id:         AliceDID,
-	// 		Controller: []string{BobDID},
-	// 		VerificationMethod: []*types.VerificationMethod{
-	// 			{
-	// 				Id:         AliceKey1,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: AliceDID,
-	// 			},
-	// 		},
-	// 	}
-	// 	errMsg = fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)
-	// })
-
-	// It("Not Valid: Replace controller doesn't work without new signatures", func() {
-	// 	valid = false
-	// 	signers = []string{AliceKey1}
-	// 	msg = &types.MsgUpdateDidPayload{
-	// 		Id:         AliceDID,
-	// 		Controller: []string{BobDID},
-	// 		VerificationMethod: []*types.VerificationMethod{
-	// 			{
-	// 				Id:         AliceKey1,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: AliceDID,
-	// 			},
-	// 		},
-	// 	}
-	// 	errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)
-	// })
-
-	// // add controller
-
-	// It("Valid: Adding second controller works", func() {
-	// 	valid = true
-	// 	signers = []string{AliceKey1, CharlieKey3}
-	// 	msg = &types.MsgUpdateDidPayload{
-	// 		Id:         AliceDID,
-	// 		Controller: []string{AliceDID, CharlieDID},
-	// 		VerificationMethod: []*types.VerificationMethod{
-	// 			{
-	// 				Id:         AliceKey1,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: AliceDID,
-	// 			},
-	// 		},
-	// 	}
-	// })
-
-	// It("Not Valid: Adding controller without old signature", func() {
-	// 	valid = false
-	// 	signers = []string{BobKey1}
-	// 	msg = &types.MsgUpdateDidPayload{
-	// 		Id:         AliceDID,
-	// 		Controller: []string{AliceDID, BobDID},
-	// 		VerificationMethod: []*types.VerificationMethod{
-	// 			{
-	// 				Id:         AliceKey1,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: AliceDID,
-	// 			},
-	// 		},
-	// 	}
-	// 	errMsg = fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)
-	// })
-
-	// It("Not Valid: Add controller without new signature doesn't work", func() {
-	// 	valid = false
-	// 	signers = []string{AliceKey1}
-	// 	msg = &types.MsgUpdateDidPayload{
-	// 		Id:         AliceDID,
-	// 		Controller: []string{AliceDID, BobDID},
-	// 		VerificationMethod: []*types.VerificationMethod{
-	// 			{
-	// 				Id:         AliceKey1,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: AliceDID,
-	// 			},
-	// 		},
-	// 	}
-	// 	errMsg = fmt.Sprintf("there should be at least one signature by %s: signature is required but not found", BobDID)
-	// })
-
-	// It("Valid: Adding verification method with the same controller works", func() {
-	// 	valid = true
-	// 	signers = []string{AliceKey1, AliceKey2}
-	// 	msg = &types.MsgUpdateDidPayload{
-	// 		Id:         AliceDID,
-	// 		Controller: []string{AliceDID},
-	// 		VerificationMethod: []*types.VerificationMethod{
-	// 			{
-	// 				Id:         AliceKey2,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: AliceDID,
-	// 			},
-	// 			{
-	// 				Id:         AliceKey1,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: AliceDID,
-	// 			},
-	// 		},
-	// 	}
-	// })
-
-	// It("Valid: Keeping VM with controller different then subject untouched during update should not require Bob signature", func() {
-	// 	valid = true
-	// 	signers = []string{CharlieKey1}
-	// 	msg = &types.MsgUpdateDidPayload{
-	// 		Id: CharlieDID,
-	// 		Authentication: []string{
-	// 			CharlieKey1,
-	// 			CharlieKey2,
-	// 			CharlieKey3,
-	// 		},
-
-	// 		VerificationMethod: []*types.VerificationMethod{
-	// 			{
-	// 				Id:         CharlieKey1,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: BobDID,
-	// 			},
-	// 			{
-	// 				Id:         CharlieKey2,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: BobDID,
-	// 			},
-	// 			{
-	// 				Id:         CharlieKey3,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: BobDID,
-	// 			},
-	// 			{
-	// 				Id:         CharlieKey4,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: CharlieDID,
-	// 			},
-	// 		},
-	// 	}
-	// })
-
-	// It("Valid: Removing verification method is possible with any kind of valid Bob's key", func() {
-	// 	valid = true
-	// 	signers = []string{BobKey1}
-	// 	msg = &types.MsgUpdateDidPayload{
-	// 		Id: BobDID,
-	// 		VerificationMethod: []*types.VerificationMethod{
-	// 			{
-	// 				Id:         BobKey1,
-	// 				Type:       types.Ed25519VerificationKey2020,
-	// 				Controller: BobDID,
-	// 			},
-	// 		},
-	// 	}
-	// 	errMsg = fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", BobDID)
-	// })
-})
+			// check
+			created, err := setup.QueryDid(alice.Did)
+			Expect(err).To(BeNil())
+			Expect(*created).ToNot(Equal(msg.ToDid()))
+		})
 
-// var _ = Describe("Signature Verification while updating DID", func() {
-// 	var setup TestSetup
-// 	var aliceKeys, bobKeys map[string]ed25519.PrivateKey
-// 	var aliceDid *types.MsgCreateDidPayload
-// 	BeforeEach(func() {
-// 		setup = Setup()
-// 		aliceKeys, aliceDid, _ = setup.InitDid(AliceDID)
-// 		bobKeys, _, _ = setup.InitDid(BobDID)
-// 	})
-
-// 	It("should have changed DIDDoc controller", func() {
-// 		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-// 		updatedDidDoc.Controller = append(updatedDidDoc.Controller, BobDID)
-// 		receivedDid, _ := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(ConcatKeys(aliceKeys, bobKeys)))
-
-// 		Expect(aliceDid.Controller).To(Not(Equal(receivedDid.Controller)))
-// 		Expect([]string{AliceDID, BobDID}).To(Not(Equal(receivedDid.Controller)))
-// 		Expect([]string{BobDID}, receivedDid.Controller)
-// 	})
-
-// 	When("Old signature in verification method is absent", func() {
-// 		It("should fail", func() {
-// 			updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-// 			updatedDidDoc.VerificationMethod[0].Type = types.Ed25519VerificationKey2020
-// 			_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
-
-// 			// check
-// 			Expect(err).To(Not(BeNil()))
-// 			Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
-// 		})
-// 	})
-
-// 	It("should fails cause we need old signature for changing verification method controller", func() {
-// 		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-// 		updatedDidDoc.VerificationMethod[0].Controller = BobDID
-// 		_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
-
-// 		// check
-// 		Expect(err).To(Not(BeNil()))
-// 		Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
-// 	})
-
-// 	It("should fails cause we need old signature for changing DIDDoc controller", func() {
-// 		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-// 		updatedDidDoc.Controller = append(updatedDidDoc.Controller, BobDID)
-// 		_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
-
-// 		// check
-// 		Expect(err).To(Not(BeNil()))
-// 		Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
-// 	})
-// })
-
-// var _ = Describe("Signature Verification. Remove signature/VM", func() {
-// 	var setup TestSetup
-// 	var ApubKey, BpubKey ed25519.PublicKey
-// 	var AprivKey, BprivKey ed25519.PrivateKey
-// 	var aliceDid, bobDid *types.MsgCreateDidPayload
-// 	var aliceKeys, bobKeys map[string]ed25519.PrivateKey
-
-// 	BeforeEach(func() {
-// 		setup = Setup()
-// 		// Generate keys
-// 		ApubKey, AprivKey, _ = ed25519.GenerateKey(rand.Reader)
-// 		BpubKey, BprivKey, _ = ed25519.GenerateKey(rand.Reader)
-
-// 		// Create dids
-// 		aliceDid = setup.BuildSimpleCreateDidPayload(AliceDID, AliceKey1, ApubKey)
-// 		bobDid = setup.BuildSimpleCreateDidPayload(BobDID, BobKey1, BpubKey)
-
-// 		// Collect private keys
-// 		aliceKeys = map[string]ed25519.PrivateKey{AliceKey1: AprivKey, BobKey1: BprivKey}
-// 		bobKeys = map[string]ed25519.PrivateKey{BobKey1: BprivKey}
-
-// 		// Add verification method
-// 		aliceDid.VerificationMethod = append(aliceDid.VerificationMethod, &types.VerificationMethod{
-// 			Id:                 AliceKey2,
-// 			Controller:         BobDID,
-// 			Type:               types.Ed25519VerificationKey2020,
-// 			PublicKeyMultibase: MustEncodeBase58(BpubKey),
-// 		})
-// 	})
-
-// 	It("should fails cause old signature is required for removing this signature", func() {
-// 		// Send dids
-// 		_, _ = setup.SendCreateDid(bobDid, bobKeys)
-// 		_, _ = setup.SendCreateDid(aliceDid, aliceKeys)
-
-// 		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-// 		updatedDidDoc.VerificationMethod = []*types.VerificationMethod{aliceDid.VerificationMethod[0]}
-// 		updatedDidDoc.Authentication = []string{aliceDid.Authentication[0]}
-// 		_, err := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(bobKeys))
-
-// 		// check
-// 		Expect(err).To(Not(BeNil()))
-// 		Expect(err.Error()).To(Equal(fmt.Sprintf("there should be at least one signature by %s (old version): signature is required but not found", AliceDID)))
-// 	})
-
-// 	It("should not fails while removing the whole verification method", func() {
-// 		aliceDid.Authentication = append(aliceDid.Authentication, AliceKey2)
-
-// 		// Send dids
-// 		_, _ = setup.SendCreateDid(bobDid, bobKeys)
-// 		_, _ = setup.SendCreateDid(aliceDid, aliceKeys)
-
-// 		updatedDidDoc := setup.CreateToUpdateDid(aliceDid)
-// 		updatedDidDoc.Authentication = []string{aliceDid.Authentication[0]}
-// 		updatedDidDoc.VerificationMethod = []*types.VerificationMethod{aliceDid.VerificationMethod[0]}
-// 		receivedDid, _ := setup.SendUpdateDid(updatedDidDoc, MapToListOfSignerKeys(ConcatKeys(aliceKeys, bobKeys)))
-
-// 		// check
-// 		Expect(len(aliceDid.VerificationMethod)).To(Not(Equal(len(receivedDid.VerificationMethod))))
-// 		Expect(reflect.DeepEqual(aliceDid.VerificationMethod[0], receivedDid.VerificationMethod[0])).To(BeTrue())
-// 	})
-// })
+		It("Doesn't work with only second VM signature (which is get deleted)", func() {
+			signatures := []SignInput{secondSignInput}
+
+			_, err := setup.UpdateDid(msg, signatures)
+			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("there should be at least one valid signature by %s (new version): invalid signature detected", alice.Did)))
+		})
+	})
+})

From ade7e7ded9333524cdb675eaca9d9cc6b37b60d5 Mon Sep 17 00:00:00 2001
From: Alexandr Kolesov <kolesov.alex.s@gmail.com>
Date: Fri, 14 Oct 2022 18:02:25 +0500
Subject: [PATCH 35/76] Reorganising tests

---
 x/cheqd/tests/create_did_test.go              |   5 +-
 x/cheqd/tests/setup.go                        | 298 ------------------
 x/cheqd/tests/{ => setup}/config.go           |   2 +-
 x/cheqd/tests/setup/setup.go                  |  76 +++++
 x/cheqd/tests/{ => setup}/setup_create_did.go |   2 +-
 x/cheqd/tests/{ => setup}/setup_query_did.go  |   2 +-
 x/cheqd/tests/{ => setup}/setup_update_did.go |   2 +-
 x/cheqd/tests/{ => setup}/types.go            |   2 +-
 x/cheqd/tests/{ => setup}/utils.go            |  24 +-
 x/cheqd/tests/test_data.go                    |  22 --
 x/cheqd/tests/update_did_test.go              |   2 +
 x/resource/tests/setup_create_resource.go     |   0
 x/resource/tests/setup_query_resource         |   0
 13 files changed, 88 insertions(+), 349 deletions(-)
 delete mode 100644 x/cheqd/tests/setup.go
 rename x/cheqd/tests/{ => setup}/config.go (68%)
 create mode 100644 x/cheqd/tests/setup/setup.go
 rename x/cheqd/tests/{ => setup}/setup_create_did.go (99%)
 rename x/cheqd/tests/{ => setup}/setup_query_did.go (94%)
 rename x/cheqd/tests/{ => setup}/setup_update_did.go (98%)
 rename x/cheqd/tests/{ => setup}/types.go (96%)
 rename x/cheqd/tests/{ => setup}/utils.go (65%)
 delete mode 100644 x/cheqd/tests/test_data.go
 create mode 100644 x/resource/tests/setup_create_resource.go
 create mode 100644 x/resource/tests/setup_query_resource

diff --git a/x/cheqd/tests/create_did_test.go b/x/cheqd/tests/create_did_test.go
index a83204ea6..864faef02 100644
--- a/x/cheqd/tests/create_did_test.go
+++ b/x/cheqd/tests/create_did_test.go
@@ -3,14 +3,17 @@ package tests
 import (
 	"fmt"
 
+	. "github.com/cheqd/cheqd-node/x/cheqd/tests/setup"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
+	"github.com/cheqd/cheqd-node/x/cheqd/tests/setup"
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
 )
 
 var _ = Describe("Create DID tests", func() {
-	var setup TestSetup
+	var setup setup.TestSetup
 
 	BeforeEach(func() {
 		setup = Setup()
diff --git a/x/cheqd/tests/setup.go b/x/cheqd/tests/setup.go
deleted file mode 100644
index d7881e7b0..000000000
--- a/x/cheqd/tests/setup.go
+++ /dev/null
@@ -1,298 +0,0 @@
-package tests
-
-import (
-	"context"
-	"crypto/ed25519"
-	"crypto/rand"
-	"encoding/base64"
-	"time"
-
-	"github.com/cheqd/cheqd-node/x/cheqd/types"
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-	"github.com/multiformats/go-multibase"
-
-	"github.com/cosmos/cosmos-sdk/codec"
-	"github.com/cosmos/cosmos-sdk/store"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	dbm "github.com/tendermint/tm-db"
-
-	"github.com/cheqd/cheqd-node/x/cheqd/keeper"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-type TestSetup struct {
-	Cdc codec.Codec
-
-	SdkCtx sdk.Context
-	StdCtx context.Context
-
-	Keeper      keeper.Keeper
-	MsgServer   types.MsgServer
-	QueryServer types.QueryServer
-}
-
-func Setup() TestSetup {
-	// Init Codec
-	ir := codectypes.NewInterfaceRegistry()
-	types.RegisterInterfaces(ir)
-	cdc := codec.NewProtoCodec(ir)
-
-	// Init KVSore
-	db := dbm.NewMemDB()
-
-	dbStore := store.NewCommitMultiStore(db)
-	storeKey := sdk.NewKVStoreKey(types.StoreKey)
-	dbStore.MountStoreWithDB(storeKey, sdk.StoreTypeIAVL, nil)
-
-	_ = dbStore.LoadLatestVersion()
-
-	// Init Keepers
-	newKeeper := keeper.NewKeeper(cdc, storeKey)
-
-	// Create Tx
-	txBytes := make([]byte, 28)
-	_, _ = rand.Read(txBytes)
-
-	// Create context
-	blockTime, _ := time.Parse(time.RFC3339, "2021-01-01T00:00:00.000Z")
-	ctx := sdk.NewContext(dbStore,
-		tmproto.Header{ChainID: "test", Time: blockTime},
-		false, log.NewNopLogger()).WithTxBytes(txBytes)
-
-	msgServer := keeper.NewMsgServer(*newKeeper)
-	queryServer := keeper.NewQueryServer(*newKeeper)
-
-	setup := TestSetup{
-		Cdc: cdc,
-
-		SdkCtx: ctx,
-		StdCtx: sdk.WrapSDKContext(ctx),
-
-		Keeper:      *newKeeper,
-		MsgServer:   msgServer,
-		QueryServer: queryServer,
-	}
-
-	setup.Keeper.SetDidNamespace(&ctx, DID_NAMESPACE)
-	return setup
-}
-
-func (s *TestSetup) CreateToUpdateDid(did *types.MsgCreateDidPayload) *types.MsgUpdateDidPayload {
-	return &types.MsgUpdateDidPayload{
-		Id:                   did.Id,
-		Controller:           did.Controller,
-		VerificationMethod:   did.VerificationMethod,
-		Authentication:       did.Authentication,
-		AssertionMethod:      did.AssertionMethod,
-		CapabilityInvocation: did.CapabilityInvocation,
-		CapabilityDelegation: did.CapabilityDelegation,
-		KeyAgreement:         did.KeyAgreement,
-		AlsoKnownAs:          did.AlsoKnownAs,
-		Service:              did.Service,
-		Context:              did.Context,
-	}
-}
-
-// TODO: Remove
-func (s *TestSetup) WrapCreateRequest(payload *types.MsgCreateDidPayload, keys map[string]ed25519.PrivateKey) *types.MsgCreateDid {
-	var signatures []*types.SignInfo
-	signingInput := payload.GetSignBytes()
-
-	for privKeyId, privKey := range keys {
-		signature := base64.StdEncoding.EncodeToString(ed25519.Sign(privKey, signingInput))
-		signatures = append(signatures, &types.SignInfo{
-			VerificationMethodId: privKeyId,
-			Signature:            signature,
-		})
-	}
-
-	return &types.MsgCreateDid{
-		Payload:    payload,
-		Signatures: signatures,
-	}
-}
-
-func (s *TestSetup) WrapUpdateRequest(payload *types.MsgUpdateDidPayload, keys []SignInput) *types.MsgUpdateDid {
-	var signatures []*types.SignInfo
-	signingInput := payload.GetSignBytes()
-
-	for _, skey := range keys {
-		signature := base64.StdEncoding.EncodeToString(ed25519.Sign(skey.Key, signingInput))
-		signatures = append(signatures, &types.SignInfo{
-			VerificationMethodId: skey.VerificationMethodId,
-			Signature:            signature,
-		})
-	}
-
-	return &types.MsgUpdateDid{
-		Payload:    payload,
-		Signatures: signatures,
-	}
-}
-
-func (s *TestSetup) SendUpdateDid(msg *types.MsgUpdateDidPayload, keys []SignInput) (*types.Did, error) {
-	req := types.QueryGetDidRequest{
-		Id: msg.Id,
-	}
-
-	state, _ := s.QueryServer.Did(s.StdCtx, &req)
-	if len(msg.VersionId) == 0 {
-		msg.VersionId = state.Metadata.VersionId
-	}
-
-	_, err := s.MsgServer.UpdateDid(s.StdCtx, s.WrapUpdateRequest(msg, keys))
-	if err != nil {
-		return nil, err
-	}
-
-	req = types.QueryGetDidRequest{
-		Id: msg.Id,
-	}
-
-	updated, _ := s.QueryServer.Did(s.StdCtx, &req)
-	return updated.Did, nil
-}
-
-func (s *TestSetup) SendCreateDid(msg *types.MsgCreateDidPayload, keys map[string]ed25519.PrivateKey) (*types.Did, error) {
-	_, err := s.MsgServer.CreateDid(s.StdCtx, s.WrapCreateRequest(msg, keys))
-	if err != nil {
-		return nil, err
-	}
-
-	req := types.QueryGetDidRequest{
-		Id: msg.Id,
-	}
-
-	created, _ := s.QueryServer.Did(s.StdCtx, &req)
-	return created.Did, nil
-}
-
-func ConcatKeys(dst map[string]ed25519.PrivateKey, src map[string]ed25519.PrivateKey) map[string]ed25519.PrivateKey {
-	for k, v := range src {
-		dst[k] = v
-	}
-
-	return dst
-}
-
-func MapToListOfSignerKeys(mp map[string]ed25519.PrivateKey) []SignInput {
-	rlist := []SignInput{}
-	for k, v := range mp {
-		rlist = append(rlist, SignInput{
-			VerificationMethodId: k,
-			Key:                  v,
-		})
-	}
-	return rlist
-}
-
-func (s TestSetup) CreateTestDIDs(keys map[string]KeyPair) error {
-	testDIDs := []struct {
-		signers []string
-		msg     *types.MsgCreateDidPayload
-	}{
-		{
-			signers: []string{AliceKey1},
-			msg: &types.MsgCreateDidPayload{
-				Id:             AliceDID,
-				Authentication: []string{AliceKey1},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         AliceKey1,
-						Type:       types.Ed25519VerificationKey2020,
-						Controller: AliceDID,
-					},
-				},
-			},
-		},
-		{
-			signers: []string{BobKey2},
-			msg: &types.MsgCreateDidPayload{
-				Id: BobDID,
-				Authentication: []string{
-					BobKey1,
-					BobKey2,
-					BobKey3,
-				},
-				CapabilityDelegation: []string{
-					BobKey4,
-				},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         BobKey1,
-						Type:       types.Ed25519VerificationKey2020,
-						Controller: BobDID,
-					},
-					{
-						Id:         BobKey2,
-						Type:       types.Ed25519VerificationKey2020,
-						Controller: BobDID,
-					},
-					{
-						Id:         BobKey3,
-						Type:       types.Ed25519VerificationKey2020,
-						Controller: BobDID,
-					},
-					{
-						Id:         BobKey4,
-						Type:       types.Ed25519VerificationKey2020,
-						Controller: BobDID,
-					},
-				},
-			},
-		},
-		{
-			signers: []string{CharlieKey2, BobKey2},
-			msg: &types.MsgCreateDidPayload{
-				Id: CharlieDID,
-				Authentication: []string{
-					CharlieKey1,
-					CharlieKey2,
-					CharlieKey3,
-				},
-				VerificationMethod: []*types.VerificationMethod{
-					{
-						Id:         CharlieKey1,
-						Type:       types.Ed25519VerificationKey2020,
-						Controller: BobDID,
-					},
-					{
-						Id:         CharlieKey2,
-						Type:       types.Ed25519VerificationKey2020,
-						Controller: BobDID,
-					},
-					{
-						Id:         CharlieKey3,
-						Type:       types.Ed25519VerificationKey2020,
-						Controller: BobDID,
-					},
-				},
-			},
-		},
-	}
-
-	for _, prefilled := range testDIDs {
-		msg := prefilled.msg
-
-		for _, vm := range msg.VerificationMethod {
-			encoded, err := multibase.Encode(multibase.Base58BTC, keys[vm.Id].Public)
-			if err != nil {
-				return err
-			}
-			vm.PublicKeyMultibase = encoded
-		}
-
-		signerKeys := map[string]ed25519.PrivateKey{}
-		for _, signer := range prefilled.signers {
-			signerKeys[signer] = keys[signer].Private
-		}
-
-		_, err := s.SendCreateDid(msg, signerKeys)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/x/cheqd/tests/config.go b/x/cheqd/tests/setup/config.go
similarity index 68%
rename from x/cheqd/tests/config.go
rename to x/cheqd/tests/setup/config.go
index 9d067e0c2..1cde54f21 100644
--- a/x/cheqd/tests/config.go
+++ b/x/cheqd/tests/setup/config.go
@@ -1,3 +1,3 @@
-package tests
+package setup
 
 const DID_NAMESPACE = "test"
diff --git a/x/cheqd/tests/setup/setup.go b/x/cheqd/tests/setup/setup.go
new file mode 100644
index 000000000..1f2ad401a
--- /dev/null
+++ b/x/cheqd/tests/setup/setup.go
@@ -0,0 +1,76 @@
+package setup
+
+import (
+	"context"
+	"crypto/rand"
+	"time"
+
+	"github.com/cheqd/cheqd-node/x/cheqd/types"
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
+
+	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/store"
+	"github.com/tendermint/tendermint/libs/log"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	dbm "github.com/tendermint/tm-db"
+
+	"github.com/cheqd/cheqd-node/x/cheqd/keeper"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+)
+
+type TestSetup struct {
+	Cdc codec.Codec
+
+	SdkCtx sdk.Context
+	StdCtx context.Context
+
+	Keeper      keeper.Keeper
+	MsgServer   types.MsgServer
+	QueryServer types.QueryServer
+}
+
+func Setup() TestSetup {
+	// Init Codec
+	ir := codectypes.NewInterfaceRegistry()
+	types.RegisterInterfaces(ir)
+	cdc := codec.NewProtoCodec(ir)
+
+	// Init KVSore
+	db := dbm.NewMemDB()
+
+	dbStore := store.NewCommitMultiStore(db)
+	storeKey := sdk.NewKVStoreKey(types.StoreKey)
+	dbStore.MountStoreWithDB(storeKey, sdk.StoreTypeIAVL, nil)
+
+	_ = dbStore.LoadLatestVersion()
+
+	// Init Keepers
+	newKeeper := keeper.NewKeeper(cdc, storeKey)
+
+	// Create Tx
+	txBytes := make([]byte, 28)
+	_, _ = rand.Read(txBytes)
+
+	// Create context
+	blockTime, _ := time.Parse(time.RFC3339, "2021-01-01T00:00:00.000Z")
+	ctx := sdk.NewContext(dbStore,
+		tmproto.Header{ChainID: "test", Time: blockTime},
+		false, log.NewNopLogger()).WithTxBytes(txBytes)
+
+	msgServer := keeper.NewMsgServer(*newKeeper)
+	queryServer := keeper.NewQueryServer(*newKeeper)
+
+	setup := TestSetup{
+		Cdc: cdc,
+
+		SdkCtx: ctx,
+		StdCtx: sdk.WrapSDKContext(ctx),
+
+		Keeper:      *newKeeper,
+		MsgServer:   msgServer,
+		QueryServer: queryServer,
+	}
+
+	setup.Keeper.SetDidNamespace(&ctx, DID_NAMESPACE)
+	return setup
+}
diff --git a/x/cheqd/tests/setup_create_did.go b/x/cheqd/tests/setup/setup_create_did.go
similarity index 99%
rename from x/cheqd/tests/setup_create_did.go
rename to x/cheqd/tests/setup/setup_create_did.go
index 28fc3d003..bf0a13915 100644
--- a/x/cheqd/tests/setup_create_did.go
+++ b/x/cheqd/tests/setup/setup_create_did.go
@@ -1,4 +1,4 @@
-package tests
+package setup
 
 import (
 	"crypto/ed25519"
diff --git a/x/cheqd/tests/setup_query_did.go b/x/cheqd/tests/setup/setup_query_did.go
similarity index 94%
rename from x/cheqd/tests/setup_query_did.go
rename to x/cheqd/tests/setup/setup_query_did.go
index d1618eb23..b241cf9f1 100644
--- a/x/cheqd/tests/setup_query_did.go
+++ b/x/cheqd/tests/setup/setup_query_did.go
@@ -1,4 +1,4 @@
-package tests
+package setup
 
 import "github.com/cheqd/cheqd-node/x/cheqd/types"
 
diff --git a/x/cheqd/tests/setup_update_did.go b/x/cheqd/tests/setup/setup_update_did.go
similarity index 98%
rename from x/cheqd/tests/setup_update_did.go
rename to x/cheqd/tests/setup/setup_update_did.go
index c703ec859..1bd4068c9 100644
--- a/x/cheqd/tests/setup_update_did.go
+++ b/x/cheqd/tests/setup/setup_update_did.go
@@ -1,4 +1,4 @@
-package tests
+package setup
 
 import (
 	"crypto/ed25519"
diff --git a/x/cheqd/tests/types.go b/x/cheqd/tests/setup/types.go
similarity index 96%
rename from x/cheqd/tests/types.go
rename to x/cheqd/tests/setup/types.go
index 0aa97baee..de7d58e88 100644
--- a/x/cheqd/tests/types.go
+++ b/x/cheqd/tests/setup/types.go
@@ -1,4 +1,4 @@
-package tests
+package setup
 
 import (
 	"crypto/ed25519"
diff --git a/x/cheqd/tests/utils.go b/x/cheqd/tests/setup/utils.go
similarity index 65%
rename from x/cheqd/tests/utils.go
rename to x/cheqd/tests/setup/utils.go
index 9ac2e2848..89b2c26db 100644
--- a/x/cheqd/tests/utils.go
+++ b/x/cheqd/tests/setup/utils.go
@@ -1,4 +1,4 @@
-package tests
+package setup
 
 import (
 	"crypto/ed25519"
@@ -43,28 +43,6 @@ func GenerateDID(idtype IDType) string {
 	}
 }
 
-func GenerateTestKeys() map[string]KeyPair {
-	return map[string]KeyPair{
-		AliceKey1:    GenerateKeyPair(),
-		AliceKey2:    GenerateKeyPair(),
-		BobKey1:      GenerateKeyPair(),
-		BobKey2:      GenerateKeyPair(),
-		BobKey3:      GenerateKeyPair(),
-		BobKey4:      GenerateKeyPair(),
-		CharlieKey1:  GenerateKeyPair(),
-		CharlieKey2:  GenerateKeyPair(),
-		CharlieKey3:  GenerateKeyPair(),
-		ImposterKey1: GenerateKeyPair(),
-	}
-}
-
-func InitEnv(keys map[string]KeyPair) TestSetup {
-	setup := Setup()
-	err := setup.CreateTestDIDs(keys)
-	Expect(err).To(BeNil())
-	return setup
-}
-
 func GenerateKeyPair() KeyPair {
 	PublicKey, PrivateKey, _ := ed25519.GenerateKey(rand.Reader)
 	return KeyPair{PrivateKey, PublicKey}
diff --git a/x/cheqd/tests/test_data.go b/x/cheqd/tests/test_data.go
deleted file mode 100644
index 47d292149..000000000
--- a/x/cheqd/tests/test_data.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package tests
-
-const (
-	AliceDID     = "did:cheqd:test:aaaaaaaaaaaaaaaa"                     // 16 chars base58
-	BobDID       = "did:cheqd:test:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"     // 32 chars base58
-	CharlieDID   = "did:cheqd:test:babbba14-f294-458a-9b9c-474d188680fd" // UUID
-	ImposterDID  = "did:cheqd:test:nananananananana"
-	NotFounDID   = "did:cheqd:test:nfdnfdnfdnfdnfdd"
-	AliceKey1    = AliceDID + "#key-1"
-	AliceKey2    = AliceDID + "#key-2"
-	BobKey1      = BobDID + "#key-1"
-	BobKey2      = BobDID + "#key-2"
-	BobKey3      = BobDID + "#key-3"
-	BobKey4      = BobDID + "#key-4"
-	ImposterKey1 = ImposterDID + "#key-1"
-	ImposterKey2 = ImposterDID + "#key-2"
-	NotFoundKey1 = NotFounDID + "#key-1"
-	CharlieKey1  = CharlieDID + "#key-1"
-	CharlieKey2  = CharlieDID + "#key-2"
-	CharlieKey3  = CharlieDID + "#key-3"
-	CharlieKey4  = CharlieDID + "#key-4"
-)
diff --git a/x/cheqd/tests/update_did_test.go b/x/cheqd/tests/update_did_test.go
index 238fff23d..3bc9db05a 100644
--- a/x/cheqd/tests/update_did_test.go
+++ b/x/cheqd/tests/update_did_test.go
@@ -3,6 +3,8 @@ package tests
 import (
 	"fmt"
 
+	. "github.com/cheqd/cheqd-node/x/cheqd/tests/setup"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
diff --git a/x/resource/tests/setup_create_resource.go b/x/resource/tests/setup_create_resource.go
new file mode 100644
index 000000000..e69de29bb
diff --git a/x/resource/tests/setup_query_resource b/x/resource/tests/setup_query_resource
new file mode 100644
index 000000000..e69de29bb

From 023edf1f2a394285be6b878fd012f78eacc05488 Mon Sep 17 00:00:00 2001
From: Alexandr Kolesov <kolesov.alex.s@gmail.com>
Date: Mon, 17 Oct 2022 12:46:57 +0500
Subject: [PATCH 36/76] The rest of resource tests

---
 x/cheqd/tests/setup/setup_create_did.go       |  14 +-
 x/cheqd/tests/setup/types.go                  |  11 +-
 x/resource/tests/constants.go                 |  38 ----
 x/resource/tests/create_resource_test.go      | 205 ++++++++----------
 .../tests/query_all_resource_versions_test.go | 117 ++++------
 .../tests/query_collection_resources_test.go  |  87 +++-----
 x/resource/tests/query_resource_test.go       | 107 +++------
 x/resource/tests/{ => setup}/setup.go         |  61 +-----
 .../tests/setup/setup_create_resource.go      |  53 +++++
 .../tests/setup/setup_query_all_versions.go   |  12 +
 .../setup/setup_query_collecton_resources.go  |  11 +
 .../tests/setup/setup_query_resource.go       |  12 +
 x/resource/tests/setup/testdata.go            |   8 +
 x/resource/tests/setup_create_resource.go     |   0
 x/resource/tests/setup_query_resource         |   0
 15 files changed, 303 insertions(+), 433 deletions(-)
 delete mode 100644 x/resource/tests/constants.go
 rename x/resource/tests/{ => setup}/setup.go (56%)
 create mode 100644 x/resource/tests/setup/setup_create_resource.go
 create mode 100644 x/resource/tests/setup/setup_query_all_versions.go
 create mode 100644 x/resource/tests/setup/setup_query_collecton_resources.go
 create mode 100644 x/resource/tests/setup/setup_query_resource.go
 create mode 100644 x/resource/tests/setup/testdata.go
 delete mode 100644 x/resource/tests/setup_create_resource.go
 delete mode 100644 x/resource/tests/setup_query_resource

diff --git a/x/cheqd/tests/setup/setup_create_did.go b/x/cheqd/tests/setup/setup_create_did.go
index bf0a13915..402265a47 100644
--- a/x/cheqd/tests/setup/setup_create_did.go
+++ b/x/cheqd/tests/setup/setup_create_did.go
@@ -5,6 +5,7 @@ import (
 	"encoding/base64"
 
 	"github.com/cheqd/cheqd-node/x/cheqd/types"
+	"github.com/cheqd/cheqd-node/x/cheqd/utils"
 )
 
 func (s *TestSetup) CreateDid(payload *types.MsgCreateDidPayload, signInputs []SignInput) (*types.MsgCreateDidResponse, error) {
@@ -30,6 +31,8 @@ func (s *TestSetup) CreateDid(payload *types.MsgCreateDidPayload, signInputs []S
 
 func (s *TestSetup) BuildSimpleDid() DidInfo {
 	did := GenerateDID(Base58_16chars)
+	_, _, collectionId := utils.MustSplitDID(did)
+
 	keyPair := GenerateKeyPair()
 	keyId := did + "#key-1"
 
@@ -52,11 +55,12 @@ func (s *TestSetup) BuildSimpleDid() DidInfo {
 	}
 
 	return DidInfo{
-		Did:       did,
-		KeyPair:   keyPair,
-		KeyId:     keyId,
-		Msg:       msg,
-		SignInput: signInput,
+		Did:          did,
+		CollectionId: collectionId,
+		KeyPair:      keyPair,
+		KeyId:        keyId,
+		Msg:          msg,
+		SignInput:    signInput,
 	}
 }
 
diff --git a/x/cheqd/tests/setup/types.go b/x/cheqd/tests/setup/types.go
index de7d58e88..a13b46151 100644
--- a/x/cheqd/tests/setup/types.go
+++ b/x/cheqd/tests/setup/types.go
@@ -17,11 +17,12 @@ type SignInput struct {
 }
 
 type DidInfo struct {
-	Msg       *types.MsgCreateDidPayload
-	Did       string
-	KeyPair   KeyPair
-	KeyId     string
-	SignInput SignInput
+	Msg          *types.MsgCreateDidPayload
+	Did          string
+	CollectionId string
+	KeyPair      KeyPair
+	KeyId        string
+	SignInput    SignInput
 }
 
 type CreatedDidInfo struct {
diff --git a/x/resource/tests/constants.go b/x/resource/tests/constants.go
deleted file mode 100644
index 4571fe208..000000000
--- a/x/resource/tests/constants.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package tests
-
-import (
-	"crypto/sha256"
-
-	"github.com/cheqd/cheqd-node/x/resource/types"
-)
-
-const (
-	CLSchemaType        = "CL-Schema"
-	SchemaData          = "{\"attr\":[\"name\",\"age\"]}"
-	TestResourceName    = "Test Resource Name"
-	JsonResourceType    = "application/json"
-	ResourceId          = "988b0ab3-6a39-4598-83ec-b84c6cf8da15"
-	AnotherResourceId   = "71583c78-f16f-11ec-9dd4-cba0f34eb177"
-	IncorrectResourceId = "1234"
-
-	NotFoundDIDIdentifier = "nfdnfdnfdnfdnfdd"
-	ExistingDIDIdentifier = "eeeeeeeeeeeeeeee"
-	ExistingDID           = "did:cheqd:test:" + ExistingDIDIdentifier
-	ExistingDIDKey        = ExistingDID + "#key-1"
-)
-
-func ExistingResource() types.Resource {
-	data := []byte(SchemaData)
-	checksum := sha256.Sum256(data)
-	return types.Resource{
-		Header: &types.ResourceHeader{
-			CollectionId: ExistingDIDIdentifier,
-			Id:           "a09abea0-22e0-4b35-8f70-9cc3a6d0b5fd",
-			Name:         "Existing Resource Name",
-			ResourceType: CLSchemaType,
-			MediaType:    JsonResourceType,
-			Checksum:     checksum[:],
-		},
-		Data: data,
-	}
-}
diff --git a/x/resource/tests/create_resource_test.go b/x/resource/tests/create_resource_test.go
index dc01850fa..5b6b84149 100644
--- a/x/resource/tests/create_resource_test.go
+++ b/x/resource/tests/create_resource_test.go
@@ -1,134 +1,103 @@
 package tests
 
 import (
-	"crypto/ed25519"
-	"crypto/sha256"
-	"fmt"
+	. "github.com/cheqd/cheqd-node/x/resource/tests/setup"
+	"github.com/google/uuid"
 
-	cheqdtypes "github.com/cheqd/cheqd-node/x/cheqd/types"
-	cheqdutils "github.com/cheqd/cheqd-node/x/cheqd/utils"
+	cheqdsetup "github.com/cheqd/cheqd-node/x/cheqd/tests/setup"
 	resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("CreateResource", func() {
-	Describe("Validate", func() {
-		var setup TestSetup
-		var err error
-		keys := GenerateTestKeys()
+func ExpectPayloadToMatchResource(payload *resourcetypes.MsgCreateResourcePayload, resource *resourcetypes.Resource) {
+	// Provided header
+	Expect(payload.Id).To(Equal(resource.Header.Id))
+	Expect(payload.CollectionId).To(Equal(resource.Header.CollectionId))
+	Expect(payload.Name).To(Equal(resource.Header.Name))
+	Expect(payload.ResourceType).To(Equal(resource.Header.ResourceType))
+
+	// Generated header
+	// TODO: Uncomment once fixed
+	// hash := sha256.Sum256(payload.Data)
+	// Expect(resource.Header.Checksum).To(Equal(hash))
+
+	// Provided data
+	Expect(payload.Data).To(Equal(resource.Data))
+}
+
+var _ = Describe("Create Resource Tests", func() {
+	var setup TestSetup
+	var alice cheqdsetup.CreatedDidInfo
+
+	BeforeEach(func() {
+		setup = Setup()
+		alice = setup.CreateSimpleDid()
+	})
+
+	Describe("Simple resource", func() {
+		var msg *resourcetypes.MsgCreateResourcePayload
+
+		BeforeEach(func() {
+			msg = &resourcetypes.MsgCreateResourcePayload{
+				CollectionId: alice.CollectionId,
+				Id:           uuid.NewString(),
+				Name:         "Test Resource Name",
+				ResourceType: CLSchemaType,
+				Data:         []byte(SchemaData),
+			}
+		})
+
+		It("Can be created with DIDDoc controller signature", func() {
+			_, err := setup.CreateResource(msg, []cheqdsetup.SignInput{alice.SignInput})
+			Expect(err).To(BeNil())
+
+			// check
+			created, err := setup.QueryResource(alice.CollectionId, msg.Id)
+			Expect(err).To(BeNil())
+
+			ExpectPayloadToMatchResource(msg, created.Resource)
+		})
+
+		It("Can't be created without DIDDoc controller signatures", func() {
+			_, err := setup.CreateResource(msg, []cheqdsetup.SignInput{})
+			Expect(err.Error()).To(ContainSubstring("signature is required but not found"))
+		})
+
+		It("Can't be created with invalid collection id", func() {
+			msg.CollectionId = cheqdsetup.GenerateDID(cheqdsetup.Base58_16chars)
+
+			_, err := setup.CreateResource(msg, []cheqdsetup.SignInput{alice.SignInput})
+			Expect(err.Error()).To(ContainSubstring("not found"))
+		})
+	})
+
+	Describe("New version", func() {
+		var existingResource *resourcetypes.MsgCreateResourceResponse
+
 		BeforeEach(func() {
-			setup = Setup()
-			didDoc := setup.BuildSimpleCreateDidPayload(ExistingDID, ExistingDIDKey, keys[ExistingDIDKey].Public)
-			_, err = setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
+			existingResource = setup.CreateSimpleResource(alice.CollectionId, SchemaData, "Test Resource Name", CLSchemaType, []cheqdsetup.SignInput{alice.SignInput})
+		})
+
+		It("Is linked to the previous one when name matches", func() {
+			msg := resourcetypes.MsgCreateResourcePayload{
+				CollectionId: alice.CollectionId,
+				Id:           uuid.NewString(),
+				Name:         existingResource.Resource.Header.Name,
+				ResourceType: CLSchemaType,
+				Data:         []byte(SchemaData),
+			}
+
+			_, err := setup.CreateResource(&msg, []cheqdsetup.SignInput{alice.SignInput})
 			Expect(err).To(BeNil())
-			resourcePayload := GenerateCreateResourcePayload(ExistingResource())
-			_, err = setup.SendCreateResource(resourcePayload, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
+
+			// check
+			created, err := setup.QueryResource(alice.CollectionId, msg.Id)
 			Expect(err).To(BeNil())
+
+			ExpectPayloadToMatchResource(&msg, created.Resource)
+			Expect(created.Resource.Header.PreviousVersionId).To(Equal(existingResource.Resource.Header.Id))
 		})
-		DescribeTable("Validate MsgCreateResource",
-			func(
-				valid bool,
-				signerKeys map[string]ed25519.PrivateKey,
-				msg *resourcetypes.MsgCreateResourcePayload,
-				mediaType string,
-				previousVersionId string,
-				errMsg string,
-			) {
-				resource, err := setup.SendCreateResource(msg, signerKeys)
-				if valid {
-					Expect(err).To(BeNil())
-
-					did := cheqdutils.JoinDID("cheqd", "test", resource.Header.CollectionId)
-					req := cheqdtypes.QueryGetDidRequest{Id: did}
-					didStateValue, err := setup.QueryServer.Did(setup.StdCtx, &req)
-					Expect(err).To(BeNil())
-					Expect(didStateValue.Metadata.Resources).Should(ContainElement(resource.Header.Id))
-
-					Expect(resource.Header.CollectionId).To(Equal(msg.CollectionId))
-					Expect(resource.Header.Id).To(Equal(msg.Id))
-					Expect(resource.Header.Name).To(Equal(msg.Name))
-					Expect(resource.Header.ResourceType).To(Equal(msg.ResourceType))
-					Expect(resource.Header.MediaType).To(Equal(mediaType))
-					Expect(resource.Header.PreviousVersionId).To(Equal(previousVersionId))
-					expectedChecksum := sha256.Sum256(msg.Data)
-					Expect(resource.Header.Checksum).To(Equal(expectedChecksum[:]))
-				} else {
-					Expect(err).ToNot(BeNil())
-					Expect(err.Error()).To(Equal(errMsg))
-				}
-			},
-			Entry("Valid: Works",
-				true,
-				map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private},
-				&resourcetypes.MsgCreateResourcePayload{
-					CollectionId: ExistingDIDIdentifier,
-					Id:           ResourceId,
-					Name:         "Test Resource Name",
-					ResourceType: CLSchemaType,
-					Data:         []byte(SchemaData),
-				},
-				JsonResourceType,
-				"",
-				"",
-			),
-			Entry("Valid: Add new resource version",
-				true,
-				map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private},
-				&resourcetypes.MsgCreateResourcePayload{
-					CollectionId: ExistingResource().Header.CollectionId,
-					Id:           ResourceId,
-					Name:         ExistingResource().Header.Name,
-					ResourceType: ExistingResource().Header.ResourceType,
-					Data:         ExistingResource().Data,
-				},
-				ExistingResource().Header.MediaType,
-				ExistingResource().Header.Id,
-				"",
-			),
-			Entry("Invalid: No signature",
-				false,
-				map[string]ed25519.PrivateKey{},
-				&resourcetypes.MsgCreateResourcePayload{
-					CollectionId: ExistingDIDIdentifier,
-					Id:           ResourceId,
-					Name:         "Test Resource Name",
-					ResourceType: CLSchemaType,
-					Data:         []byte(SchemaData),
-				},
-				JsonResourceType,
-				"",
-				fmt.Errorf("signer: %s: signature is required but not found", ExistingDID).Error(),
-			),
-			Entry("Invalid: Resource Id is not an acceptable format",
-				false,
-				map[string]ed25519.PrivateKey{},
-				&resourcetypes.MsgCreateResourcePayload{
-					CollectionId: ExistingDIDIdentifier,
-					Id:           IncorrectResourceId,
-					Name:         "Test Resource Name",
-					ResourceType: CLSchemaType,
-					Data:         []byte(SchemaData),
-				},
-				JsonResourceType,
-				"",
-				fmt.Errorf("signer: %s: signature is required but not found", ExistingDID).Error(),
-			),
-			Entry("Invalid: DidDoc not found",
-				false,
-				map[string]ed25519.PrivateKey{},
-				&resourcetypes.MsgCreateResourcePayload{
-					CollectionId: NotFoundDIDIdentifier,
-					Id:           IncorrectResourceId,
-					Name:         "Test Resource Name",
-					ResourceType: CLSchemaType,
-					Data:         []byte(SchemaData),
-				},
-				JsonResourceType,
-				"",
-				fmt.Errorf("did:cheqd:test:%s: not found", NotFoundDIDIdentifier).Error(),
-			),
-		)
 	})
 })
diff --git a/x/resource/tests/query_all_resource_versions_test.go b/x/resource/tests/query_all_resource_versions_test.go
index e27f534c8..e06c517cb 100644
--- a/x/resource/tests/query_all_resource_versions_test.go
+++ b/x/resource/tests/query_all_resource_versions_test.go
@@ -1,97 +1,54 @@
 package tests
 
 import (
-	"crypto/ed25519"
-	"fmt"
+	. "github.com/cheqd/cheqd-node/x/resource/tests/setup"
 
+	cheqdsetup "github.com/cheqd/cheqd-node/x/cheqd/tests/setup"
 	"github.com/cheqd/cheqd-node/x/resource/types"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("QueryAllResourceVersions", func() {
-	Describe("Validate", func() {
-		var setup TestSetup
-		keys := GenerateTestKeys()
-		BeforeEach(func() {
-			setup = Setup()
-			didDoc := setup.BuildSimpleCreateDidPayload(ExistingDID, ExistingDIDKey, keys[ExistingDIDKey].Public)
-			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
-			Expect(err).To(BeNil())
-			payload := GenerateCreateResourcePayload(ExistingResource())
-			_, err = setup.SendCreateResource(payload, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
-			Expect(err).To(BeNil())
-		})
-		DescribeTable("Validate QueryGetAllResourceVersionsRequest",
-			func(
-				valid bool,
-				signerKeys map[string]ed25519.PrivateKey,
-				msg *types.QueryGetAllResourceVersionsRequest,
-				response *types.QueryGetAllResourceVersionsResponse,
-				errMsg string,
-			) {
-				existingResource := ExistingResource()
+var _ = Describe("Query All Resource Versions", func() {
+	var setup TestSetup
+	var alice cheqdsetup.CreatedDidInfo
 
-				payload := GenerateCreateResourcePayload(existingResource)
-				payload.Id = ResourceId
+	var res1v1 *types.MsgCreateResourceResponse
+	var res1v2 *types.MsgCreateResourceResponse
+	var res2v1 *types.MsgCreateResourceResponse
 
-				nextVersionResource, err := setup.SendCreateResource(payload, signerKeys)
-				Expect(err).To(BeNil())
-				Expect(nextVersionResource).ToNot(Equal(existingResource))
+	BeforeEach(func() {
+		setup = Setup()
 
-				payload = GenerateCreateResourcePayload(existingResource)
-				payload.Id = AnotherResourceId
-				payload.Name = "AnotherResourceVersion"
-				differentResource, err := setup.SendCreateResource(payload, signerKeys)
-				Expect(err).To(BeNil())
-				Expect(differentResource).ToNot(Equal(existingResource))
-				Expect(differentResource).ToNot(Equal(nextVersionResource))
+		alice = setup.CreateSimpleDid()
 
-				queryResponse, err := setup.ResourceQueryServer.AllResourceVersions(setup.StdCtx, msg)
+		res1v1 = setup.CreateSimpleResource(alice.CollectionId, SchemaData, "Resource 1", CLSchemaType, []cheqdsetup.SignInput{alice.SignInput})
+		res1v2 = setup.CreateSimpleResource(alice.CollectionId, SchemaData, "Resource 1", CLSchemaType, []cheqdsetup.SignInput{alice.SignInput})
+		res2v1 = setup.CreateSimpleResource(alice.CollectionId, SchemaData, "Resource 2", CLSchemaType, []cheqdsetup.SignInput{alice.SignInput})
+	})
+
+	It("Should return 2 versions for resource 1", func() {
+		versions, err := setup.AllResourceVersions(alice.CollectionId, res1v1.Resource.Header.Name)
+		Expect(err).To(BeNil())
+		Expect(versions.Resources).To(HaveLen(2))
+
+		ids := []string{versions.Resources[0].Id, versions.Resources[1].Id}
+
+		Expect(ids).To(ContainElement(res1v1.Resource.Header.Id))
+		Expect(ids).To(ContainElement(res1v2.Resource.Header.Id))
+	})
+
+	It("Should return 1 version for resource 2", func() {
+		versions, err := setup.AllResourceVersions(alice.CollectionId, res2v1.Resource.Header.Name)
+		Expect(err).To(BeNil())
+		Expect(versions.Resources).To(HaveLen(1))
+		Expect(versions.Resources[0].Id).To(Equal(res2v1.Resource.Header.Id))
+	})
 
-				if valid {
-					resources := queryResponse.Resources
-					existingResource.Header.NextVersionId = nextVersionResource.Header.Id
-					expectedResources := map[string]types.Resource{
-						existingResource.Header.Id:    existingResource,
-						nextVersionResource.Header.Id: *nextVersionResource,
-					}
-					Expect(err).To(BeNil())
-					Expect(len(resources)).To(Equal(len(expectedResources)))
-					for _, r := range resources {
-						r.Created = expectedResources[r.Id].Header.Created
-						Expect(r).To(Equal(expectedResources[r.Id].Header))
-					}
-				} else {
-					Expect(err).ToNot(BeNil())
-					Expect(err.Error()).To(Equal(errMsg))
-				}
-			},
-			Entry("Valid: should return all resources",
-				true,
-				map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private},
-				&types.QueryGetAllResourceVersionsRequest{
-					CollectionId: ExistingDIDIdentifier,
-					Name:         ExistingResource().Header.Name,
-				},
-				&types.QueryGetAllResourceVersionsResponse{
-					Resources: []*types.ResourceHeader{
-						ExistingResource().Header,
-					},
-				},
-				"",
-			),
-			Entry("Invalid: should return an error if the collection id is invalid",
-				false,
-				map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private},
-				&types.QueryGetAllResourceVersionsRequest{
-					CollectionId: NotFoundDIDIdentifier,
-					Name:         ExistingResource().Header.Name,
-				},
-				nil,
-				fmt.Errorf("did:cheqd:test:%s: DID Doc not found", NotFoundDIDIdentifier).Error(),
-			),
-		)
+	It("Should return 0 versions for non-existing resource", func() {
+		versions, err := setup.AllResourceVersions(alice.CollectionId, "non-existing")
+		Expect(err).To(BeNil())
+		Expect(versions.Resources).To(HaveLen(0))
 	})
 })
diff --git a/x/resource/tests/query_collection_resources_test.go b/x/resource/tests/query_collection_resources_test.go
index 4c8b19b2f..219b96357 100644
--- a/x/resource/tests/query_collection_resources_test.go
+++ b/x/resource/tests/query_collection_resources_test.go
@@ -1,69 +1,42 @@
 package tests
 
 import (
-	"crypto/ed25519"
-	"fmt"
+	. "github.com/cheqd/cheqd-node/x/resource/tests/setup"
 
-	resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
+	cheqdsetup "github.com/cheqd/cheqd-node/x/cheqd/tests/setup"
+	"github.com/cheqd/cheqd-node/x/resource/types"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("QueryCollectionResources", func() {
-	Describe("Validate", func() {
-		var setup TestSetup
-		keys := GenerateTestKeys()
-		BeforeEach(func() {
-			setup = Setup()
-			didDoc := setup.BuildSimpleCreateDidPayload(ExistingDID, ExistingDIDKey, keys[ExistingDIDKey].Public)
-			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
-			Expect(err).To(BeNil())
-			payload := GenerateCreateResourcePayload(ExistingResource())
-			_, err = setup.SendCreateResource(payload, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
-			Expect(err).To(BeNil())
-		})
-		DescribeTable("Validate QueryCollectionResources",
-			func(
-				valid bool,
-				msg *resourcetypes.QueryGetCollectionResourcesRequest,
-				response *resourcetypes.QueryGetCollectionResourcesResponse,
-				errMsg string,
-			) {
-				queryResponse, err := setup.ResourceQueryServer.CollectionResources(setup.StdCtx, msg)
+var _ = Describe("Query Collection Resources", func() {
+	var setup TestSetup
+	var alice cheqdsetup.CreatedDidInfo
 
-				if valid {
-					resources := queryResponse.Resources
-					expectedResources := response.Resources
-					Expect(err).To(BeNil())
-					Expect(len(expectedResources)).To(Equal(len(resources)))
-					for i, r := range resources {
-						r.Created = expectedResources[i].Created
-						Expect(expectedResources[i]).To(Equal(r))
-					}
-				} else {
-					Expect(err).To(HaveOccurred())
-					Expect(errMsg).To(Equal(err.Error()))
-				}
-			},
-			Entry("Valid: Works",
-				true,
-				&resourcetypes.QueryGetCollectionResourcesRequest{
-					CollectionId: ExistingDIDIdentifier,
-				},
-				&resourcetypes.QueryGetCollectionResourcesResponse{
-					Resources: []*resourcetypes.ResourceHeader{ExistingResource().Header},
-				},
-				"",
-			),
-			Entry("Invalid: DID Doc is not found",
-				false,
-				&resourcetypes.QueryGetCollectionResourcesRequest{
-					CollectionId: NotFoundDIDIdentifier,
-				},
-				nil,
-				fmt.Errorf("did:cheqd:test:%s: DID Doc not found", NotFoundDIDIdentifier).Error(),
-			),
-		)
+	var res1v1 *types.MsgCreateResourceResponse
+	var res1v2 *types.MsgCreateResourceResponse
+	var res2v1 *types.MsgCreateResourceResponse
+
+	BeforeEach(func() {
+		setup = Setup()
+
+		alice = setup.CreateSimpleDid()
+
+		res1v1 = setup.CreateSimpleResource(alice.CollectionId, SchemaData, "Resource 1", CLSchemaType, []cheqdsetup.SignInput{alice.SignInput})
+		res1v2 = setup.CreateSimpleResource(alice.CollectionId, SchemaData, "Resource 1", CLSchemaType, []cheqdsetup.SignInput{alice.SignInput})
+		res2v1 = setup.CreateSimpleResource(alice.CollectionId, SchemaData, "Resource 2", CLSchemaType, []cheqdsetup.SignInput{alice.SignInput})
+	})
+
+	It("Should return all 3 headerrs", func() {
+		versions, err := setup.CollectionResources(alice.CollectionId)
+		Expect(err).To(BeNil())
+		Expect(versions.Resources).To(HaveLen(3))
+
+		ids := []string{versions.Resources[0].Id, versions.Resources[1].Id, versions.Resources[2].Id}
+
+		Expect(ids).To(ContainElement(res1v1.Resource.Header.Id))
+		Expect(ids).To(ContainElement(res1v2.Resource.Header.Id))
+		Expect(ids).To(ContainElement(res2v1.Resource.Header.Id))
 	})
 })
diff --git a/x/resource/tests/query_resource_test.go b/x/resource/tests/query_resource_test.go
index 1c3d57f15..6db9f42a3 100644
--- a/x/resource/tests/query_resource_test.go
+++ b/x/resource/tests/query_resource_test.go
@@ -1,85 +1,44 @@
 package tests
 
 import (
-	"crypto/ed25519"
-	"crypto/sha256"
-	"fmt"
+	. "github.com/cheqd/cheqd-node/x/resource/tests/setup"
+	"github.com/google/uuid"
+
+	cheqdsetup "github.com/cheqd/cheqd-node/x/cheqd/tests/setup"
+	"github.com/cheqd/cheqd-node/x/resource/types"
 
-	resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("QueryGetResource", func() {
-	Describe("Validate", func() {
-		var setup TestSetup
-		keys := GenerateTestKeys()
-		existingResource := ExistingResource()
-		BeforeEach(func() {
-			setup = Setup()
-			didDoc := setup.BuildSimpleCreateDidPayload(ExistingDID, ExistingDIDKey, keys[ExistingDIDKey].Public)
-			_, err := setup.SendCreateDid(didDoc, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
-			Expect(err).To(BeNil())
-			payload := GenerateCreateResourcePayload(ExistingResource())
-			_, err = setup.SendCreateResource(payload, map[string]ed25519.PrivateKey{ExistingDIDKey: keys[ExistingDIDKey].Private})
-			Expect(err).To(BeNil())
-		})
-		DescribeTable("Validate QueryGetResourceRequest",
-			func(
-				valid bool,
-				msg *resourcetypes.QueryGetResourceRequest,
-				response *resourcetypes.QueryGetResourceResponse,
-				errMsg string,
-			) {
-				queryResponse, err := setup.ResourceQueryServer.Resource(setup.StdCtx, msg)
+var _ = Describe("Query Collection Resources", func() {
+	var setup TestSetup
+	var alice cheqdsetup.CreatedDidInfo
+	var resource *types.MsgCreateResourceResponse
+
+	BeforeEach(func() {
+		setup = Setup()
+		alice = setup.CreateSimpleDid()
+		resource = setup.CreateSimpleResource(alice.CollectionId, SchemaData, "Resource 1", CLSchemaType, []cheqdsetup.SignInput{alice.SignInput})
+	})
+
+	It("Works", func() {
+		versions, err := setup.QueryResource(alice.CollectionId, resource.Resource.Header.Id)
+		Expect(err).To(BeNil())
+		Expect(versions.Resource.Header.Id).To(Equal(resource.Resource.Header.Id))
+	})
+
+	It("Returns error if resource does not exist", func() {
+		nonExistingResource := uuid.NewString()
+
+		_, err := setup.QueryResource(alice.CollectionId, nonExistingResource)
+		Expect(err.Error()).To(ContainSubstring("not found"))
+	})
+
+	It("Returns error if collection does not exist", func() {
+		nonExistingCollection := cheqdsetup.GenerateDID(cheqdsetup.Base58_16chars)
 
-				if valid {
-					resource := queryResponse.Resource
-					Expect(err).To(BeNil())
-					Expect(response.Resource.Header.CollectionId).To(Equal(resource.Header.CollectionId))
-					Expect(response.Resource.Header.Id).To(Equal(resource.Header.Id))
-					Expect(response.Resource.Header.MediaType).To(Equal(resource.Header.MediaType))
-					Expect(response.Resource.Header.ResourceType).To(Equal(resource.Header.ResourceType))
-					Expect(response.Resource.Data).To(Equal(resource.Data))
-					Expect(response.Resource.Header.Name).To(Equal(resource.Header.Name))
-					checksum := sha256.Sum256(response.Resource.Data)
-					Expect(checksum[:]).To(Equal(resource.Header.Checksum))
-					Expect(response.Resource.Header.PreviousVersionId).To(Equal(resource.Header.PreviousVersionId))
-					Expect(response.Resource.Header.NextVersionId).To(Equal(resource.Header.NextVersionId))
-				} else {
-					Expect(err).To(HaveOccurred())
-					Expect(err.Error()).To(Equal(errMsg))
-				}
-			},
-			Entry("Valid: Works",
-				true,
-				&resourcetypes.QueryGetResourceRequest{
-					CollectionId: ExistingDIDIdentifier,
-					Id:           existingResource.Header.Id,
-				},
-				&resourcetypes.QueryGetResourceResponse{
-					Resource: &existingResource,
-				},
-				"",
-			),
-			Entry("Invalid: Resource not found",
-				false,
-				&resourcetypes.QueryGetResourceRequest{
-					CollectionId: ExistingDIDIdentifier,
-					Id:           AnotherResourceId,
-				},
-				nil,
-				fmt.Errorf("resource %s:%s: not found", ExistingDIDIdentifier, AnotherResourceId).Error(),
-			),
-			Entry("Invalid: DIDDoc not found",
-				false,
-				&resourcetypes.QueryGetResourceRequest{
-					CollectionId: NotFoundDIDIdentifier,
-					Id:           existingResource.Header.Id,
-				},
-				nil,
-				fmt.Errorf("did:cheqd:test:%s: DID Doc not found", NotFoundDIDIdentifier).Error(),
-			),
-		)
+		_, err := setup.QueryResource(nonExistingCollection, resource.Resource.Header.Id)
+		Expect(err.Error()).To(ContainSubstring("DID Doc not found"))
 	})
 })
diff --git a/x/resource/tests/setup.go b/x/resource/tests/setup/setup.go
similarity index 56%
rename from x/resource/tests/setup.go
rename to x/resource/tests/setup/setup.go
index ca6e6ba77..2f05fdebb 100644
--- a/x/resource/tests/setup.go
+++ b/x/resource/tests/setup/setup.go
@@ -1,13 +1,11 @@
-package tests
+package setup
 
 import (
-	"crypto/ed25519"
 	"crypto/rand"
-	"encoding/base64"
 	"time"
 
 	cheqdkeeper "github.com/cheqd/cheqd-node/x/cheqd/keeper"
-	cheqdtests "github.com/cheqd/cheqd-node/x/cheqd/tests"
+	cheqdsetup "github.com/cheqd/cheqd-node/x/cheqd/tests/setup"
 	cheqdtypes "github.com/cheqd/cheqd-node/x/cheqd/types"
 	"github.com/cheqd/cheqd-node/x/resource/types"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
@@ -23,7 +21,7 @@ import (
 )
 
 type TestSetup struct {
-	cheqdtests.TestSetup
+	cheqdsetup.TestSetup
 
 	ResourceKeeper      keeper.Keeper
 	ResourceMsgServer   types.MsgServer
@@ -72,7 +70,7 @@ func Setup() TestSetup {
 	queryServer := keeper.NewQueryServer(*resourceKeeper, *cheqdKeeper)
 
 	setup := TestSetup{
-		TestSetup: cheqdtests.TestSetup{
+		TestSetup: cheqdsetup.TestSetup{
 			Cdc: cdc,
 
 			SdkCtx: ctx,
@@ -88,55 +86,6 @@ func Setup() TestSetup {
 		ResourceQueryServer: queryServer,
 	}
 
-	setup.Keeper.SetDidNamespace(&ctx, cheqdtests.DID_NAMESPACE)
+	setup.Keeper.SetDidNamespace(&ctx, cheqdsetup.DID_NAMESPACE)
 	return setup
 }
-
-func GenerateCreateResourcePayload(resource types.Resource) *types.MsgCreateResourcePayload {
-	return &types.MsgCreateResourcePayload{
-		CollectionId: resource.Header.CollectionId,
-		Id:           resource.Header.Id,
-		Name:         resource.Header.Name,
-		ResourceType: resource.Header.ResourceType,
-		Data:         resource.Data,
-	}
-}
-
-func (s *TestSetup) WrapCreateRequest(payload *types.MsgCreateResourcePayload, keys map[string]ed25519.PrivateKey) *types.MsgCreateResource {
-	var signatures []*cheqdtypes.SignInfo
-	signingInput := payload.GetSignBytes()
-
-	for privKeyId, privKey := range keys {
-		signature := base64.StdEncoding.EncodeToString(ed25519.Sign(privKey, signingInput))
-		signatures = append(signatures, &cheqdtypes.SignInfo{
-			VerificationMethodId: privKeyId,
-			Signature:            signature,
-		})
-	}
-
-	return &types.MsgCreateResource{
-		Payload:    payload,
-		Signatures: signatures,
-	}
-}
-
-func (s *TestSetup) SendCreateResource(msg *types.MsgCreateResourcePayload, keys map[string]ed25519.PrivateKey) (*types.Resource, error) {
-	_, err := s.ResourceMsgServer.CreateResource(s.StdCtx, s.WrapCreateRequest(msg, keys))
-	if err != nil {
-		return nil, err
-	}
-
-	req := &types.QueryGetResourceRequest{
-		CollectionId: msg.CollectionId,
-		Id:           msg.Id,
-	}
-
-	created, _ := s.ResourceQueryServer.Resource(s.StdCtx, req)
-	return created.Resource, nil
-}
-
-func GenerateTestKeys() map[string]cheqdtests.KeyPair {
-	return map[string]cheqdtests.KeyPair{
-		ExistingDIDKey: cheqdtests.GenerateKeyPair(),
-	}
-}
diff --git a/x/resource/tests/setup/setup_create_resource.go b/x/resource/tests/setup/setup_create_resource.go
new file mode 100644
index 000000000..3fe6c0695
--- /dev/null
+++ b/x/resource/tests/setup/setup_create_resource.go
@@ -0,0 +1,53 @@
+package setup
+
+import (
+	"crypto/ed25519"
+	"encoding/base64"
+
+	"github.com/cheqd/cheqd-node/x/cheqd/tests/setup"
+	cheqdtypes "github.com/cheqd/cheqd-node/x/cheqd/types"
+	"github.com/cheqd/cheqd-node/x/resource/types"
+	"github.com/google/uuid"
+)
+
+func (s *TestSetup) CreateResource(payload *types.MsgCreateResourcePayload, signInputs []setup.SignInput) (*types.MsgCreateResourceResponse, error) {
+	signBytes := payload.GetSignBytes()
+	var signatures []*cheqdtypes.SignInfo
+
+	for _, input := range signInputs {
+		signature := ed25519.Sign(input.Key, signBytes)
+
+		signatures = append(signatures, &cheqdtypes.SignInfo{
+			VerificationMethodId: input.VerificationMethodId,
+			Signature:            base64.StdEncoding.EncodeToString(signature),
+		})
+	}
+
+	msg := &types.MsgCreateResource{
+		Payload:    payload,
+		Signatures: signatures,
+	}
+
+	return s.ResourceMsgServer.CreateResource(s.StdCtx, msg)
+}
+
+func (s *TestSetup) BuildSimpleResource(collectionId, data, name, _type string) types.MsgCreateResourcePayload {
+	return types.MsgCreateResourcePayload{
+		Id:           uuid.NewString(),
+		CollectionId: collectionId,
+		Data:         []byte(data),
+		Name:         name,
+		ResourceType: _type,
+	}
+}
+
+func (s *TestSetup) CreateSimpleResource(collectionId, data, name, _type string, signInputs []setup.SignInput) *types.MsgCreateResourceResponse {
+	resource := s.BuildSimpleResource(collectionId, data, name, _type)
+	res, err := s.CreateResource(&resource, signInputs)
+
+	if err != nil {
+		panic(err)
+	}
+
+	return res
+}
diff --git a/x/resource/tests/setup/setup_query_all_versions.go b/x/resource/tests/setup/setup_query_all_versions.go
new file mode 100644
index 000000000..8a49deff8
--- /dev/null
+++ b/x/resource/tests/setup/setup_query_all_versions.go
@@ -0,0 +1,12 @@
+package setup
+
+import "github.com/cheqd/cheqd-node/x/resource/types"
+
+func (s *TestSetup) AllResourceVersions(collectionId, name string) (*types.QueryGetAllResourceVersionsResponse, error) {
+	req := &types.QueryGetAllResourceVersionsRequest{
+		CollectionId: collectionId,
+		Name:         name,
+	}
+
+	return s.ResourceQueryServer.AllResourceVersions(s.StdCtx, req)
+}
diff --git a/x/resource/tests/setup/setup_query_collecton_resources.go b/x/resource/tests/setup/setup_query_collecton_resources.go
new file mode 100644
index 000000000..708877110
--- /dev/null
+++ b/x/resource/tests/setup/setup_query_collecton_resources.go
@@ -0,0 +1,11 @@
+package setup
+
+import "github.com/cheqd/cheqd-node/x/resource/types"
+
+func (s *TestSetup) CollectionResources(collectionId string) (*types.QueryGetCollectionResourcesResponse, error) {
+	req := &types.QueryGetCollectionResourcesRequest{
+		CollectionId: collectionId,
+	}
+
+	return s.ResourceQueryServer.CollectionResources(s.StdCtx, req)
+}
diff --git a/x/resource/tests/setup/setup_query_resource.go b/x/resource/tests/setup/setup_query_resource.go
new file mode 100644
index 000000000..34c47bc1d
--- /dev/null
+++ b/x/resource/tests/setup/setup_query_resource.go
@@ -0,0 +1,12 @@
+package setup
+
+import "github.com/cheqd/cheqd-node/x/resource/types"
+
+func (s *TestSetup) QueryResource(collectionId, resourceId string) (*types.QueryGetResourceResponse, error) {
+	req := &types.QueryGetResourceRequest{
+		CollectionId: collectionId,
+		Id:           resourceId,
+	}
+
+	return s.ResourceQueryServer.Resource(s.StdCtx, req)
+}
diff --git a/x/resource/tests/setup/testdata.go b/x/resource/tests/setup/testdata.go
new file mode 100644
index 000000000..e5b005e9b
--- /dev/null
+++ b/x/resource/tests/setup/testdata.go
@@ -0,0 +1,8 @@
+package setup
+
+const (
+	CLSchemaType     = "CL-Schema"
+	SchemaData       = "{\"attr\":[\"name\",\"age\"]}"
+	TestResourceName = "Test Resource Name"
+	JsonResourceType = "application/json"
+)
diff --git a/x/resource/tests/setup_create_resource.go b/x/resource/tests/setup_create_resource.go
deleted file mode 100644
index e69de29bb..000000000
diff --git a/x/resource/tests/setup_query_resource b/x/resource/tests/setup_query_resource
deleted file mode 100644
index e69de29bb..000000000

From 515a2a3ba1ab1e7abe7d425d43b25b70d94559c9 Mon Sep 17 00:00:00 2001
From: Alexandr Kolesov <kolesov.alex.s@gmail.com>
Date: Mon, 17 Oct 2022 13:07:52 +0500
Subject: [PATCH 37/76] Optimize ginkgo installation

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 16055f813..9ea382c1f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -34,9 +34,9 @@ jobs:
           cache: true
 
       - name: Install ginkgo
+        working-directory: ./..
         run: |
-          go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo
-          go get github.com/onsi/gomega/...
+          go install github.com/onsi/ginkgo/v2/ginkgo@latest
           go install github.com/jstemmer/go-junit-report/v2@latest
 
       - name: Run Ginkgo tests

From 3bd4ac3f4641a4d0237b4e2db7cd3737df215b98 Mon Sep 17 00:00:00 2001
From: Alexandr Kolesov <kolesov.alex.s@gmail.com>
Date: Mon, 17 Oct 2022 13:09:56 +0500
Subject: [PATCH 38/76] Cleaning up

---
 .github/workflows/dispatch.yml | 46 ++++++++++++++++------------------
 .github/workflows/test.yml     | 11 --------
 2 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index d15a4a6fb..14bdbbd07 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -1,31 +1,29 @@
 name: "Workflow Dispatch"
 on: push
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
+concurrency:
+   group: ${{ github.workflow }}-${{ github.ref }}
+   cancel-in-progress: true
 
 jobs:
+   call-lint:
+      name: "Lint"
+      uses: ./.github/workflows/lint.yml
 
- call-lint:
-    name: "Lint"
-    uses: ./.github/workflows/lint.yml
-
- call-build:
-    name: "Build"
-    needs: call-lint
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
+   call-build:
+      name: "Build"
+      needs: call-lint
+      uses: ./.github/workflows/build.yml
+      secrets: inherit
 
- call-test:
-    name: "Test"
-    needs: call-build
-    uses: ./.github/workflows/test.yml
-    secrets: inherit
+   call-test:
+      name: "Test"
+      needs: call-build
+      uses: ./.github/workflows/test.yml
+      secrets: inherit
 
- call-release:
-    name: "Release"
-    needs: [call-test, call-build]
-    if: ${{ github.ref_protected == true }}
-    uses: ./.github/workflows/release.yml
-    secrets: inherit
\ No newline at end of file
+   call-release:
+      name: "Release"
+      needs: [call-test, call-build]
+      if: ${{ github.ref_protected == true }}
+      uses: ./.github/workflows/release.yml
+      secrets: inherit
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9ea382c1f..8ed49f978 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,16 +1,5 @@
 name: "Test"
 on:
-  pull_request_target:
-    branches:
-      - main
-      - develop
-    types:
-      - opened
-      - reopened
-      - edited
-      - synchronize
-      - ready_for_review
-      - review_requested
   workflow_call:
 defaults:
   run:

From ca33e1af8b33da7a34eb5a399eabf96bbcea768c Mon Sep 17 00:00:00 2001
From: Alexandr Kolesov <kolesov.alex.s@gmail.com>
Date: Mon, 17 Oct 2022 13:19:08 +0500
Subject: [PATCH 39/76] Mod tidy + liner issues

---
 go.mod                                          | 9 ++-------
 go.sum                                          | 4 ++--
 x/resource/client/cli/tx_create_resource.go     | 4 ++--
 x/resource/tests/setup/setup_create_resource.go | 1 -
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/go.mod b/go.mod
index 7e6fb3eb0..f290fd0ac 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,6 @@ go 1.17
 
 require (
 	filippo.io/edwards25519 v1.0.0-beta.2
-	github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
 	github.com/cosmos/cosmos-sdk v0.45.5
 	github.com/cosmos/ibc-go/v3 v3.1.1
 	github.com/gabriel-vasile/mimetype v1.4.1
@@ -17,13 +16,12 @@ require (
 	github.com/lestrrat-go/jwx v1.2.25
 	github.com/multiformats/go-multibase v0.1.1
 	github.com/onsi/ginkgo/v2 v2.1.6
-	github.com/onsi/gomega v1.20.1
+	github.com/onsi/gomega v1.22.0
 	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cast v1.5.0
 	github.com/spf13/cobra v1.6.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.12.0
-	github.com/stretchr/testify v1.7.1
 	github.com/tendermint/tendermint v0.34.19
 	github.com/tendermint/tm-db v0.6.6
 	google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd
@@ -64,7 +62,6 @@ require (
 	github.com/go-kit/log v0.2.0 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
-	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
 	github.com/goccy/go-json v0.9.7 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/gateway v1.1.0 // indirect
@@ -72,7 +69,6 @@ require (
 	github.com/google/btree v1.0.0 // indirect
 	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/google/orderedcode v0.0.1 // indirect
-	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
 	github.com/gorilla/handlers v1.5.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -107,7 +103,6 @@ require (
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/multiformats/go-base32 v0.0.3 // indirect
 	github.com/multiformats/go-base36 v0.1.0 // indirect
-	github.com/onsi/gomega v1.22.0 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
@@ -124,6 +119,7 @@ require (
 	github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect
 	github.com/spf13/afero v1.8.2 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/stretchr/testify v1.7.1 // indirect
 	github.com/subosito/gotenv v1.3.0 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca // indirect
 	github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
@@ -137,7 +133,6 @@ require (
 	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/tools v0.1.12 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/go.sum b/go.sum
index 80970d8ae..fb95add73 100644
--- a/go.sum
+++ b/go.sum
@@ -368,7 +368,6 @@ github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5Nq
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
@@ -471,7 +470,6 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -778,9 +776,11 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
+github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
+github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU=
 github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
diff --git a/x/resource/client/cli/tx_create_resource.go b/x/resource/client/cli/tx_create_resource.go
index 470e15fc4..e28a348cf 100644
--- a/x/resource/client/cli/tx_create_resource.go
+++ b/x/resource/client/cli/tx_create_resource.go
@@ -1,7 +1,7 @@
 package cli
 
 import (
-	"io/ioutil"
+	"os"
 
 	cheqdcli "github.com/cheqd/cheqd-node/x/cheqd/client/cli"
 	"github.com/cheqd/cheqd-node/x/resource/types"
@@ -60,7 +60,7 @@ func CmdCreateResource() *cobra.Command {
 				return err
 			}
 
-			data, err := ioutil.ReadFile(resourceFile)
+			data, err := os.ReadFile(resourceFile)
 			if err != nil {
 				return err
 			}
diff --git a/x/resource/tests/setup/setup_create_resource.go b/x/resource/tests/setup/setup_create_resource.go
index 3fe6c0695..40f13df3e 100644
--- a/x/resource/tests/setup/setup_create_resource.go
+++ b/x/resource/tests/setup/setup_create_resource.go
@@ -44,7 +44,6 @@ func (s *TestSetup) BuildSimpleResource(collectionId, data, name, _type string)
 func (s *TestSetup) CreateSimpleResource(collectionId, data, name, _type string, signInputs []setup.SignInput) *types.MsgCreateResourceResponse {
 	resource := s.BuildSimpleResource(collectionId, data, name, _type)
 	res, err := s.CreateResource(&resource, signInputs)
-
 	if err != nil {
 		panic(err)
 	}

From d5194473e5f3dbebedb77deaf31577da4a11d691 Mon Sep 17 00:00:00 2001
From: Alexandr Kolesov <kolesov.alex.s@gmail.com>
Date: Mon, 17 Oct 2022 15:20:29 +0500
Subject: [PATCH 40/76] Cleanup

---
 app/export.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/export.go b/app/export.go
index b6d449ead..15aebb9e1 100644
--- a/app/export.go
+++ b/app/export.go
@@ -49,8 +49,7 @@ func (app *App) ExportAppStateAndValidators(
 
 // prepare for fresh start at zero height
 // NOTE zero height genesis is a temporary feature which will be deprecated
-//
-//	in favour of export at a block height
+// in favour of export at a block height
 func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []string) {
 	applyAllowedAddrs := false
 

From 8645992276907a5c22e854ae5472e96f3de75dd6 Mon Sep 17 00:00:00 2001
From: Ankur Banerjee <ankurdotb@users.noreply.github.com>
Date: Mon, 17 Oct 2022 21:29:25 +0100
Subject: [PATCH 41/76] Update dispatch.yml

---
 .github/workflows/dispatch.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index 43ab2b5b7..0bba1c544 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -16,16 +16,16 @@ jobs:
     needs: call-lint
     uses: cheqd/cheqd-node/.github/workflows/build.yml@develop
   
-  # call-test:
-  #   name: "Test"
-  #   needs: call-build
-  #   uses: ./.github/workflows/test.yml
-  #   secrets: inherit
+  call-test:
+    name: "Test"
+    needs: call-build
+    uses: cheqd/cheqd-node/.github/workflows/test.yml@develop
+    secrets: inherit
 
   call-release:
     name: "Release"
-    # needs: call-test
-    needs: call-build
+    needs: call-test
+    # needs: call-build
     if: ${{ github.ref_protected == true }}
     uses: cheqd/cheqd-node/.github/workflows/release.yml@develop
     secrets: inherit

From 1239add0db97a2ffe7c27f3e9abd4e10b3ce0294 Mon Sep 17 00:00:00 2001
From: Ankur Banerjee <ankurdotb@users.noreply.github.com>
Date: Mon, 17 Oct 2022 21:29:48 +0100
Subject: [PATCH 42/76] Update test.yml

---
 .github/workflows/test.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8ed49f978..3e6576d86 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,15 +23,14 @@ jobs:
           cache: true
 
       - name: Install ginkgo
-        working-directory: ./..
         run: |
-          go install github.com/onsi/ginkgo/v2/ginkgo@latest
-          go install github.com/jstemmer/go-junit-report/v2@latest
+          go get github.com/onsi/ginkgo/v2/ginkgo
+          go get github.com/onsi/gomega/...
 
       - name: Run Ginkgo tests
         run: ginkgo -r --race --randomize-all --randomize-suites --junit-report report.xml
 
-      - uses: mikepenz/action-junit-report@v3
-        if: success() || failure()
-        with:
-          report_paths: 'report.xml'
+      # - uses: mikepenz/action-junit-report@v3
+      #   if: success() || failure()        # run this step even if previous step failed
+      #   with:
+      #     report_paths: 'report.xml'

From 67bf86811952690f3ca46e3ce2838a4784dbfcd1 Mon Sep 17 00:00:00 2001
From: Ankur Banerjee <ankurdotb@users.noreply.github.com>
Date: Mon, 17 Oct 2022 21:35:52 +0100
Subject: [PATCH 43/76] Update test.yml

---
 .github/workflows/test.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3e6576d86..595e045b1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,14 +4,15 @@ on:
 defaults:
   run:
     shell: bash
+env:
+  NODE_CONFIGS_BASE: "/home/runner/work/cheqd-node/cheqd-node/docker/localnet/network-config"
 permissions:
-  id-token: write
   contents: write
-  checks: write
+  packages: read
 
 jobs:
   unit-tests:
-    name: "Unit tests"
+    name: "Unit Tests"
     runs-on: ubuntu-latest
 
     steps:

From 668cedee71a1e3cf77bb3aa9424c65fc405be40f Mon Sep 17 00:00:00 2001
From: Ankur Banerjee <ankurdotb@users.noreply.github.com>
Date: Mon, 17 Oct 2022 21:35:55 +0100
Subject: [PATCH 44/76] Update go.mod

---
 go.mod | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/go.mod b/go.mod
index f963f3d94..95da11e32 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,6 @@ go 1.18
 
 require (
 	filippo.io/edwards25519 v1.0.0-beta.2
-	github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
 	github.com/cosmos/cosmos-sdk v0.45.9
 	github.com/cosmos/ibc-go/v3 v3.3.0
 	github.com/gabriel-vasile/mimetype v1.4.1
@@ -23,7 +22,6 @@ require (
 	github.com/spf13/cobra v1.5.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.12.0
-	github.com/stretchr/testify v1.8.0
 	github.com/tendermint/tendermint v0.34.21
 	github.com/tendermint/tm-db v0.6.6
 	google.golang.org/genproto v0.0.0-20220725144611-272f38e5d71b
@@ -101,7 +99,6 @@ require (
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 // indirect
 	github.com/minio/highwayhash v1.0.2 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mr-tron/base58 v1.1.0 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
@@ -123,6 +120,7 @@ require (
 	github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect
 	github.com/spf13/afero v1.8.2 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/stretchr/testify v1.8.0 // indirect
 	github.com/subosito/gotenv v1.4.0 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca // indirect
 	github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
@@ -145,6 +143,7 @@ require (
 )
 
 replace (
+	github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
 	// Dragonberry fix
 	github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
 
@@ -152,9 +151,14 @@ replace (
 	github.com/cosmos/cosmos-sdk => github.com/cheqd/cosmos-sdk v0.45.9-cheqd-tag
 
 	// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
+	// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
 	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0
-
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
+	github.com/jhump/protoreflect => github.com/jhump/protoreflect v1.9.0
+
 	github.com/tecbot/gorocksdb => github.com/cosmos/gorocksdb v1.2.0
+
+	// latest grpc doesn't work with with our modified proto compiler, so we need to enforce
+	// the following version across all dependencies.
 	google.golang.org/grpc => google.golang.org/grpc v1.33.2
 )

From d54b6297d03b599126397e554741509b4e76a69b Mon Sep 17 00:00:00 2001
From: Ankur Banerjee <ankurdotb@users.noreply.github.com>
Date: Mon, 17 Oct 2022 21:35:58 +0100
Subject: [PATCH 45/76] Update go.sum

---
 go.sum | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/go.sum b/go.sum
index 818892a08..6f0daedad 100644
--- a/go.sum
+++ b/go.sum
@@ -37,8 +37,6 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 filippo.io/edwards25519 v1.0.0-beta.2 h1:/BZRNzm8N4K4eWfK28dL4yescorxtO7YG1yun8fy+pI=
 filippo.io/edwards25519 v1.0.0-beta.2/go.mod h1:X+pm78QAUPtFLi1z9PYIlS/bdDnvbCOGKtZ+ACWEf7o=
-github.com/99designs/keyring v1.1.6 h1:kVDC2uCgVwecxCk+9zoCt2uEL6dt+dfVzMvGgnVcIuM=
-github.com/99designs/keyring v1.1.6/go.mod h1:16e0ds7LGQQcT59QqkTg72Hh5ShM51Byv5PEmW6uoRU=
 github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4=
 github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc=
 github.com/Azure/azure-storage-blob-go v0.7.0/go.mod h1:f9YQKtsG1nMisotuTPpO0tjNuEjKRYAcJU8/ydDI++4=
@@ -121,7 +119,6 @@ github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+q
 github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
 github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts=
 github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ=
-github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o=
 github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
 github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
 github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I=
@@ -173,6 +170,8 @@ github.com/cosmos/iavl v0.19.3 h1:cESO0OwTTxQm5rmyESKW+zESheDUYI7CcZDWWDwnuxg=
 github.com/cosmos/iavl v0.19.3/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
 github.com/cosmos/ibc-go/v3 v3.3.0 h1:r8gYUvQreMQrf4R5RgedK9gcbjLk4uE2q6fuZGjf4n0=
 github.com/cosmos/ibc-go/v3 v3.3.0/go.mod h1:VUWLHw0C3USmTQZnTdkuXXdUdLbW8zsK3lV1Ieposog=
+github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 h1:DdzS1m6o/pCqeZ8VOAit/gyATedRgjvkVI+UCrLpyuU=
+github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76/go.mod h1:0mkLWIoZuQ7uBoospo5Q9zIpqq6rYCPJDSUdeCJvPM8=
 github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4=
 github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY=
 github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI=
@@ -347,6 +346,7 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa h1:Q75Upo5UN4JbPFURXZ8nLKYUvF85dyFRop/vQ0Rv+64=
@@ -453,7 +453,7 @@ github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH
 github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b h1:izTof8BKh/nE1wrKOrloNA5q4odOarjf+Xpe+4qow98=
+github.com/jhump/protoreflect v1.9.0 h1:npqHz788dryJiR/l6K/RUQAyh2SwV91+d1dnh4RjO9w=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U=
 github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ=
@@ -546,7 +546,6 @@ github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA
 github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
@@ -600,6 +599,8 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
+github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU=
+github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
@@ -1202,8 +1203,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

From 1e3c9e670acd398adc1bc3e4f4009ca461c9da5e Mon Sep 17 00:00:00 2001
From: Ankur Banerjee <ankurdotb@users.noreply.github.com>
Date: Mon, 17 Oct 2022 21:37:08 +0100
Subject: [PATCH 46/76] Update go.mod

---
 go.mod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index 95da11e32..19fa8d9d1 100644
--- a/go.mod
+++ b/go.mod
@@ -154,8 +154,8 @@ replace (
 	// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
 	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
-	github.com/jhump/protoreflect => github.com/jhump/protoreflect v1.9.0
 
+	github.com/jhump/protoreflect => github.com/jhump/protoreflect v1.9.0
 	github.com/tecbot/gorocksdb => github.com/cosmos/gorocksdb v1.2.0
 
 	// latest grpc doesn't work with with our modified proto compiler, so we need to enforce

From 128f2488c0577a2fa92139a532eec65893ff9181 Mon Sep 17 00:00:00 2001
From: Ankur Banerjee <ankurdotb@users.noreply.github.com>
Date: Mon, 17 Oct 2022 23:24:25 +0100
Subject: [PATCH 47/76] Update dispatch.yml

---
 .github/workflows/dispatch.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index 0bba1c544..39f23005f 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -9,17 +9,17 @@ jobs:
 
   call-lint:
     name: "Lint"
-    uses: cheqd/cheqd-node/.github/workflows/lint.yml@develop
+    uses: ./.github/workflows/lint.yml
 
   call-build:
     name: "Build"
     needs: call-lint
-    uses: cheqd/cheqd-node/.github/workflows/build.yml@develop
+    uses: ./.github/workflows/build.yml
   
   call-test:
     name: "Test"
     needs: call-build
-    uses: cheqd/cheqd-node/.github/workflows/test.yml@develop
+    uses: ./.github/workflows/test.yml
     secrets: inherit
 
   call-release:
@@ -27,5 +27,5 @@ jobs:
     needs: call-test
     # needs: call-build
     if: ${{ github.ref_protected == true }}
-    uses: cheqd/cheqd-node/.github/workflows/release.yml@develop
+    uses: ./.github/workflows/release.yml
     secrets: inherit

From c9de4dbe9b5fb448dfe24bc3e0c10ae9972d4cf3 Mon Sep 17 00:00:00 2001
From: Ankur Banerjee <ankurdotb@users.noreply.github.com>
Date: Mon, 17 Oct 2022 23:31:30 +0100
Subject: [PATCH 48/76] Update test.yml

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 595e045b1..9ba106cd2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
           go get github.com/onsi/gomega/...
 
       - name: Run Ginkgo tests
-        run: ginkgo -r --race --randomize-all --randomize-suites --junit-report report.xml
+        run: go run ./ginkgo -r --race --randomize-all --randomize-suites --junit-report report.xml
 
       # - uses: mikepenz/action-junit-report@v3
       #   if: success() || failure()        # run this step even if previous step failed

From 6ddda3eda12659216f43f3290955e97bfc11c45a Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Tue, 18 Oct 2022 16:04:14 +0300
Subject: [PATCH 49/76] Get rid of AfterEach functionality

---
 x/cheqd/types/did_did_test.go                 | 410 +++++++++---------
 x/cheqd/types/did_service_test.go             |  95 ++--
 x/cheqd/types/did_verification_method_test.go | 200 +++++----
 x/cheqd/types/tx_msg_create_did_test.go       |  54 ++-
 x/cheqd/types/tx_msg_update_did_test.go       |  74 ++--
 x/cheqd/types/tx_sign_ingo_test.go            | 178 ++++----
 6 files changed, 485 insertions(+), 526 deletions(-)

diff --git a/x/cheqd/types/did_did_test.go b/x/cheqd/types/did_did_test.go
index 53140c03a..d562aebe3 100644
--- a/x/cheqd/types/did_did_test.go
+++ b/x/cheqd/types/did_did_test.go
@@ -10,241 +10,221 @@ import (
 )
 
 var _ = Describe("DID Validation tests", func() {
-	var struct_ *Did
-	var allowedNamespaces []string
-	var isValid bool
-	var errorMsg string
-
-	BeforeEach(func() {
-		struct_ = &Did{}
-		allowedNamespaces = []string{}
-		isValid = false
-		errorMsg = ""
-	})
-
-	AfterEach(func() {
-		err := struct_.Validate(allowedNamespaces)
-
-		if isValid {
-			Expect(err).To(BeNil())
-		} else {
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(errorMsg))
-		}
-	})
-
-	When("DID is allowed", func() {
-		It("is valid", func() {
-			struct_ = &Did{
-				Id: ValidTestDID,
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyJwk:       nil,
-						PublicKeyMultibase: ValidEd25519PubKey,
-					},
-				},
+	type TestCaseDIDStruct struct {
+		did *Did
+		allowedNamespaces []string
+		isValid bool
+		errorMsg string
+	}
+
+	DescribeTable("DID Validation tests", func(testCase TestCaseDIDStruct) {
+
+			err := testCase.did.Validate(testCase.allowedNamespaces)
+
+			if testCase.isValid {
+				Expect(err).To(BeNil())
+			} else {
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring(testCase.errorMsg))
 			}
-			isValid = true
-			errorMsg = ""
-		})
-	})
-
-	When("DID is not allowed", func() {
-		It("should fail with error", func() {
-			struct_ = &Did{
-				Id: InvalidTestDID,
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyJwk:       nil,
-						PublicKeyMultibase: ValidEd25519PubKey,
+		},
+
+		Entry(
+			"Did is valid", 
+			TestCaseDIDStruct{
+				did: &Did{
+					Id: ValidTestDID,
+					VerificationMethod: []*VerificationMethod{
+						{
+							Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+							Type:               "Ed25519VerificationKey2020",
+							Controller:         ValidTestDID,
+							PublicKeyJwk:       nil,
+							PublicKeyMultibase: ValidEd25519PubKey,
+						},
 					},
 				},
-			}
-			isValid = false
-			errorMsg = "id: unable to split did into method, namespace and id; verification_method: (0: (id: must have prefix: badDid.).)."
-		})
-	})
-
-	When("Verification method is Ed25519VerificationKey2020", func() {
-		It("is valid", func() {
-			struct_ = &Did{
-				Id: ValidTestDID,
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyJwk:       nil,
-						PublicKeyMultibase: ValidEd25519PubKey,
+			isValid: true,
+			errorMsg: ""}),
+
+		Entry(
+			"DID is not allowed",
+			TestCaseDIDStruct{
+				did: &Did{
+					Id: InvalidTestDID,
+					VerificationMethod: []*VerificationMethod{
+						{
+							Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+							Type:               "Ed25519VerificationKey2020",
+							Controller:         ValidTestDID,
+							PublicKeyJwk:       nil,
+							PublicKeyMultibase: ValidEd25519PubKey,
+						},
 					},
 				},
-			}
-			isValid = true
-			errorMsg = ""
-		})
-	})
-
-	When("Verification method is jwk", func() {
-		It("is valid", func() {
-			struct_ = &Did{
-				Id: ValidTestDID,
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "JsonWebKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyJwk:       ValidPublicKeyJWK,
-						PublicKeyMultibase: "",
+				isValid: false,
+				errorMsg: "id: unable to split did into method, namespace and id; verification_method: (0: (id: must have prefix: badDid.).)."}),
+
+		Entry(
+			"Verification method is Ed25519VerificationKey2020",
+			TestCaseDIDStruct{
+				did: &Did{
+					Id: ValidTestDID,
+					VerificationMethod: []*VerificationMethod{
+						{
+							Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+							Type:               "Ed25519VerificationKey2020",
+							Controller:         ValidTestDID,
+							PublicKeyJwk:       nil,
+							PublicKeyMultibase: ValidEd25519PubKey,
+						},
 					},
 				},
-			}
-			isValid = true
-			errorMsg = ""
-		})
-	})
-
-	When("verification method has wrong id", func() {
-		It("should fail with corresponding error", func() {
-			struct_ = &Did{
-				Id: ValidTestDID,
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 InvalidTestDID,
-						Type:               "JsonWebKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyJwk:       ValidPublicKeyJWK,
-						PublicKeyMultibase: "",
+				isValid: true,
+				errorMsg: ""}),
+
+		Entry(
+			"Verification method is jwk", 
+			TestCaseDIDStruct{
+				did: &Did{
+					Id: ValidTestDID,
+					VerificationMethod: []*VerificationMethod{
+						{
+							Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+							Type:               "JsonWebKey2020",
+							Controller:         ValidTestDID,
+							PublicKeyJwk:       ValidPublicKeyJWK,
+							PublicKeyMultibase: "",
+						},
 					},
 				},
-			}
-			isValid = false
-			errorMsg = "verification_method: (0: (id: unable to split did into method, namespace and id.).)."
-		})
-	})
-	When("verification method has wrong controller", func() {
-		It("should fail with corresponding error", func() {
-			struct_ = &Did{
-				Id: ValidTestDID,
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "JsonWebKey2020",
-						Controller:         InvalidTestDID,
-						PublicKeyJwk:       ValidPublicKeyJWK,
-						PublicKeyMultibase: "",
+				isValid: true,
+				errorMsg: ""}),
+
+		Entry("Verification method has wrong id", 
+			TestCaseDIDStruct{
+				did: &Did{
+					Id: ValidTestDID,
+					VerificationMethod: []*VerificationMethod{
+						{
+							Id:                 InvalidTestDID,
+							Type:               "JsonWebKey2020",
+							Controller:         ValidTestDID,
+							PublicKeyJwk:       ValidPublicKeyJWK,
+							PublicKeyMultibase: "",
+						},
 					},
 				},
-			}
-			isValid = false
-			errorMsg = "verification_method: (0: (controller: unable to split did into method, namespace and id.).)."
-		})
-	})
-
-	When("list of DIDs in cotroller is allowed", func() {
-		It("s valid", func() {
-			struct_ = &Did{
-				Id:         ValidTestDID,
-				Controller: []string{ValidTestDID, ValidTestDID2},
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyMultibase: ValidEd25519PubKey,
+				isValid: false,
+				errorMsg: "verification_method: (0: (id: unable to split did into method, namespace and id.).)."}),
+		Entry(
+			"Verification method has wrong controller", 
+			TestCaseDIDStruct{
+				did: &Did{
+					Id: ValidTestDID,
+					VerificationMethod: []*VerificationMethod{
+						{
+							Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+							Type:               "JsonWebKey2020",
+							Controller:         InvalidTestDID,
+							PublicKeyJwk:       ValidPublicKeyJWK,
+							PublicKeyMultibase: "",
+						},
 					},
 				},
-			}
-			isValid = true
-			errorMsg = ""
-		})
-	})
-
-	When("list of DIDs in cotroller is not allowed", func() {
-		It("should fail with corresponding error", func() {
-			struct_ = &Did{
-				Context:    nil,
-				Id:         ValidTestDID,
-				Controller: []string{ValidTestDID, InvalidTestDID},
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyMultibase: ValidEd25519PubKey,
+				isValid: false,
+				errorMsg: "verification_method: (0: (controller: unable to split did into method, namespace and id.).)."}),
+		Entry(
+			"List of DIDs in cotroller is allowed", 
+			TestCaseDIDStruct{
+				did: &Did{
+					Id:         ValidTestDID,
+					Controller: []string{ValidTestDID, ValidTestDID2},
+					VerificationMethod: []*VerificationMethod{
+						{
+							Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+							Type:               "Ed25519VerificationKey2020",
+							Controller:         ValidTestDID,
+							PublicKeyMultibase: ValidEd25519PubKey,
+						},
 					},
 				},
-			}
-			isValid = false
-			errorMsg = "controller: (1: unable to split did into method, namespace and id.)."
-		})
-	})
-
-	When("namespace in controleer is not in list of allowed", func() {
-		It("should fail", func() {
-			struct_ = &Did{
-				Id:         ValidTestDID,
-				Controller: []string{ValidTestDID},
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyMultibase: ValidEd25519PubKey,
+				isValid: true,
+				errorMsg: ""}),
+		Entry(
+			"List of DIDs in cotroller is not allowed", 
+			TestCaseDIDStruct{
+				did: &Did{
+					Context:    nil,
+					Id:         ValidTestDID,
+					Controller: []string{ValidTestDID, InvalidTestDID},
+					VerificationMethod: []*VerificationMethod{
+						{
+							Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+							Type:               "Ed25519VerificationKey2020",
+							Controller:         ValidTestDID,
+							PublicKeyMultibase: ValidEd25519PubKey,
+						},
 					},
 				},
-			}
-			allowedNamespaces = []string{"mainnet"}
-			isValid = false
-			errorMsg = "controller: (0: did namespace must be one of: mainnet.); id: did namespace must be one of: mainnet; verification_method: (0: (controller: did namespace must be one of: mainnet; id: did namespace must be one of: mainnet.).)."
-		})
-	})
-
-	When("controller is duplicated", func() {
-		It("should fail", func() {
-			struct_ = &Did{
-				Id:         ValidTestDID,
-				Controller: []string{ValidTestDID, ValidTestDID},
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyMultibase: ValidEd25519PubKey,
+				isValid: false,
+				errorMsg: "controller: (1: unable to split did into method, namespace and id.)."}),
+		Entry(
+			"Namespace in controler is not in list of allowed", 
+			TestCaseDIDStruct{
+				did: &Did{
+					Id:         ValidTestDID,
+					Controller: []string{ValidTestDID},
+					VerificationMethod: []*VerificationMethod{
+						{
+							Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+							Type:               "Ed25519VerificationKey2020",
+							Controller:         ValidTestDID,
+							PublicKeyMultibase: ValidEd25519PubKey,
+						},
 					},
 				},
-			}
-			isValid = false
-			errorMsg = "controller: there should be no duplicates."
-		})
-	})
-
-	When("verification method is duplicated", func() {
-		It("should fail", func() {
-			struct_ = &Did{
-				Id: ValidTestDID,
-				VerificationMethod: []*VerificationMethod{
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyMultibase: ValidEd25519PubKey,
+				allowedNamespaces: []string{"mainnet"},
+				isValid: false,
+				errorMsg: "controller: (0: did namespace must be one of: mainnet.); id: did namespace must be one of: mainnet; verification_method: (0: (controller: did namespace must be one of: mainnet; id: did namespace must be one of: mainnet.).)."}),
+		Entry(
+			"Controller is duplicated", 
+			TestCaseDIDStruct{
+				did: &Did{
+					Id:         ValidTestDID,
+					Controller: []string{ValidTestDID, ValidTestDID},
+					VerificationMethod: []*VerificationMethod{
+						{
+							Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+							Type:               "Ed25519VerificationKey2020",
+							Controller:         ValidTestDID,
+							PublicKeyMultibase: ValidEd25519PubKey,
+						},
 					},
-					{
-						Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
-						Type:               "Ed25519VerificationKey2020",
-						Controller:         ValidTestDID,
-						PublicKeyMultibase: ValidEd25519PubKey,
+				},
+				isValid: false,
+				errorMsg: "controller: there should be no duplicates."}),
+		Entry(
+			"Verification method is duplicated",
+			TestCaseDIDStruct{
+				did: &Did{
+					Id: ValidTestDID,
+					VerificationMethod: []*VerificationMethod{
+						{
+							Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+							Type:               "Ed25519VerificationKey2020",
+							Controller:         ValidTestDID,
+							PublicKeyMultibase: ValidEd25519PubKey,
+						},
+						{
+							Id:                 fmt.Sprintf("%s#fragment", ValidTestDID),
+							Type:               "Ed25519VerificationKey2020",
+							Controller:         ValidTestDID,
+							PublicKeyMultibase: ValidEd25519PubKey,
+						},
 					},
 				},
-			}
-			isValid = false
-			errorMsg = "verification_method: there are verification method duplicates."
-		})
-	})
+				isValid: false,
+				errorMsg: "verification_method: there are verification method duplicates."}),
+	)
 })
diff --git a/x/cheqd/types/did_service_test.go b/x/cheqd/types/did_service_test.go
index b2b47c9c2..6fdf18fe6 100644
--- a/x/cheqd/types/did_service_test.go
+++ b/x/cheqd/types/did_service_test.go
@@ -7,67 +7,64 @@ import (
 	. "github.com/cheqd/cheqd-node/x/cheqd/types"
 )
 
-var _ = Describe("DID Validation tests", func() {
-	var struct_ Service
-	var baseDid string
-	var allowedNamespaces []string
-	var isValid bool
-	var errorMsg string
+var _ = Describe("Service tests", func() {
+	type TestCaseServiceStruct struct {
+		service *Service
+		baseDid string
+		allowedNamespaces []string
+		isValid bool
+		errorMsg string
+	}
 
-	BeforeEach(func() {
-		struct_ = Service{}
-		baseDid = ""
-		allowedNamespaces = []string{}
-		isValid = false
-		errorMsg = ""
-	})
+	DescribeTable("Service Validation tests", func(testCase TestCaseServiceStruct) {
+		err := testCase.service.Validate(testCase.baseDid, testCase.allowedNamespaces)
 
-	AfterEach(func() {
-		err := struct_.Validate(baseDid, allowedNamespaces)
-
-		if isValid {
+		if testCase.isValid {
 			Expect(err).To(BeNil())
 		} else {
 			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(errorMsg))
+			Expect(err.Error()).To(ContainSubstring(testCase.errorMsg))
 		}
-	})
+	},
 
-	It("Positive case", func() {
-		struct_ = Service{
-			Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
-			Type:            "DIDCommMessaging",
-			ServiceEndpoint: "endpoint",
-		}
-		baseDid = "did:cheqd:aaaaaaaaaaaaaaaa"
-		allowedNamespaces = []string{""}
-		isValid = true
-		errorMsg = ""
-	})
+	Entry(
+		"Positive case", 
+		TestCaseServiceStruct{
+			service: &Service{
+				Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
+				Type:            "DIDCommMessaging",
+				ServiceEndpoint: "endpoint",
+			},
+			baseDid: "did:cheqd:aaaaaaaaaaaaaaaa",
+			allowedNamespaces: []string{""},
+			isValid: true,
+			errorMsg: "",
+		}),
 
-	When("Namespace is not allowed", func() {
-		It("should fail", func() {
-			struct_ = Service{
+	Entry(
+		"Namespace is not allowed", 
+		TestCaseServiceStruct{
+			service: &Service{
 				Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
 				Type:            "DIDCommMessaging",
 				ServiceEndpoint: "endpoint",
-			}
-			allowedNamespaces = []string{"mainnet"}
-			isValid = false
-			errorMsg = "id: did namespace must be one of: mainnet."
-		})
-	})
+			},
+			allowedNamespaces: []string{"mainnet"},
+			isValid: false,
+			errorMsg: "id: did namespace must be one of: mainnet.",
+		}),
 
-	When("base DID is not the same as in id", func() {
-		It("should fail", func() {
-			struct_ = Service{
+	Entry(
+		"Base DID is not the same as in id", 
+		TestCaseServiceStruct{ 
+			service: &Service{
 				Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
 				Type:            "DIDCommMessaging",
 				ServiceEndpoint: "endpoint",
-			}
-			baseDid = "did:cheqd:baaaaaaaaaaaaaab"
-			isValid = false
-			errorMsg = "id: must have prefix: did:cheqd:baaaaaaaaaaaaaab."
-		})
-	})
-})
+			},
+			baseDid: "did:cheqd:baaaaaaaaaaaaaab",
+			isValid: false,
+			errorMsg: "id: must have prefix: did:cheqd:baaaaaaaaaaaaaab.",
+		}),
+	)
+})
\ No newline at end of file
diff --git a/x/cheqd/types/did_verification_method_test.go b/x/cheqd/types/did_verification_method_test.go
index c1e4e7f09..e2210402a 100644
--- a/x/cheqd/types/did_verification_method_test.go
+++ b/x/cheqd/types/did_verification_method_test.go
@@ -16,158 +16,152 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("Verification Method Validation tests", func() {
-	var struct_ VerificationMethod
-	var baseDid string
-	var allowedNamespaces []string
-	var isValid bool
-	var errorMsg string
-
-	BeforeEach(func() {
-		struct_ = VerificationMethod{}
-		baseDid = ""
-		allowedNamespaces = []string{}
-		isValid = false
-		errorMsg = ""
-	})
-
-	AfterEach(func() {
-		err := struct_.Validate(baseDid, allowedNamespaces)
-
-		if isValid {
+var _ = Describe("Verification Method tests", func() {
+	type TestCaseVerificationMethodStruct struct {
+		vm VerificationMethod
+		baseDid string
+		allowedNamespaces []string
+		isValid bool
+		errorMsg string
+	}
+
+	DescribeTable("Verification Method Validation tests", func(testCase TestCaseVerificationMethodStruct) {
+	
+		err := testCase.vm.Validate(testCase.baseDid, testCase.allowedNamespaces)
+
+		if testCase.isValid {
 			Expect(err).To(BeNil())
 		} else {
 			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(errorMsg))
+			Expect(err.Error()).To(ContainSubstring(testCase.errorMsg))
 		}
-	})
-	When("verification method with expected multibase key", func() {
-		It("is valid", func() {
-			struct_ = VerificationMethod{
+	},
+
+	Entry(
+		"Verification method with expected multibase key", 
+		TestCaseVerificationMethodStruct{
+			vm: VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
 				Type:               "Ed25519VerificationKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       nil,
 				PublicKeyMultibase: ValidEd25519PubKey,
-			}
-			isValid = true
-			errorMsg = ""
-		})
-	})
-
-	When("verification method with expected jwk key", func() {
-		It("is valid", func() {
-			struct_ = VerificationMethod{
+			},
+			isValid: true,
+			errorMsg: "",
+		}),
+
+	Entry(
+		"Verification method with expected jwk key", 
+		TestCaseVerificationMethodStruct{
+			vm: VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#rty",
 				Type:               "JsonWebKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       ValidPublicKeyJWK,
 				PublicKeyMultibase: "",
-			}
-			isValid = true
-			errorMsg = ""
-		})
-	})
-
-	When("id has expected DID as a base", func() {
-		It("is valid", func() {
-			struct_ = VerificationMethod{
+			},
+			isValid: true,
+			errorMsg: "",
+		}),
+
+	Entry(
+		"Id has expected DID as a base", 
+		TestCaseVerificationMethodStruct{
+			vm: VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#rty",
 				Type:               "JsonWebKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       ValidPublicKeyJWK,
 				PublicKeyMultibase: "",
-			}
-			baseDid = "did:cheqd:aaaaaaaaaaaaaaaa"
-			isValid = true
-			errorMsg = ""
-		})
-	})
-
-	When("id does not have expected DID as a base", func() {
-		It("should fail", func() {
-			struct_ = VerificationMethod{
+			},
+			baseDid: "did:cheqd:aaaaaaaaaaaaaaaa",
+			isValid: true,
+			errorMsg: "",
+		}),
+
+	Entry(
+		"Id does not have expected DID as a base", 
+		TestCaseVerificationMethodStruct{
+			vm: VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#rty",
 				Type:               "JsonWebKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       ValidPublicKeyJWK,
 				PublicKeyMultibase: "",
-			}
-			baseDid = "did:cheqd:bbbbbbbbbbbbbbbb"
-			isValid = false
-			errorMsg = "id: must have prefix: did:cheqd:bbbbbbbbbbbbbbbb."
-		})
-	})
-
-	When("namespace is allowed", func() {
-		It("is valid", func() {
-			struct_ = VerificationMethod{
+			},
+			baseDid: "did:cheqd:bbbbbbbbbbbbbbbb",
+			isValid: false,
+			errorMsg: "id: must have prefix: did:cheqd:bbbbbbbbbbbbbbbb.",
+		}),
+
+	Entry(
+		"Namespace is allowed", 
+		TestCaseVerificationMethodStruct{
+			vm: VerificationMethod{
 				Id:                 "did:cheqd:mainnet:aaaaaaaaaaaaaaaa#rty",
 				Type:               "JsonWebKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       ValidPublicKeyJWK,
 				PublicKeyMultibase: "",
-			}
-			allowedNamespaces = []string{"mainnet", ""}
-			isValid = true
-		})
-	})
-
-	When("namespace is not allowed", func() {
-		It("should fail", func() {
-			struct_ = VerificationMethod{
+			},
+			allowedNamespaces: []string{"mainnet", ""},
+			isValid: true,
+		}),
+
+	Entry(
+		"Namespace is not allowed", 
+		TestCaseVerificationMethodStruct{
+			vm: VerificationMethod{
 				Id:                 "did:cheqd:mainnet:aaaaaaaaaaaaaaaa#rty",
 				Type:               "JsonWebKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       ValidPublicKeyJWK,
 				PublicKeyMultibase: "",
-			}
-			allowedNamespaces = []string{"testnet"}
-			isValid = false
-			errorMsg = "controller: did namespace must be one of: testnet; id: did namespace must be one of: testnet."
-		})
-	})
-
-	When("JWK key has expected format", func() {
-		It("is valid", func() {
-			struct_ = VerificationMethod{
+			},
+			allowedNamespaces: []string{"testnet"},
+			isValid: false,
+			errorMsg: "controller: did namespace must be one of: testnet; id: did namespace must be one of: testnet.",
+		}),
+	Entry(
+		"JWK key has expected format", 
+		TestCaseVerificationMethodStruct{
+			vm: VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
 				Type:               "JsonWebKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       ValidPublicKeyJWK,
 				PublicKeyMultibase: "",
-			}
-			isValid = true
-		})
-	})
-
-	When("JWK key has unexpected format", func() {
-		It("is not valid", func() {
-			struct_ = VerificationMethod{
+			},
+			isValid: true,
+		}),
+	Entry(
+		"JWK key has unexpected format", 
+		TestCaseVerificationMethodStruct{
+			vm: VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
 				Type:               "JsonWebKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       NotValidPublicKeyJWK,
 				PublicKeyMultibase: "",
-			}
-			isValid = false
-			errorMsg = "public_key_jwk: can't parse jwk: failed to parse key: invalid key type from JSON (SomeOtherKeyType)."
-		})
-	})
-
-	When("not all keys and valuesin JWK have expected format", func() {
-		It("should fail", func() {
-			struct_ = VerificationMethod{
+			},
+			isValid: false,
+			errorMsg: "public_key_jwk: can't parse jwk: failed to parse key: invalid key type from JSON (SomeOtherKeyType).",
+		}),
+	Entry(
+		"Not all keys and valuesin JWK have expected format", 
+		TestCaseVerificationMethodStruct{
+			vm: VerificationMethod{
 				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
 				Type:               "JsonWebKey2020",
 				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
 				PublicKeyJwk:       append(ValidPublicKeyJWK, &KeyValuePair{Key: "", Value: ""}),
 				PublicKeyMultibase: "",
-			}
-			isValid = false
-			errorMsg = "public_key_jwk: (6: (key: cannot be blank; value: cannot be blank.).)."
-		})
-	})
+			},
+			isValid: false,
+			errorMsg: "public_key_jwk: (6: (key: cannot be blank; value: cannot be blank.).).",
+		}),
+	)
 })
 
 var _ = Describe("Validation ed25519 Signature in verification method", func() {
diff --git a/x/cheqd/types/tx_msg_create_did_test.go b/x/cheqd/types/tx_msg_create_did_test.go
index 714504135..b54d5a01b 100644
--- a/x/cheqd/types/tx_msg_create_did_test.go
+++ b/x/cheqd/types/tx_msg_create_did_test.go
@@ -8,30 +8,27 @@ import (
 )
 
 var _ = Describe("Message for DID creation", func() {
-	var struct_ *MsgCreateDid
-	var isValid bool
-	var errorMsg string
+	type TestCaseMsgCreateDID struct {
+		msg *MsgCreateDid
+		isValid bool
+		errorMsg string
+	}
 
-	BeforeEach(func() {
-		struct_ = &MsgCreateDid{}
-		isValid = false
-		errorMsg = ""
-	})
+	DescribeTable("Tests for message for DID creation", func(testCase TestCaseMsgCreateDID) {
+		err := testCase.msg.ValidateBasic()
 
-	AfterEach(func() {
-		err := struct_.ValidateBasic()
-
-		if isValid {
+		if testCase.isValid {
 			Expect(err).To(BeNil())
 		} else {
 			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(errorMsg))
+			Expect(err.Error()).To(ContainSubstring(testCase.errorMsg))
 		}
-	})
+	},
 
-	When("all fields are set properly", func() {
-		It("should pass", func() {
-			struct_ = &MsgCreateDid{
+	Entry(
+		"All fields are set properly", 
+		TestCaseMsgCreateDID{
+			msg: &MsgCreateDid{
 				Payload: &MsgCreateDidPayload{
 					Id: "did:cheqd:testnet:123456789abcdefg",
 					VerificationMethod: []*VerificationMethod{
@@ -45,14 +42,13 @@ var _ = Describe("Message for DID creation", func() {
 					Authentication: []string{"did:cheqd:testnet:123456789abcdefg#key1", "did:cheqd:testnet:123456789abcdefg#aaa"},
 				},
 				Signatures: nil,
-			}
-			isValid = true
-		})
-	})
+			},
+			isValid: true}),
 
-	When("IDs are duplicated", func() {
-		It("should fail the validation", func() {
-			struct_ = &MsgCreateDid{
+	Entry(
+		"IDs are duplicated", 
+		TestCaseMsgCreateDID{
+			msg: &MsgCreateDid{
 				Payload: &MsgCreateDidPayload{
 					Id: "did:cheqd:testnet:123456789abcdefg",
 					VerificationMethod: []*VerificationMethod{
@@ -66,9 +62,9 @@ var _ = Describe("Message for DID creation", func() {
 					Authentication: []string{"did:cheqd:testnet:123456789abcdefg#key1", "did:cheqd:testnet:123456789abcdefg#key1"},
 				},
 				Signatures: nil,
-			}
-			isValid = false
-			errorMsg = "payload: (authentication: there should be no duplicates.).: basic validation failed"
-		})
-	})
+			},
+			isValid: false,
+			errorMsg: "payload: (authentication: there should be no duplicates.).: basic validation failed",
+		}),
+	)
 })
diff --git a/x/cheqd/types/tx_msg_update_did_test.go b/x/cheqd/types/tx_msg_update_did_test.go
index c29f35982..0a24f35c3 100644
--- a/x/cheqd/types/tx_msg_update_did_test.go
+++ b/x/cheqd/types/tx_msg_update_did_test.go
@@ -7,31 +7,28 @@ import (
 	. "github.com/cheqd/cheqd-node/x/cheqd/types"
 )
 
-var _ = Describe("Message for DID creation", func() {
-	var struct_ *MsgUpdateDid
-	var isValid bool
-	var errorMsg string
+var _ = Describe("Message for DID updating", func() {
+	type TestCaseMsgUpdateDID struct {
+		msg *MsgUpdateDid
+		isValid bool
+		errorMsg string
+	}
 
-	BeforeEach(func() {
-		struct_ = &MsgUpdateDid{}
-		isValid = false
-		errorMsg = ""
-	})
+	DescribeTable("Tests for message for DID updating", func(testCase TestCaseMsgUpdateDID) {
+		err := testCase.msg.ValidateBasic()
 
-	AfterEach(func() {
-		err := struct_.ValidateBasic()
-
-		if isValid {
+		if testCase.isValid {
 			Expect(err).To(BeNil())
 		} else {
 			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(errorMsg))
+			Expect(err.Error()).To(ContainSubstring(testCase.errorMsg))
 		}
-	})
+	},
 
-	When("all fields are set properly", func() {
-		It("Will pass", func() {
-			struct_ = &MsgUpdateDid{
+	Entry(
+		"All fields are set properly", 
+		TestCaseMsgUpdateDID{
+			msg: &MsgUpdateDid{
 				Payload: &MsgUpdateDidPayload{
 					Id: "did:cheqd:testnet:123456789abcdefg",
 					VerificationMethod: []*VerificationMethod{
@@ -46,14 +43,14 @@ var _ = Describe("Message for DID creation", func() {
 					VersionId:      "version1",
 				},
 				Signatures: nil,
-			}
-			isValid = true
-		})
-	})
+			},
+			isValid: true,
+		}),
 
-	When("IDs are duplicated", func() {
-		It("should fail the validation", func() {
-			struct_ = &MsgUpdateDid{
+	Entry(
+		"IDs are duplicated", 
+		TestCaseMsgUpdateDID{
+			msg: &MsgUpdateDid{
 				Payload: &MsgUpdateDidPayload{
 					Id: "did:cheqd:testnet:123456789abcdefg",
 					VerificationMethod: []*VerificationMethod{
@@ -68,15 +65,14 @@ var _ = Describe("Message for DID creation", func() {
 					VersionId:      "version1",
 				},
 				Signatures: nil,
-			}
-			isValid = false
-			errorMsg = "payload: (authentication: there should be no duplicates.).: basic validation failed"
-		})
-	})
-
-	When("VersionId is empty", func() {
-		It("should fail on validation", func() {
-			struct_ = &MsgUpdateDid{
+			},
+			isValid: false,
+			errorMsg: "payload: (authentication: there should be no duplicates.).: basic validation failed",
+		}),
+	Entry(
+		"VersionId is empty", 
+		TestCaseMsgUpdateDID{
+			msg: &MsgUpdateDid{
 				Payload: &MsgUpdateDidPayload{
 					Id: "did:cheqd:testnet:123456789abcdefg",
 					VerificationMethod: []*VerificationMethod{
@@ -90,9 +86,9 @@ var _ = Describe("Message for DID creation", func() {
 					Authentication: []string{"did:cheqd:testnet:123456789abcdefg#key1", "did:cheqd:testnet:123456789abcdefg#aaa"},
 				},
 				Signatures: nil,
-			}
-			isValid = false
-			errorMsg = "payload: (version_id: cannot be blank.).: basic validation failed"
-		})
-	})
+			},
+			isValid: false,
+			errorMsg: "payload: (version_id: cannot be blank.).: basic validation failed",
+		}),
+	)
 })
diff --git a/x/cheqd/types/tx_sign_ingo_test.go b/x/cheqd/types/tx_sign_ingo_test.go
index 597e9616c..d78293eec 100644
--- a/x/cheqd/types/tx_sign_ingo_test.go
+++ b/x/cheqd/types/tx_sign_ingo_test.go
@@ -7,80 +7,76 @@ import (
 	. "github.com/cheqd/cheqd-node/x/cheqd/types"
 )
 
-var _ = Describe("SignInfo validation tests", func() {
-	var struct_ SignInfo
-	var allowedNamespaces []string
-	var isValid bool
-	var errorMsg string
-
-	BeforeEach(func() {
-		struct_ = SignInfo{}
-		allowedNamespaces = []string{}
-		isValid = false
-		errorMsg = ""
-	})
-
-	AfterEach(func() {
-		err := struct_.Validate(allowedNamespaces)
-
-		if isValid {
+var _ = Describe("SignInfo tests", func() {
+	type TestCaseSignInfoStruct struct {
+		si SignInfo
+		allowedNamespaces []string
+		isValid bool
+		errorMsg string
+	}
+
+	DescribeTable("SignInfo validation tests", func(testCase TestCaseSignInfoStruct) {
+		err := testCase.si.Validate(testCase.allowedNamespaces)
+
+		if testCase.isValid {
 			Expect(err).To(BeNil())
 		} else {
 			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(errorMsg))
+			Expect(err.Error()).To(ContainSubstring(testCase.errorMsg))
 		}
-	})
-
-	It("Positive case", func() {
-		struct_ = SignInfo{
-			VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
-			Signature:            "aaa=",
-		}
-		isValid = true
-		errorMsg = ""
-	})
-
-	When("namespace is not allowed", func() {
-		It("should fail", func() {
-			struct_ = SignInfo{
+	},
+
+	Entry(
+		"Positive case", 
+		TestCaseSignInfoStruct{
+			si: SignInfo{
+				VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
+				Signature:            "aaa=",
+			},
+			isValid: true,
+			errorMsg: "",
+		}),
+
+	Entry(
+		"Namespace is not allowed", 
+		TestCaseSignInfoStruct{
+			si: SignInfo{
 				VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#service1",
 				Signature:            "DIDCommMessaging",
-			}
-			allowedNamespaces = []string{"mainnet"}
-			isValid = false
-			errorMsg = "verification_method_id: did namespace must be one of: mainnet."
-		})
-	})
-
-	When("signature is not valid base64 string", func() {
-		It("should fail", func() {
-			struct_ = SignInfo{
+			},
+			allowedNamespaces: []string{"mainnet"},
+			isValid: false,
+			errorMsg: "verification_method_id: did namespace must be one of: mainnet.",
+		}),
+
+	Entry(
+		"Signature is not valid base64 string", 
+		TestCaseSignInfoStruct{
+			si: SignInfo{
 				VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#service1",
 				Signature:            "!@#",
-			}
-			isValid = false
-			errorMsg = "signature: must be encoded in Base64."
-		})
-	})
+			},
+			isValid: false,
+			errorMsg: "signature: must be encoded in Base64.",
+		}),
+	)
 })
 
 var _ = Describe("Full SignInfo duplicates tests", func() {
-	var structs_ []*SignInfo
-	var isValid bool
-
-	BeforeEach(func() {
-		structs_ = []*SignInfo{}
-		isValid = false
-	})
-
-	AfterEach(func() {
-		res_ := IsUniqueSignInfoList(structs_)
-		Expect(res_).To(Equal(isValid))
-	})
-
-	When("signatures are different", func() {
-		It("should pass", func() {
-			structs_ = []*SignInfo{
+	type TestCaseSignInfosStruct struct {
+		signInfos []*SignInfo 
+		isValid bool
+	}
+
+	DescribeTable("SignInfo duplicates tests", func(testCase TestCaseSignInfosStruct) {
+		res_ := IsUniqueSignInfoList(testCase.signInfos)
+		Expect(res_).To(Equal(testCase.isValid))
+	},
+
+	Entry(
+		"Signatures are different", 
+		TestCaseSignInfosStruct{
+			signInfos: []*SignInfo{
 				{
 					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
 					Signature:            "aaa=",
@@ -89,14 +85,14 @@ var _ = Describe("Full SignInfo duplicates tests", func() {
 					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
 					Signature:            "bbb=",
 				},
-			}
-			isValid = true
-		})
-	})
-
-	When("all fields are different", func() {
-		It("should pass", func() {
-			structs_ = []*SignInfo{
+			},
+			isValid: true,
+		}),
+
+	Entry(
+		"All fields are different", 
+		TestCaseSignInfosStruct{
+			signInfos: []*SignInfo{
 				{
 					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
 					Signature:            "aaa=",
@@ -105,14 +101,14 @@ var _ = Describe("Full SignInfo duplicates tests", func() {
 					VerificationMethodId: "did:cheqd:bbbbbbbbbbbbbbbb#method1",
 					Signature:            "bbb=",
 				},
-			}
-			isValid = true
-		})
-	})
-
-	When("all fields are the same", func() {
-		It("should fail", func() {
-			structs_ = []*SignInfo{
+			},
+			isValid: true,
+		}),
+
+	Entry(
+		"All fields are the same", 
+		TestCaseSignInfosStruct{
+			signInfos: []*SignInfo{
 				{
 					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
 					Signature:            "aaa=",
@@ -121,14 +117,14 @@ var _ = Describe("Full SignInfo duplicates tests", func() {
 					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
 					Signature:            "aaa=",
 				},
-			}
-			isValid = false
-		})
-	})
-
-	When("all fields are the same and more elments", func() {
-		It("should fail", func() {
-			structs_ = []*SignInfo{
+			},
+			isValid: false,
+		}),
+
+	Entry(
+		"All fields are the same and more elments", 
+		TestCaseSignInfosStruct{
+			signInfos: []*SignInfo{
 				{
 					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
 					Signature:            "aaa=",
@@ -141,8 +137,8 @@ var _ = Describe("Full SignInfo duplicates tests", func() {
 					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
 					Signature:            "aaa=",
 				},
-			}
-			isValid = false
-		})
-	})
+			},
+			isValid: false,
+		}),
+	)
 })

From 38bf67111dbed6900e224a5a32b9d4d3d5ab7148 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Tue, 18 Oct 2022 16:43:36 +0300
Subject: [PATCH 50/76] Makes linter happy

---
 x/cheqd/types/did_did_test.go                 |  94 ++++---
 x/cheqd/types/did_service_test.go             |  84 +++---
 x/cheqd/types/did_verification_method_test.go | 257 +++++++++---------
 x/cheqd/types/tx_msg_create_did_test.go       |  73 ++---
 x/cheqd/types/tx_msg_update_did_test.go       | 114 ++++----
 x/cheqd/types/tx_sign_ingo_test.go            | 192 ++++++-------
 6 files changed, 412 insertions(+), 402 deletions(-)

diff --git a/x/cheqd/types/did_did_test.go b/x/cheqd/types/did_did_test.go
index d562aebe3..981612ed0 100644
--- a/x/cheqd/types/did_did_test.go
+++ b/x/cheqd/types/did_did_test.go
@@ -11,26 +11,25 @@ import (
 
 var _ = Describe("DID Validation tests", func() {
 	type TestCaseDIDStruct struct {
-		did *Did
+		did               *Did
 		allowedNamespaces []string
-		isValid bool
-		errorMsg string
+		isValid           bool
+		errorMsg          string
 	}
 
 	DescribeTable("DID Validation tests", func(testCase TestCaseDIDStruct) {
+		err := testCase.did.Validate(testCase.allowedNamespaces)
 
-			err := testCase.did.Validate(testCase.allowedNamespaces)
-
-			if testCase.isValid {
-				Expect(err).To(BeNil())
-			} else {
-				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring(testCase.errorMsg))
-			}
-		},
+		if testCase.isValid {
+			Expect(err).To(BeNil())
+		} else {
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(testCase.errorMsg))
+		}
+	},
 
 		Entry(
-			"Did is valid", 
+			"Did is valid",
 			TestCaseDIDStruct{
 				did: &Did{
 					Id: ValidTestDID,
@@ -44,8 +43,9 @@ var _ = Describe("DID Validation tests", func() {
 						},
 					},
 				},
-			isValid: true,
-			errorMsg: ""}),
+				isValid:  true,
+				errorMsg: "",
+			}),
 
 		Entry(
 			"DID is not allowed",
@@ -62,8 +62,9 @@ var _ = Describe("DID Validation tests", func() {
 						},
 					},
 				},
-				isValid: false,
-				errorMsg: "id: unable to split did into method, namespace and id; verification_method: (0: (id: must have prefix: badDid.).)."}),
+				isValid:  false,
+				errorMsg: "id: unable to split did into method, namespace and id; verification_method: (0: (id: must have prefix: badDid.).).",
+			}),
 
 		Entry(
 			"Verification method is Ed25519VerificationKey2020",
@@ -80,11 +81,12 @@ var _ = Describe("DID Validation tests", func() {
 						},
 					},
 				},
-				isValid: true,
-				errorMsg: ""}),
+				isValid:  true,
+				errorMsg: "",
+			}),
 
 		Entry(
-			"Verification method is jwk", 
+			"Verification method is jwk",
 			TestCaseDIDStruct{
 				did: &Did{
 					Id: ValidTestDID,
@@ -98,10 +100,11 @@ var _ = Describe("DID Validation tests", func() {
 						},
 					},
 				},
-				isValid: true,
-				errorMsg: ""}),
+				isValid:  true,
+				errorMsg: "",
+			}),
 
-		Entry("Verification method has wrong id", 
+		Entry("Verification method has wrong id",
 			TestCaseDIDStruct{
 				did: &Did{
 					Id: ValidTestDID,
@@ -115,10 +118,11 @@ var _ = Describe("DID Validation tests", func() {
 						},
 					},
 				},
-				isValid: false,
-				errorMsg: "verification_method: (0: (id: unable to split did into method, namespace and id.).)."}),
+				isValid:  false,
+				errorMsg: "verification_method: (0: (id: unable to split did into method, namespace and id.).).",
+			}),
 		Entry(
-			"Verification method has wrong controller", 
+			"Verification method has wrong controller",
 			TestCaseDIDStruct{
 				did: &Did{
 					Id: ValidTestDID,
@@ -132,10 +136,11 @@ var _ = Describe("DID Validation tests", func() {
 						},
 					},
 				},
-				isValid: false,
-				errorMsg: "verification_method: (0: (controller: unable to split did into method, namespace and id.).)."}),
+				isValid:  false,
+				errorMsg: "verification_method: (0: (controller: unable to split did into method, namespace and id.).).",
+			}),
 		Entry(
-			"List of DIDs in cotroller is allowed", 
+			"List of DIDs in cotroller is allowed",
 			TestCaseDIDStruct{
 				did: &Did{
 					Id:         ValidTestDID,
@@ -149,10 +154,11 @@ var _ = Describe("DID Validation tests", func() {
 						},
 					},
 				},
-				isValid: true,
-				errorMsg: ""}),
+				isValid:  true,
+				errorMsg: "",
+			}),
 		Entry(
-			"List of DIDs in cotroller is not allowed", 
+			"List of DIDs in cotroller is not allowed",
 			TestCaseDIDStruct{
 				did: &Did{
 					Context:    nil,
@@ -167,10 +173,11 @@ var _ = Describe("DID Validation tests", func() {
 						},
 					},
 				},
-				isValid: false,
-				errorMsg: "controller: (1: unable to split did into method, namespace and id.)."}),
+				isValid:  false,
+				errorMsg: "controller: (1: unable to split did into method, namespace and id.).",
+			}),
 		Entry(
-			"Namespace in controler is not in list of allowed", 
+			"Namespace in controler is not in list of allowed",
 			TestCaseDIDStruct{
 				did: &Did{
 					Id:         ValidTestDID,
@@ -185,10 +192,11 @@ var _ = Describe("DID Validation tests", func() {
 					},
 				},
 				allowedNamespaces: []string{"mainnet"},
-				isValid: false,
-				errorMsg: "controller: (0: did namespace must be one of: mainnet.); id: did namespace must be one of: mainnet; verification_method: (0: (controller: did namespace must be one of: mainnet; id: did namespace must be one of: mainnet.).)."}),
+				isValid:           false,
+				errorMsg:          "controller: (0: did namespace must be one of: mainnet.); id: did namespace must be one of: mainnet; verification_method: (0: (controller: did namespace must be one of: mainnet; id: did namespace must be one of: mainnet.).).",
+			}),
 		Entry(
-			"Controller is duplicated", 
+			"Controller is duplicated",
 			TestCaseDIDStruct{
 				did: &Did{
 					Id:         ValidTestDID,
@@ -202,8 +210,9 @@ var _ = Describe("DID Validation tests", func() {
 						},
 					},
 				},
-				isValid: false,
-				errorMsg: "controller: there should be no duplicates."}),
+				isValid:  false,
+				errorMsg: "controller: there should be no duplicates.",
+			}),
 		Entry(
 			"Verification method is duplicated",
 			TestCaseDIDStruct{
@@ -224,7 +233,8 @@ var _ = Describe("DID Validation tests", func() {
 						},
 					},
 				},
-				isValid: false,
-				errorMsg: "verification_method: there are verification method duplicates."}),
+				isValid:  false,
+				errorMsg: "verification_method: there are verification method duplicates.",
+			}),
 	)
 })
diff --git a/x/cheqd/types/did_service_test.go b/x/cheqd/types/did_service_test.go
index 6fdf18fe6..b7f2d4ff8 100644
--- a/x/cheqd/types/did_service_test.go
+++ b/x/cheqd/types/did_service_test.go
@@ -9,11 +9,11 @@ import (
 
 var _ = Describe("Service tests", func() {
 	type TestCaseServiceStruct struct {
-		service *Service
-		baseDid string
+		service           *Service
+		baseDid           string
 		allowedNamespaces []string
-		isValid bool
-		errorMsg string
+		isValid           bool
+		errorMsg          string
 	}
 
 	DescribeTable("Service Validation tests", func(testCase TestCaseServiceStruct) {
@@ -27,44 +27,44 @@ var _ = Describe("Service tests", func() {
 		}
 	},
 
-	Entry(
-		"Positive case", 
-		TestCaseServiceStruct{
-			service: &Service{
-				Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
-				Type:            "DIDCommMessaging",
-				ServiceEndpoint: "endpoint",
-			},
-			baseDid: "did:cheqd:aaaaaaaaaaaaaaaa",
-			allowedNamespaces: []string{""},
-			isValid: true,
-			errorMsg: "",
-		}),
+		Entry(
+			"Positive case",
+			TestCaseServiceStruct{
+				service: &Service{
+					Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
+					Type:            "DIDCommMessaging",
+					ServiceEndpoint: "endpoint",
+				},
+				baseDid:           "did:cheqd:aaaaaaaaaaaaaaaa",
+				allowedNamespaces: []string{""},
+				isValid:           true,
+				errorMsg:          "",
+			}),
 
-	Entry(
-		"Namespace is not allowed", 
-		TestCaseServiceStruct{
-			service: &Service{
-				Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
-				Type:            "DIDCommMessaging",
-				ServiceEndpoint: "endpoint",
-			},
-			allowedNamespaces: []string{"mainnet"},
-			isValid: false,
-			errorMsg: "id: did namespace must be one of: mainnet.",
-		}),
+		Entry(
+			"Namespace is not allowed",
+			TestCaseServiceStruct{
+				service: &Service{
+					Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
+					Type:            "DIDCommMessaging",
+					ServiceEndpoint: "endpoint",
+				},
+				allowedNamespaces: []string{"mainnet"},
+				isValid:           false,
+				errorMsg:          "id: did namespace must be one of: mainnet.",
+			}),
 
-	Entry(
-		"Base DID is not the same as in id", 
-		TestCaseServiceStruct{ 
-			service: &Service{
-				Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
-				Type:            "DIDCommMessaging",
-				ServiceEndpoint: "endpoint",
-			},
-			baseDid: "did:cheqd:baaaaaaaaaaaaaab",
-			isValid: false,
-			errorMsg: "id: must have prefix: did:cheqd:baaaaaaaaaaaaaab.",
-		}),
+		Entry(
+			"Base DID is not the same as in id",
+			TestCaseServiceStruct{
+				service: &Service{
+					Id:              "did:cheqd:aaaaaaaaaaaaaaaa#service1",
+					Type:            "DIDCommMessaging",
+					ServiceEndpoint: "endpoint",
+				},
+				baseDid:  "did:cheqd:baaaaaaaaaaaaaab",
+				isValid:  false,
+				errorMsg: "id: must have prefix: did:cheqd:baaaaaaaaaaaaaab.",
+			}),
 	)
-})
\ No newline at end of file
+})
diff --git a/x/cheqd/types/did_verification_method_test.go b/x/cheqd/types/did_verification_method_test.go
index e2210402a..91d4f9cf6 100644
--- a/x/cheqd/types/did_verification_method_test.go
+++ b/x/cheqd/types/did_verification_method_test.go
@@ -18,15 +18,14 @@ import (
 
 var _ = Describe("Verification Method tests", func() {
 	type TestCaseVerificationMethodStruct struct {
-		vm VerificationMethod
-		baseDid string
+		vm                VerificationMethod
+		baseDid           string
 		allowedNamespaces []string
-		isValid bool
-		errorMsg string
+		isValid           bool
+		errorMsg          string
 	}
 
 	DescribeTable("Verification Method Validation tests", func(testCase TestCaseVerificationMethodStruct) {
-	
 		err := testCase.vm.Validate(testCase.baseDid, testCase.allowedNamespaces)
 
 		if testCase.isValid {
@@ -37,130 +36,130 @@ var _ = Describe("Verification Method tests", func() {
 		}
 	},
 
-	Entry(
-		"Verification method with expected multibase key", 
-		TestCaseVerificationMethodStruct{
-			vm: VerificationMethod{
-				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
-				Type:               "Ed25519VerificationKey2020",
-				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
-				PublicKeyJwk:       nil,
-				PublicKeyMultibase: ValidEd25519PubKey,
-			},
-			isValid: true,
-			errorMsg: "",
-		}),
-
-	Entry(
-		"Verification method with expected jwk key", 
-		TestCaseVerificationMethodStruct{
-			vm: VerificationMethod{
-				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#rty",
-				Type:               "JsonWebKey2020",
-				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
-				PublicKeyJwk:       ValidPublicKeyJWK,
-				PublicKeyMultibase: "",
-			},
-			isValid: true,
-			errorMsg: "",
-		}),
-
-	Entry(
-		"Id has expected DID as a base", 
-		TestCaseVerificationMethodStruct{
-			vm: VerificationMethod{
-				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#rty",
-				Type:               "JsonWebKey2020",
-				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
-				PublicKeyJwk:       ValidPublicKeyJWK,
-				PublicKeyMultibase: "",
-			},
-			baseDid: "did:cheqd:aaaaaaaaaaaaaaaa",
-			isValid: true,
-			errorMsg: "",
-		}),
-
-	Entry(
-		"Id does not have expected DID as a base", 
-		TestCaseVerificationMethodStruct{
-			vm: VerificationMethod{
-				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#rty",
-				Type:               "JsonWebKey2020",
-				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
-				PublicKeyJwk:       ValidPublicKeyJWK,
-				PublicKeyMultibase: "",
-			},
-			baseDid: "did:cheqd:bbbbbbbbbbbbbbbb",
-			isValid: false,
-			errorMsg: "id: must have prefix: did:cheqd:bbbbbbbbbbbbbbbb.",
-		}),
-
-	Entry(
-		"Namespace is allowed", 
-		TestCaseVerificationMethodStruct{
-			vm: VerificationMethod{
-				Id:                 "did:cheqd:mainnet:aaaaaaaaaaaaaaaa#rty",
-				Type:               "JsonWebKey2020",
-				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
-				PublicKeyJwk:       ValidPublicKeyJWK,
-				PublicKeyMultibase: "",
-			},
-			allowedNamespaces: []string{"mainnet", ""},
-			isValid: true,
-		}),
-
-	Entry(
-		"Namespace is not allowed", 
-		TestCaseVerificationMethodStruct{
-			vm: VerificationMethod{
-				Id:                 "did:cheqd:mainnet:aaaaaaaaaaaaaaaa#rty",
-				Type:               "JsonWebKey2020",
-				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
-				PublicKeyJwk:       ValidPublicKeyJWK,
-				PublicKeyMultibase: "",
-			},
-			allowedNamespaces: []string{"testnet"},
-			isValid: false,
-			errorMsg: "controller: did namespace must be one of: testnet; id: did namespace must be one of: testnet.",
-		}),
-	Entry(
-		"JWK key has expected format", 
-		TestCaseVerificationMethodStruct{
-			vm: VerificationMethod{
-				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
-				Type:               "JsonWebKey2020",
-				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
-				PublicKeyJwk:       ValidPublicKeyJWK,
-				PublicKeyMultibase: "",
-			},
-			isValid: true,
-		}),
-	Entry(
-		"JWK key has unexpected format", 
-		TestCaseVerificationMethodStruct{
-			vm: VerificationMethod{
-				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
-				Type:               "JsonWebKey2020",
-				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
-				PublicKeyJwk:       NotValidPublicKeyJWK,
-				PublicKeyMultibase: "",
-			},
-			isValid: false,
-			errorMsg: "public_key_jwk: can't parse jwk: failed to parse key: invalid key type from JSON (SomeOtherKeyType).",
-		}),
-	Entry(
-		"Not all keys and valuesin JWK have expected format", 
-		TestCaseVerificationMethodStruct{
-			vm: VerificationMethod{
-				Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
-				Type:               "JsonWebKey2020",
-				Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
-				PublicKeyJwk:       append(ValidPublicKeyJWK, &KeyValuePair{Key: "", Value: ""}),
-				PublicKeyMultibase: "",
-			},
-			isValid: false,
-			errorMsg: "public_key_jwk: (6: (key: cannot be blank; value: cannot be blank.).).",
-		}),
+		Entry(
+			"Verification method with expected multibase key",
+			TestCaseVerificationMethodStruct{
+				vm: VerificationMethod{
+					Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
+					Type:               "Ed25519VerificationKey2020",
+					Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
+					PublicKeyJwk:       nil,
+					PublicKeyMultibase: ValidEd25519PubKey,
+				},
+				isValid:  true,
+				errorMsg: "",
+			}),
+
+		Entry(
+			"Verification method with expected jwk key",
+			TestCaseVerificationMethodStruct{
+				vm: VerificationMethod{
+					Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#rty",
+					Type:               "JsonWebKey2020",
+					Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
+					PublicKeyJwk:       ValidPublicKeyJWK,
+					PublicKeyMultibase: "",
+				},
+				isValid:  true,
+				errorMsg: "",
+			}),
+
+		Entry(
+			"Id has expected DID as a base",
+			TestCaseVerificationMethodStruct{
+				vm: VerificationMethod{
+					Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#rty",
+					Type:               "JsonWebKey2020",
+					Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
+					PublicKeyJwk:       ValidPublicKeyJWK,
+					PublicKeyMultibase: "",
+				},
+				baseDid:  "did:cheqd:aaaaaaaaaaaaaaaa",
+				isValid:  true,
+				errorMsg: "",
+			}),
+
+		Entry(
+			"Id does not have expected DID as a base",
+			TestCaseVerificationMethodStruct{
+				vm: VerificationMethod{
+					Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#rty",
+					Type:               "JsonWebKey2020",
+					Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
+					PublicKeyJwk:       ValidPublicKeyJWK,
+					PublicKeyMultibase: "",
+				},
+				baseDid:  "did:cheqd:bbbbbbbbbbbbbbbb",
+				isValid:  false,
+				errorMsg: "id: must have prefix: did:cheqd:bbbbbbbbbbbbbbbb.",
+			}),
+
+		Entry(
+			"Namespace is allowed",
+			TestCaseVerificationMethodStruct{
+				vm: VerificationMethod{
+					Id:                 "did:cheqd:mainnet:aaaaaaaaaaaaaaaa#rty",
+					Type:               "JsonWebKey2020",
+					Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
+					PublicKeyJwk:       ValidPublicKeyJWK,
+					PublicKeyMultibase: "",
+				},
+				allowedNamespaces: []string{"mainnet", ""},
+				isValid:           true,
+			}),
+
+		Entry(
+			"Namespace is not allowed",
+			TestCaseVerificationMethodStruct{
+				vm: VerificationMethod{
+					Id:                 "did:cheqd:mainnet:aaaaaaaaaaaaaaaa#rty",
+					Type:               "JsonWebKey2020",
+					Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
+					PublicKeyJwk:       ValidPublicKeyJWK,
+					PublicKeyMultibase: "",
+				},
+				allowedNamespaces: []string{"testnet"},
+				isValid:           false,
+				errorMsg:          "controller: did namespace must be one of: testnet; id: did namespace must be one of: testnet.",
+			}),
+		Entry(
+			"JWK key has expected format",
+			TestCaseVerificationMethodStruct{
+				vm: VerificationMethod{
+					Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
+					Type:               "JsonWebKey2020",
+					Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
+					PublicKeyJwk:       ValidPublicKeyJWK,
+					PublicKeyMultibase: "",
+				},
+				isValid: true,
+			}),
+		Entry(
+			"JWK key has unexpected format",
+			TestCaseVerificationMethodStruct{
+				vm: VerificationMethod{
+					Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
+					Type:               "JsonWebKey2020",
+					Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
+					PublicKeyJwk:       NotValidPublicKeyJWK,
+					PublicKeyMultibase: "",
+				},
+				isValid:  false,
+				errorMsg: "public_key_jwk: can't parse jwk: failed to parse key: invalid key type from JSON (SomeOtherKeyType).",
+			}),
+		Entry(
+			"Not all keys and valuesin JWK have expected format",
+			TestCaseVerificationMethodStruct{
+				vm: VerificationMethod{
+					Id:                 "did:cheqd:aaaaaaaaaaaaaaaa#qwe",
+					Type:               "JsonWebKey2020",
+					Controller:         "did:cheqd:bbbbbbbbbbbbbbbb",
+					PublicKeyJwk:       append(ValidPublicKeyJWK, &KeyValuePair{Key: "", Value: ""}),
+					PublicKeyMultibase: "",
+				},
+				isValid:  false,
+				errorMsg: "public_key_jwk: (6: (key: cannot be blank; value: cannot be blank.).).",
+			}),
 	)
 })
 
diff --git a/x/cheqd/types/tx_msg_create_did_test.go b/x/cheqd/types/tx_msg_create_did_test.go
index b54d5a01b..e9b25fe21 100644
--- a/x/cheqd/types/tx_msg_create_did_test.go
+++ b/x/cheqd/types/tx_msg_create_did_test.go
@@ -9,8 +9,8 @@ import (
 
 var _ = Describe("Message for DID creation", func() {
 	type TestCaseMsgCreateDID struct {
-		msg *MsgCreateDid
-		isValid bool
+		msg      *MsgCreateDid
+		isValid  bool
 		errorMsg string
 	}
 
@@ -25,46 +25,47 @@ var _ = Describe("Message for DID creation", func() {
 		}
 	},
 
-	Entry(
-		"All fields are set properly", 
-		TestCaseMsgCreateDID{
-			msg: &MsgCreateDid{
-				Payload: &MsgCreateDidPayload{
-					Id: "did:cheqd:testnet:123456789abcdefg",
-					VerificationMethod: []*VerificationMethod{
-						{
-							Id:                 "did:cheqd:testnet:123456789abcdefg#key1",
-							Type:               "Ed25519VerificationKey2020",
-							Controller:         "did:cheqd:testnet:123456789abcdefg",
-							PublicKeyMultibase: ValidEd25519PubKey,
+		Entry(
+			"All fields are set properly",
+			TestCaseMsgCreateDID{
+				msg: &MsgCreateDid{
+					Payload: &MsgCreateDidPayload{
+						Id: "did:cheqd:testnet:123456789abcdefg",
+						VerificationMethod: []*VerificationMethod{
+							{
+								Id:                 "did:cheqd:testnet:123456789abcdefg#key1",
+								Type:               "Ed25519VerificationKey2020",
+								Controller:         "did:cheqd:testnet:123456789abcdefg",
+								PublicKeyMultibase: ValidEd25519PubKey,
+							},
 						},
+						Authentication: []string{"did:cheqd:testnet:123456789abcdefg#key1", "did:cheqd:testnet:123456789abcdefg#aaa"},
 					},
-					Authentication: []string{"did:cheqd:testnet:123456789abcdefg#key1", "did:cheqd:testnet:123456789abcdefg#aaa"},
+					Signatures: nil,
 				},
-				Signatures: nil,
-			},
-			isValid: true}),
+				isValid: true,
+			}),
 
-	Entry(
-		"IDs are duplicated", 
-		TestCaseMsgCreateDID{
-			msg: &MsgCreateDid{
-				Payload: &MsgCreateDidPayload{
-					Id: "did:cheqd:testnet:123456789abcdefg",
-					VerificationMethod: []*VerificationMethod{
-						{
-							Id:                 "did:cheqd:testnet:123456789abcdefg#key1",
-							Type:               "Ed25519VerificationKey2020",
-							Controller:         "did:cheqd:testnet:123456789abcdefg",
-							PublicKeyMultibase: ValidEd25519PubKey,
+		Entry(
+			"IDs are duplicated",
+			TestCaseMsgCreateDID{
+				msg: &MsgCreateDid{
+					Payload: &MsgCreateDidPayload{
+						Id: "did:cheqd:testnet:123456789abcdefg",
+						VerificationMethod: []*VerificationMethod{
+							{
+								Id:                 "did:cheqd:testnet:123456789abcdefg#key1",
+								Type:               "Ed25519VerificationKey2020",
+								Controller:         "did:cheqd:testnet:123456789abcdefg",
+								PublicKeyMultibase: ValidEd25519PubKey,
+							},
 						},
+						Authentication: []string{"did:cheqd:testnet:123456789abcdefg#key1", "did:cheqd:testnet:123456789abcdefg#key1"},
 					},
-					Authentication: []string{"did:cheqd:testnet:123456789abcdefg#key1", "did:cheqd:testnet:123456789abcdefg#key1"},
+					Signatures: nil,
 				},
-				Signatures: nil,
-			},
-			isValid: false,
-			errorMsg: "payload: (authentication: there should be no duplicates.).: basic validation failed",
-		}),
+				isValid:  false,
+				errorMsg: "payload: (authentication: there should be no duplicates.).: basic validation failed",
+			}),
 	)
 })
diff --git a/x/cheqd/types/tx_msg_update_did_test.go b/x/cheqd/types/tx_msg_update_did_test.go
index 0a24f35c3..a09267032 100644
--- a/x/cheqd/types/tx_msg_update_did_test.go
+++ b/x/cheqd/types/tx_msg_update_did_test.go
@@ -9,8 +9,8 @@ import (
 
 var _ = Describe("Message for DID updating", func() {
 	type TestCaseMsgUpdateDID struct {
-		msg *MsgUpdateDid
-		isValid bool
+		msg      *MsgUpdateDid
+		isValid  bool
 		errorMsg string
 	}
 
@@ -25,70 +25,70 @@ var _ = Describe("Message for DID updating", func() {
 		}
 	},
 
-	Entry(
-		"All fields are set properly", 
-		TestCaseMsgUpdateDID{
-			msg: &MsgUpdateDid{
-				Payload: &MsgUpdateDidPayload{
-					Id: "did:cheqd:testnet:123456789abcdefg",
-					VerificationMethod: []*VerificationMethod{
-						{
-							Id:                 "did:cheqd:testnet:123456789abcdefg#key1",
-							Type:               "Ed25519VerificationKey2020",
-							Controller:         "did:cheqd:testnet:123456789abcdefg",
-							PublicKeyMultibase: ValidEd25519PubKey,
+		Entry(
+			"All fields are set properly",
+			TestCaseMsgUpdateDID{
+				msg: &MsgUpdateDid{
+					Payload: &MsgUpdateDidPayload{
+						Id: "did:cheqd:testnet:123456789abcdefg",
+						VerificationMethod: []*VerificationMethod{
+							{
+								Id:                 "did:cheqd:testnet:123456789abcdefg#key1",
+								Type:               "Ed25519VerificationKey2020",
+								Controller:         "did:cheqd:testnet:123456789abcdefg",
+								PublicKeyMultibase: ValidEd25519PubKey,
+							},
 						},
+						Authentication: []string{"did:cheqd:testnet:123456789abcdefg#key1", "did:cheqd:testnet:123456789abcdefg#aaa"},
+						VersionId:      "version1",
 					},
-					Authentication: []string{"did:cheqd:testnet:123456789abcdefg#key1", "did:cheqd:testnet:123456789abcdefg#aaa"},
-					VersionId:      "version1",
+					Signatures: nil,
 				},
-				Signatures: nil,
-			},
-			isValid: true,
-		}),
+				isValid: true,
+			}),
 
-	Entry(
-		"IDs are duplicated", 
-		TestCaseMsgUpdateDID{
-			msg: &MsgUpdateDid{
-				Payload: &MsgUpdateDidPayload{
-					Id: "did:cheqd:testnet:123456789abcdefg",
-					VerificationMethod: []*VerificationMethod{
-						{
-							Id:                 "did:cheqd:testnet:123456789abcdefg#key1",
-							Type:               "Ed25519VerificationKey2020",
-							Controller:         "did:cheqd:testnet:123456789abcdefg",
-							PublicKeyMultibase: ValidEd25519PubKey,
+		Entry(
+			"IDs are duplicated",
+			TestCaseMsgUpdateDID{
+				msg: &MsgUpdateDid{
+					Payload: &MsgUpdateDidPayload{
+						Id: "did:cheqd:testnet:123456789abcdefg",
+						VerificationMethod: []*VerificationMethod{
+							{
+								Id:                 "did:cheqd:testnet:123456789abcdefg#key1",
+								Type:               "Ed25519VerificationKey2020",
+								Controller:         "did:cheqd:testnet:123456789abcdefg",
+								PublicKeyMultibase: ValidEd25519PubKey,
+							},
 						},
+						Authentication: []string{"did:cheqd:testnet:123456789abcdefg#key1", "did:cheqd:testnet:123456789abcdefg#key1"},
+						VersionId:      "version1",
 					},
-					Authentication: []string{"did:cheqd:testnet:123456789abcdefg#key1", "did:cheqd:testnet:123456789abcdefg#key1"},
-					VersionId:      "version1",
+					Signatures: nil,
 				},
-				Signatures: nil,
-			},
-			isValid: false,
-			errorMsg: "payload: (authentication: there should be no duplicates.).: basic validation failed",
-		}),
-	Entry(
-		"VersionId is empty", 
-		TestCaseMsgUpdateDID{
-			msg: &MsgUpdateDid{
-				Payload: &MsgUpdateDidPayload{
-					Id: "did:cheqd:testnet:123456789abcdefg",
-					VerificationMethod: []*VerificationMethod{
-						{
-							Id:                 "did:cheqd:testnet:123456789abcdefg#key1",
-							Type:               "Ed25519VerificationKey2020",
-							Controller:         "did:cheqd:testnet:123456789abcdefg",
-							PublicKeyMultibase: ValidEd25519PubKey,
+				isValid:  false,
+				errorMsg: "payload: (authentication: there should be no duplicates.).: basic validation failed",
+			}),
+		Entry(
+			"VersionId is empty",
+			TestCaseMsgUpdateDID{
+				msg: &MsgUpdateDid{
+					Payload: &MsgUpdateDidPayload{
+						Id: "did:cheqd:testnet:123456789abcdefg",
+						VerificationMethod: []*VerificationMethod{
+							{
+								Id:                 "did:cheqd:testnet:123456789abcdefg#key1",
+								Type:               "Ed25519VerificationKey2020",
+								Controller:         "did:cheqd:testnet:123456789abcdefg",
+								PublicKeyMultibase: ValidEd25519PubKey,
+							},
 						},
+						Authentication: []string{"did:cheqd:testnet:123456789abcdefg#key1", "did:cheqd:testnet:123456789abcdefg#aaa"},
 					},
-					Authentication: []string{"did:cheqd:testnet:123456789abcdefg#key1", "did:cheqd:testnet:123456789abcdefg#aaa"},
+					Signatures: nil,
 				},
-				Signatures: nil,
-			},
-			isValid: false,
-			errorMsg: "payload: (version_id: cannot be blank.).: basic validation failed",
-		}),
+				isValid:  false,
+				errorMsg: "payload: (version_id: cannot be blank.).: basic validation failed",
+			}),
 	)
 })
diff --git a/x/cheqd/types/tx_sign_ingo_test.go b/x/cheqd/types/tx_sign_ingo_test.go
index d78293eec..c3b154776 100644
--- a/x/cheqd/types/tx_sign_ingo_test.go
+++ b/x/cheqd/types/tx_sign_ingo_test.go
@@ -9,10 +9,10 @@ import (
 
 var _ = Describe("SignInfo tests", func() {
 	type TestCaseSignInfoStruct struct {
-		si SignInfo
+		si                SignInfo
 		allowedNamespaces []string
-		isValid bool
-		errorMsg string
+		isValid           bool
+		errorMsg          string
 	}
 
 	DescribeTable("SignInfo validation tests", func(testCase TestCaseSignInfoStruct) {
@@ -26,46 +26,46 @@ var _ = Describe("SignInfo tests", func() {
 		}
 	},
 
-	Entry(
-		"Positive case", 
-		TestCaseSignInfoStruct{
-			si: SignInfo{
-				VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
-				Signature:            "aaa=",
-			},
-			isValid: true,
-			errorMsg: "",
-		}),
+		Entry(
+			"Positive case",
+			TestCaseSignInfoStruct{
+				si: SignInfo{
+					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
+					Signature:            "aaa=",
+				},
+				isValid:  true,
+				errorMsg: "",
+			}),
 
-	Entry(
-		"Namespace is not allowed", 
-		TestCaseSignInfoStruct{
-			si: SignInfo{
-				VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#service1",
-				Signature:            "DIDCommMessaging",
-			},
-			allowedNamespaces: []string{"mainnet"},
-			isValid: false,
-			errorMsg: "verification_method_id: did namespace must be one of: mainnet.",
-		}),
+		Entry(
+			"Namespace is not allowed",
+			TestCaseSignInfoStruct{
+				si: SignInfo{
+					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#service1",
+					Signature:            "DIDCommMessaging",
+				},
+				allowedNamespaces: []string{"mainnet"},
+				isValid:           false,
+				errorMsg:          "verification_method_id: did namespace must be one of: mainnet.",
+			}),
 
-	Entry(
-		"Signature is not valid base64 string", 
-		TestCaseSignInfoStruct{
-			si: SignInfo{
-				VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#service1",
-				Signature:            "!@#",
-			},
-			isValid: false,
-			errorMsg: "signature: must be encoded in Base64.",
-		}),
+		Entry(
+			"Signature is not valid base64 string",
+			TestCaseSignInfoStruct{
+				si: SignInfo{
+					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#service1",
+					Signature:            "!@#",
+				},
+				isValid:  false,
+				errorMsg: "signature: must be encoded in Base64.",
+			}),
 	)
 })
 
 var _ = Describe("Full SignInfo duplicates tests", func() {
 	type TestCaseSignInfosStruct struct {
-		signInfos []*SignInfo 
-		isValid bool
+		signInfos []*SignInfo
+		isValid   bool
 	}
 
 	DescribeTable("SignInfo duplicates tests", func(testCase TestCaseSignInfosStruct) {
@@ -73,72 +73,72 @@ var _ = Describe("Full SignInfo duplicates tests", func() {
 		Expect(res_).To(Equal(testCase.isValid))
 	},
 
-	Entry(
-		"Signatures are different", 
-		TestCaseSignInfosStruct{
-			signInfos: []*SignInfo{
-				{
-					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
-					Signature:            "aaa=",
+		Entry(
+			"Signatures are different",
+			TestCaseSignInfosStruct{
+				signInfos: []*SignInfo{
+					{
+						VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
+						Signature:            "aaa=",
+					},
+					{
+						VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
+						Signature:            "bbb=",
+					},
 				},
-				{
-					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
-					Signature:            "bbb=",
-				},
-			},
-			isValid: true,
-		}),
+				isValid: true,
+			}),
 
-	Entry(
-		"All fields are different", 
-		TestCaseSignInfosStruct{
-			signInfos: []*SignInfo{
-				{
-					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
-					Signature:            "aaa=",
-				},
-				{
-					VerificationMethodId: "did:cheqd:bbbbbbbbbbbbbbbb#method1",
-					Signature:            "bbb=",
+		Entry(
+			"All fields are different",
+			TestCaseSignInfosStruct{
+				signInfos: []*SignInfo{
+					{
+						VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
+						Signature:            "aaa=",
+					},
+					{
+						VerificationMethodId: "did:cheqd:bbbbbbbbbbbbbbbb#method1",
+						Signature:            "bbb=",
+					},
 				},
-			},
-			isValid: true,
-		}),
+				isValid: true,
+			}),
 
-	Entry(
-		"All fields are the same", 
-		TestCaseSignInfosStruct{
-			signInfos: []*SignInfo{
-				{
-					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
-					Signature:            "aaa=",
-				},
-				{
-					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
-					Signature:            "aaa=",
+		Entry(
+			"All fields are the same",
+			TestCaseSignInfosStruct{
+				signInfos: []*SignInfo{
+					{
+						VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
+						Signature:            "aaa=",
+					},
+					{
+						VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
+						Signature:            "aaa=",
+					},
 				},
-			},
-			isValid: false,
-		}),
+				isValid: false,
+			}),
 
-	Entry(
-		"All fields are the same and more elments", 
-		TestCaseSignInfosStruct{
-			signInfos: []*SignInfo{
-				{
-					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
-					Signature:            "aaa=",
-				},
-				{
-					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
-					Signature:            "aaa=",
-				},
-				{
-					VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
-					Signature:            "aaa=",
+		Entry(
+			"All fields are the same and more elments",
+			TestCaseSignInfosStruct{
+				signInfos: []*SignInfo{
+					{
+						VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
+						Signature:            "aaa=",
+					},
+					{
+						VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
+						Signature:            "aaa=",
+					},
+					{
+						VerificationMethodId: "did:cheqd:aaaaaaaaaaaaaaaa#method1",
+						Signature:            "aaa=",
+					},
 				},
-			},
-			isValid: false,
-		}),
+				isValid: false,
+			}),
 	)
 })

From ad69f94029be0b15e158210d228b7a4b7c26aa3c Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Tue, 18 Oct 2022 17:02:53 +0300
Subject: [PATCH 51/76] Fix tests running command

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9ba106cd2..595e045b1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
           go get github.com/onsi/gomega/...
 
       - name: Run Ginkgo tests
-        run: go run ./ginkgo -r --race --randomize-all --randomize-suites --junit-report report.xml
+        run: ginkgo -r --race --randomize-all --randomize-suites --junit-report report.xml
 
       # - uses: mikepenz/action-junit-report@v3
       #   if: success() || failure()        # run this step even if previous step failed

From 09de4ee8bc022e8a242e7628f9378ca85945edd8 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Tue, 18 Oct 2022 17:17:47 +0300
Subject: [PATCH 52/76] debug

---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 595e045b1..b93862f5e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,6 +28,9 @@ jobs:
           go get github.com/onsi/ginkgo/v2/ginkgo
           go get github.com/onsi/gomega/...
 
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+
       - name: Run Ginkgo tests
         run: ginkgo -r --race --randomize-all --randomize-suites --junit-report report.xml
 

From 43f1f3e8baffc6f7b95154626ff5a902170b83e7 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Tue, 18 Oct 2022 17:41:03 +0300
Subject: [PATCH 53/76] Change ginkgo for installing

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b93862f5e..7242e93dc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,7 +25,7 @@ jobs:
 
       - name: Install ginkgo
         run: |
-          go get github.com/onsi/ginkgo/v2/ginkgo
+          go install github.com/onsi/ginkgo/v2/ginkgo
           go get github.com/onsi/gomega/...
 
       - name: Setup tmate session

From d2350f82cfccb905a4841fde49c263d224fb67d5 Mon Sep 17 00:00:00 2001
From: Alexander Kolesov <alexandr.kolesov@cheqd.io>
Date: Wed, 19 Oct 2022 12:28:50 +0300
Subject: [PATCH 54/76] Update dispatch.yml

---
 .github/workflows/dispatch.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index 39f23005f..6844091db 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -25,7 +25,6 @@ jobs:
   call-release:
     name: "Release"
     needs: call-test
-    # needs: call-build
     if: ${{ github.ref_protected == true }}
     uses: ./.github/workflows/release.yml
     secrets: inherit

From b4feefe30d1e37f22aa965e063fa3408beb731f2 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Wed, 19 Oct 2022 13:29:14 +0300
Subject: [PATCH 55/76] Review comments

---
 .github/workflows/test.yml                      | 17 ++++++++---------
 x/cheqd/tests/setup/config.go                   |  2 +-
 x/cheqd/tests/tests_suite_test.go               |  2 +-
 x/cheqd/types/stateValue_test.go                |  2 +-
 x/cheqd/utils/encoding_test.go                  | 12 ++++++------
 x/resource/keeper/msg_server_create_resource.go |  3 +--
 6 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1290bdc7c..d5740fbed 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,14 +24,13 @@ jobs:
           cache: true
 
       - name: Install ginkgo
-        run: |
-          go install github.com/onsi/ginkgo/v2/ginkgo
-          go get github.com/onsi/gomega/...
+        working-directory: ./..
+        run: go install github.com/onsi/ginkgo/v2/ginkgo@latest
 
-      # - name: Run Ginkgo tests
-      #   run: ginkgo -r --race --randomize-all --randomize-suites --junit-report report.xml
+      - name: Run Ginkgo tests
+        run: ginkgo -r --race --randomize-all --randomize-suites --junit-report report.xml
 
-      # - uses: mikepenz/action-junit-report@v3
-      #   if: success() || failure()        # run this step even if previous step failed
-      #   with:
-      #     report_paths: 'report.xml'
+      - uses: mikepenz/action-junit-report@v3
+        if: success() || failure()        # run this step even if previous step failed
+        with:
+          report_paths: 'report.xml'
diff --git a/x/cheqd/tests/setup/config.go b/x/cheqd/tests/setup/config.go
index 1cde54f21..debef10b7 100644
--- a/x/cheqd/tests/setup/config.go
+++ b/x/cheqd/tests/setup/config.go
@@ -1,3 +1,3 @@
 package setup
 
-const DID_NAMESPACE = "test"
+const DID_NAMESPACE = "testnet"
diff --git a/x/cheqd/tests/tests_suite_test.go b/x/cheqd/tests/tests_suite_test.go
index eab13e53b..fb621a35f 100644
--- a/x/cheqd/tests/tests_suite_test.go
+++ b/x/cheqd/tests/tests_suite_test.go
@@ -9,5 +9,5 @@ import (
 
 func TestTestsGeneral(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Cheqd Module")
+	RunSpecs(t, "Cheqd DID Module")
 }
diff --git a/x/cheqd/types/stateValue_test.go b/x/cheqd/types/stateValue_test.go
index eb2bbf477..8879a6d1a 100644
--- a/x/cheqd/types/stateValue_test.go
+++ b/x/cheqd/types/stateValue_test.go
@@ -15,7 +15,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-var _ = Describe(`StaeValue tests`, func() {
+var _ = Describe(`StateValue tests`, func() {
 	Context("Pack/unpack functionality", func() {
 		It("should pack and unpack withour any errors", func() {
 			original := &Did{
diff --git a/x/cheqd/utils/encoding_test.go b/x/cheqd/utils/encoding_test.go
index 30edbd93b..b473dab4f 100644
--- a/x/cheqd/utils/encoding_test.go
+++ b/x/cheqd/utils/encoding_test.go
@@ -46,9 +46,9 @@ var _ = Describe("Encoding checks", func() {
 		func(data string, isValid bool) {
 			_err := ValidateMultibase(data)
 			if isValid {
-				Ω(_err).ShouldNot(HaveOccurred())
+				Expect(_err).ShouldNot(HaveOccurred())
 			} else {
-				Ω(_err).Should(HaveOccurred())
+				Expect(_err).Should(HaveOccurred())
 			}
 		},
 
@@ -64,9 +64,9 @@ var _ = Describe("Encoding checks", func() {
 		func(data string, isValid bool) {
 			_err := ValidateBase58(data)
 			if isValid {
-				Ω(_err).ShouldNot(HaveOccurred())
+				Expect(_err).ShouldNot(HaveOccurred())
 			} else {
-				Ω(_err).Should(HaveOccurred())
+				Expect(_err).Should(HaveOccurred())
 			}
 		},
 
@@ -80,9 +80,9 @@ var _ = Describe("Encoding checks", func() {
 		func(data string, isValid bool) {
 			_err := ValidateJWK(data)
 			if isValid {
-				Ω(_err).ShouldNot(HaveOccurred())
+				Expect(_err).ShouldNot(HaveOccurred())
 			} else {
-				Ω(_err).Should(HaveOccurred())
+				Expect(_err).Should(HaveOccurred())
 			}
 		},
 
diff --git a/x/resource/keeper/msg_server_create_resource.go b/x/resource/keeper/msg_server_create_resource.go
index 14a3d1bad..211f10184 100644
--- a/x/resource/keeper/msg_server_create_resource.go
+++ b/x/resource/keeper/msg_server_create_resource.go
@@ -46,8 +46,7 @@ func (k msgServer) CreateResource(goCtx context.Context, msg *types.MsgCreateRes
 
 	// Build Resource
 	resource := msg.Payload.ToResource()
-	checksum := sha256.Sum256([]byte(resource.Data))
-	resource.Header.Checksum = checksum[:]
+	resource.Header.Checksum = sha256.New().Sum(resource.Data)
 	resource.Header.Created = ctx.BlockTime().Format(time.RFC3339)
 	resource.Header.MediaType = utils.DetectMediaType(resource.Data)
 

From 1a2b7e40c868ea4c177c789f3673a4dac88b506d Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Wed, 19 Oct 2022 13:39:52 +0300
Subject: [PATCH 56/76] Add workaround for installing ginkgo

---
 .github/workflows/test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d5740fbed..89a10ca10 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,7 +25,9 @@ jobs:
 
       - name: Install ginkgo
         working-directory: ./..
-        run: go install github.com/onsi/ginkgo/v2/ginkgo@latest
+        run: |
+          cp cheqd-node/go.mod ./
+          go install github.com/onsi/ginkgo/v2/ginkgo@latest
 
       - name: Run Ginkgo tests
         run: ginkgo -r --race --randomize-all --randomize-suites --junit-report report.xml

From c9d947a6a4caf9558e45df75434f34d19ce69330 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Wed, 19 Oct 2022 13:48:33 +0300
Subject: [PATCH 57/76] debug

---
 .github/workflows/test.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 89a10ca10..37638a824 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,7 +27,10 @@ jobs:
         working-directory: ./..
         run: |
           cp cheqd-node/go.mod ./
-          go install github.com/onsi/ginkgo/v2/ginkgo@latest
+          go install github.com/onsi/ginkgo/v2/ginkgo
+
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
 
       - name: Run Ginkgo tests
         run: ginkgo -r --race --randomize-all --randomize-suites --junit-report report.xml

From 999292e091edee1bb7ac470959fcd9c6c66c19ab Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Wed, 19 Oct 2022 13:54:59 +0300
Subject: [PATCH 58/76] debug

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 37638a824..f82cf6c04 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,6 +27,7 @@ jobs:
         working-directory: ./..
         run: |
           cp cheqd-node/go.mod ./
+          cp cheqd-node/go.sum ./
           go install github.com/onsi/ginkgo/v2/ginkgo
 
       - name: Setup tmate session

From 39cfcb3e35af86bfff9c522521b859af0071b1c1 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Wed, 19 Oct 2022 14:03:56 +0300
Subject: [PATCH 59/76] Fix the version of ginkgo for CLI

---
 .github/workflows/test.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f82cf6c04..f1fa1c8a7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,9 +26,7 @@ jobs:
       - name: Install ginkgo
         working-directory: ./..
         run: |
-          cp cheqd-node/go.mod ./
-          cp cheqd-node/go.sum ./
-          go install github.com/onsi/ginkgo/v2/ginkgo
+          go install github.com/onsi/ginkgo/v2/ginkgo@v2.1.6
 
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3

From 856b2cabf2aa93b0fd92f9db8a44487643a36332 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Wed, 19 Oct 2022 14:15:25 +0300
Subject: [PATCH 60/76] Update ginkgo to the latest version

---
 .github/workflows/test.yml | 5 +----
 go.mod                     | 5 ++++-
 go.sum                     | 8 ++++++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f1fa1c8a7..f6ae70035 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,10 +26,7 @@ jobs:
       - name: Install ginkgo
         working-directory: ./..
         run: |
-          go install github.com/onsi/ginkgo/v2/ginkgo@v2.1.6
-
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
+          go install github.com/onsi/ginkgo/v2/ginkgo@latest
 
       - name: Run Ginkgo tests
         run: ginkgo -r --race --randomize-all --randomize-suites --junit-report report.xml
diff --git a/go.mod b/go.mod
index 19fa8d9d1..f2c1af9ee 100644
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/lestrrat-go/jwx v1.2.25
 	github.com/multiformats/go-multibase v0.1.1
-	github.com/onsi/ginkgo/v2 v2.1.6
+	github.com/onsi/ginkgo/v2 v2.3.1
 	github.com/onsi/gomega v1.22.0
 	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cast v1.5.0
@@ -63,6 +63,7 @@ require (
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
 	github.com/goccy/go-json v0.9.7 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/gateway v1.1.0 // indirect
@@ -70,6 +71,7 @@ require (
 	github.com/google/btree v1.0.0 // indirect
 	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/google/orderedcode v0.0.1 // indirect
+	github.com/google/pprof v0.0.0-20221010195024-131d412537ea // indirect
 	github.com/gorilla/handlers v1.5.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -135,6 +137,7 @@ require (
 	golang.org/x/sys v0.0.0-20220727055044-e65921a090b8 // indirect
 	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
 	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/tools v0.1.12 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/ini.v1 v1.66.6 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/go.sum b/go.sum
index 6f0daedad..1ad706386 100644
--- a/go.sum
+++ b/go.sum
@@ -284,6 +284,8 @@ github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn
 github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
@@ -366,6 +368,8 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20221010195024-131d412537ea h1:R3VfsTXMMK4JCWZDdxScmnTzu9n9YRsDvguLis0U/b8=
+github.com/google/pprof v0.0.0-20221010195024-131d412537ea/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -601,6 +605,8 @@ github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU=
 github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk=
+github.com/onsi/ginkgo/v2 v2.3.1 h1:8SbseP7qM32WcvE6VaN6vfXxv698izmsJ1UQX9ve7T8=
+github.com/onsi/ginkgo/v2 v2.3.1/go.mod h1:Sv4yQXwG5VmF7tm3Q5Z+RWUpPo24LF1mpnz2crUb8Ys=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
@@ -1114,6 +1120,8 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From 4e3c8e79ab0a73838dea7b9bce7110598729afe4 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Wed, 19 Oct 2022 14:28:40 +0300
Subject: [PATCH 61/76] Add token for JUnit

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f6ae70035..22ccbc4c5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,3 +35,4 @@ jobs:
         if: success() || failure()        # run this step even if previous step failed
         with:
           report_paths: 'report.xml'
+          token: ${{ secrets.GITHUB_TOKEN }}

From 2a5dd07dc297a6b45d2bab33a9f8205f817c7ec5 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Wed, 19 Oct 2022 18:59:45 +0300
Subject: [PATCH 62/76] Move to another access token

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 22ccbc4c5..f6090e270 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,4 +35,4 @@ jobs:
         if: success() || failure()        # run this step even if previous step failed
         with:
           report_paths: 'report.xml'
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GH_PAT }}

From 97da98b58d162356f9fa5dbc8b4ab5bc41ad86d1 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Wed, 19 Oct 2022 19:31:17 +0300
Subject: [PATCH 63/76] Add template for report files

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f6090e270..90e2da6d4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,10 +29,10 @@ jobs:
           go install github.com/onsi/ginkgo/v2/ginkgo@latest
 
       - name: Run Ginkgo tests
-        run: ginkgo -r --race --randomize-all --randomize-suites --junit-report report.xml
+        run: ginkgo -r --race --randomize-all --randomize-suites --junit-report report.xml --json-report=report.json
 
       - uses: mikepenz/action-junit-report@v3
         if: success() || failure()        # run this step even if previous step failed
         with:
-          report_paths: 'report.xml'
+          report_paths: 'report*'
           token: ${{ secrets.GH_PAT }}

From a0308c692680d41d5da560f064a6b10c31d8130c Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Wed, 19 Oct 2022 19:44:26 +0300
Subject: [PATCH 64/76] Debug

---
 .github/workflows/dispatch.yml | 14 +++++++-------
 .github/workflows/test.yml     |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index 15f64f143..7646bb1e5 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -7,14 +7,14 @@ concurrency:
 
 jobs:
 
-  call-lint:
-    name: "Lint"
-    uses: ./.github/workflows/lint.yml
+  # call-lint:
+  #   name: "Lint"
+  #   uses: ./.github/workflows/lint.yml
 
-  call-build:
-    name: "Build"
-    needs: call-lint
-    uses: ./.github/workflows/build.yml
+  # call-build:
+  #   name: "Build"
+  #   needs: call-lint
+  #   uses: ./.github/workflows/build.yml
   
   call-test:
     name: "Test"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 90e2da6d4..f751605cc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -34,5 +34,5 @@ jobs:
       - uses: mikepenz/action-junit-report@v3
         if: success() || failure()        # run this step even if previous step failed
         with:
-          report_paths: 'report*'
+          report_paths: 'report.xml'
           token: ${{ secrets.GH_PAT }}

From f9bce78ca9a8a65bb48992a18b4ec91ab9917871 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Wed, 19 Oct 2022 19:47:08 +0300
Subject: [PATCH 65/76] Debug

---
 .github/workflows/dispatch.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index 7646bb1e5..9a960d597 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -18,7 +18,7 @@ jobs:
   
   call-test:
     name: "Test"
-    needs: call-build
+    # needs: call-build
     uses: ./.github/workflows/test.yml
     secrets: inherit
 

From 6d412c6579ac0710e290b9b3001b8a8e12ff06ae Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Wed, 19 Oct 2022 20:03:59 +0300
Subject: [PATCH 66/76] Debug

---
 .github/workflows/dispatch.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index 9a960d597..2107d062d 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -22,9 +22,9 @@ jobs:
     uses: ./.github/workflows/test.yml
     secrets: inherit
 
-  call-release:
-    name: "Release"
-    needs: [call-build, call-test]
-    if: ${{ github.ref_protected == true }}
-    uses: ./.github/workflows/release.yml
-    secrets: inherit
+  # call-release:
+  #   name: "Release"
+  #   needs: [call-build, call-test]
+  #   if: ${{ github.ref_protected == true }}
+  #   uses: ./.github/workflows/release.yml
+  #   secrets: inherit

From 9b0b6556ac760ff6bd43b9c4eac484170a3ce3b9 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Thu, 20 Oct 2022 10:39:09 +0300
Subject: [PATCH 67/76] Debug

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f751605cc..4633de335 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,4 +35,4 @@ jobs:
         if: success() || failure()        # run this step even if previous step failed
         with:
           report_paths: 'report.xml'
-          token: ${{ secrets.GH_PAT }}
+          token: ${{ secrets.GITHUB_TOKEN }}

From 3e7d143670f7eda9fcf780349984ce49c105d38a Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Thu, 20 Oct 2022 10:43:09 +0300
Subject: [PATCH 68/76] Add permissions for checks

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4633de335..5587b749d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,6 +9,7 @@ env:
 permissions:
   contents: write
   packages: read
+  checks: write
 
 jobs:
   unit-tests:

From e847ffc6a60249c65b1aed999679d679d3bbf4cb Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Thu, 20 Oct 2022 10:47:21 +0300
Subject: [PATCH 69/76] Check fails

---
 x/cheqd/types/did_verification_method_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x/cheqd/types/did_verification_method_test.go b/x/cheqd/types/did_verification_method_test.go
index 91d4f9cf6..845082f05 100644
--- a/x/cheqd/types/did_verification_method_test.go
+++ b/x/cheqd/types/did_verification_method_test.go
@@ -47,7 +47,7 @@ var _ = Describe("Verification Method tests", func() {
 					PublicKeyMultibase: ValidEd25519PubKey,
 				},
 				isValid:  true,
-				errorMsg: "",
+				errorMsg: "123",
 			}),
 
 		Entry(

From 7f0138dd2e3de5ba6e287c4f3099ef4732ee6d42 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Thu, 20 Oct 2022 10:52:43 +0300
Subject: [PATCH 70/76] Check failure case

---
 x/cheqd/types/did_verification_method_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x/cheqd/types/did_verification_method_test.go b/x/cheqd/types/did_verification_method_test.go
index 845082f05..ce12e03e1 100644
--- a/x/cheqd/types/did_verification_method_test.go
+++ b/x/cheqd/types/did_verification_method_test.go
@@ -46,7 +46,7 @@ var _ = Describe("Verification Method tests", func() {
 					PublicKeyJwk:       nil,
 					PublicKeyMultibase: ValidEd25519PubKey,
 				},
-				isValid:  true,
+				isValid:  false,
 				errorMsg: "123",
 			}),
 

From d612273164520e9fb276bb96641650e16123846a Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Thu, 20 Oct 2022 11:04:20 +0300
Subject: [PATCH 71/76] MAke it more verbose

---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5587b749d..8ba41ca79 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,3 +37,6 @@ jobs:
         with:
           report_paths: 'report.xml'
           token: ${{ secrets.GITHUB_TOKEN }}
+          suite_regex: '*'
+          include_passed: true
+          detailed_summary: true

From 4755fa0744747e1d6c3b7f792f1271d408c53319 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Thu, 20 Oct 2022 11:11:49 +0300
Subject: [PATCH 72/76] Move test back

---
 x/cheqd/types/did_verification_method_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x/cheqd/types/did_verification_method_test.go b/x/cheqd/types/did_verification_method_test.go
index ce12e03e1..91d4f9cf6 100644
--- a/x/cheqd/types/did_verification_method_test.go
+++ b/x/cheqd/types/did_verification_method_test.go
@@ -46,8 +46,8 @@ var _ = Describe("Verification Method tests", func() {
 					PublicKeyJwk:       nil,
 					PublicKeyMultibase: ValidEd25519PubKey,
 				},
-				isValid:  false,
-				errorMsg: "123",
+				isValid:  true,
+				errorMsg: "",
 			}),
 
 		Entry(

From 6a8f772149a54ede79220b7cfec120cb51023bff Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Thu, 20 Oct 2022 11:31:52 +0300
Subject: [PATCH 73/76] Try JSON reporter

---
 .github/workflows/test.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8ba41ca79..aa01ddec9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -40,3 +40,11 @@ jobs:
           suite_regex: '*'
           include_passed: true
           detailed_summary: true
+
+      - uses: dorny/test-reporter@v1
+        if: success() || failure()    # run this step even if previous step failed
+        with:
+          name: JSON reports            # Name of the check run which will be created
+          path: 'report.json'    # Path to test results
+          reporter: mocha-json
+          token: ${{ secrets.GITHUB_TOKEN }}

From 264555ae4d71ad601acf51550965a53521e6e3dc Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Thu, 20 Oct 2022 11:36:35 +0300
Subject: [PATCH 74/76] Try flutter reporter

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index aa01ddec9..2463df2fc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -46,5 +46,5 @@ jobs:
         with:
           name: JSON reports            # Name of the check run which will be created
           path: 'report.json'    # Path to test results
-          reporter: mocha-json
+          reporter: flutter-json
           token: ${{ secrets.GITHUB_TOKEN }}

From ff71c576088166b482848cf1221a530f38135c1b Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Thu, 20 Oct 2022 11:40:22 +0300
Subject: [PATCH 75/76] Try dart JSON reporter

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2463df2fc..caabb0fea 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -46,5 +46,5 @@ jobs:
         with:
           name: JSON reports            # Name of the check run which will be created
           path: 'report.json'    # Path to test results
-          reporter: flutter-json
+          reporter: dart-json
           token: ${{ secrets.GITHUB_TOKEN }}

From bd20ed8ab482f532a86648b946f866d7eee2f713 Mon Sep 17 00:00:00 2001
From: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date: Thu, 20 Oct 2022 11:46:55 +0300
Subject: [PATCH 76/76] Keep only JUnit reports

---
 .github/workflows/dispatch.yml | 28 ++++++++++++++--------------
 .github/workflows/test.yml     |  8 --------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index 2107d062d..15f64f143 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -7,24 +7,24 @@ concurrency:
 
 jobs:
 
-  # call-lint:
-  #   name: "Lint"
-  #   uses: ./.github/workflows/lint.yml
+  call-lint:
+    name: "Lint"
+    uses: ./.github/workflows/lint.yml
 
-  # call-build:
-  #   name: "Build"
-  #   needs: call-lint
-  #   uses: ./.github/workflows/build.yml
+  call-build:
+    name: "Build"
+    needs: call-lint
+    uses: ./.github/workflows/build.yml
   
   call-test:
     name: "Test"
-    # needs: call-build
+    needs: call-build
     uses: ./.github/workflows/test.yml
     secrets: inherit
 
-  # call-release:
-  #   name: "Release"
-  #   needs: [call-build, call-test]
-  #   if: ${{ github.ref_protected == true }}
-  #   uses: ./.github/workflows/release.yml
-  #   secrets: inherit
+  call-release:
+    name: "Release"
+    needs: [call-build, call-test]
+    if: ${{ github.ref_protected == true }}
+    uses: ./.github/workflows/release.yml
+    secrets: inherit
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index caabb0fea..8ba41ca79 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -40,11 +40,3 @@ jobs:
           suite_regex: '*'
           include_passed: true
           detailed_summary: true
-
-      - uses: dorny/test-reporter@v1
-        if: success() || failure()    # run this step even if previous step failed
-        with:
-          name: JSON reports            # Name of the check run which will be created
-          path: 'report.json'    # Path to test results
-          reporter: dart-json
-          token: ${{ secrets.GITHUB_TOKEN }}