From 332c6fb21773913c2eb6585d27bcbd02860d749a Mon Sep 17 00:00:00 2001 From: neeraj Date: Mon, 1 Apr 2024 15:32:58 +0530 Subject: [PATCH] Rename laconic2d to laconicd --- .gitea/workflows/test.yml | 16 ++++++++-------- README.md | 2 +- docker-compose.yml | 8 ++++---- test/README.md | 2 +- test/run-tests.sh | 20 ++++++++++---------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index f9d6c1e..09577f8 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -35,21 +35,21 @@ jobs: - name: Install registry-cli run: yarn global add file:$PWD - - name: Checkout laconic2d + - name: Checkout laconicd uses: actions/checkout@v3 with: - path: "./laconic2d/" - repository: cerc-io/laconic2d + path: "./laconicd/" + repository: cerc-io/laconic2d # TODO: Update to laconicd after renaming repo fetch-depth: 0 ref: main - - name: Build laconic2d container - working-directory: ./laconic2d/tests/sdk_tests - run: ./build-laconic2d-container.sh - - name: Start laconic2d container + - name: Build laconicd container + working-directory: ./laconicd/tests/sdk_tests + run: ./build-laconicd-container.sh + - name: Start laconicd container env: TEST_AUCTION_ENABLED: true - run: docker compose up laconic2d -d + run: docker compose up laconicd -d - name: Run registry-cli tests run: ./test/run-tests.sh diff --git a/README.md b/README.md index 4fed61f..1c98b03 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Run the chain: Registering records in registry requires an account. To get account private key run: ```bash -laconic2d keys export alice --keyring-backend test --unarmored-hex --unsafe +laconicd keys export alice --keyring-backend test --unarmored-hex --unsafe ``` In `config.yml` file assign the account private key to `userKey`. diff --git a/docker-compose.yml b/docker-compose.yml index 6eb7379..cef6090 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,14 @@ services: - laconic2d: + laconicd: restart: unless-stopped - image: cerc/laconic2d:local + image: cerc/laconicd:local command: ["sh", "/docker-entrypoint-scripts.d/create-fixturenet.sh"] environment: - TEST_AUCTION_ENABLED - TEST_REGISTRY_EXPIRY - LOGLEVEL volumes: - - ./laconic2d/scripts/init.sh:/docker-entrypoint-scripts.d/create-fixturenet.sh + - ./laconicd/scripts/init.sh:/docker-entrypoint-scripts.d/create-fixturenet.sh healthcheck: test: ["CMD", "curl", "-v", "http://127.0.0.1:6060"] interval: 1s @@ -22,6 +22,6 @@ services: cli-test-runner: image: cerc/laconic-registry-cli:local depends_on: - laconic2d: + laconicd: condition: service_healthy command: tail -F /dev/null diff --git a/test/README.md b/test/README.md index 1a2e3fb..b2eb727 100644 --- a/test/README.md +++ b/test/README.md @@ -17,7 +17,7 @@ * Get account address of test account: ```bash - laconic2d keys list --keyring-backend test + laconicd keys list --keyring-backend test # - address: laconic10er85pyd7ukw732e88fzv7k0jq205764hye2dx # name: alice diff --git a/test/run-tests.sh b/test/run-tests.sh index 8653fdb..12d77e3 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -1,24 +1,24 @@ #!/usr/bin/env bash -# Get the key from laconic2d -laconic2d_key=$(yes | docker compose exec laconic2d laconic2d keys export alice --keyring-backend test --unarmored-hex --unsafe) +# Get the key from laconicd +laconicd_key=$(yes | docker compose exec laconicd laconicd keys export alice --keyring-backend test --unarmored-hex --unsafe) # Get the fixturenet account address -laconic2d_account_address=$(docker compose exec laconic2d laconic2d keys list --keyring-backend test | awk '/- address:/ {print $3}') +laconicd_account_address=$(docker compose exec laconicd laconicd keys list --keyring-backend test | awk '/- address:/ {print $3}') # Set parameters for the test suite cosmos_chain_id=laconic_9000-1 -laconic2d_rpc_endpoint=http://127.0.0.1:26657 -laconic2d_gql_endpoint=http://127.0.0.1:9473/api +laconicd_rpc_endpoint=http://127.0.0.1:26657 +laconicd_gql_endpoint=http://127.0.0.1:9473/api # Create the required config config_file="config.yml" config=$(cat < "$config_file" # Wait for the laconid endpoint to come up -docker compose exec laconic2d sh -c "curl --retry 10 --retry-delay 3 --retry-connrefused http://127.0.0.1:9473/api" +docker compose exec laconicd sh -c "curl --retry 10 --retry-delay 3 --retry-connrefused http://127.0.0.1:9473/api" # Run tests -TEST_ACCOUNT=$laconic2d_account_address yarn test +TEST_ACCOUNT=$laconicd_account_address yarn test