Skip to content

Commit

Permalink
fix: missing renames (#1530)
Browse files Browse the repository at this point in the history
* fix: missing renames

* fix: fmt with dprint + rustfmt

* fix: false positive renames (iotate->suite)

* fix: skip rustfmt for the comments in keytool tests
  • Loading branch information
muXxer authored Aug 1, 2024
1 parent 2bc3163 commit f1c4fa1
Show file tree
Hide file tree
Showing 44 changed files with 107 additions and 103 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/doc-bug.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: IOTA doc content issue or request
about: Creates an issue for Sui documentation
about: Creates an issue for IOTA documentation
title: 'IOTA doc content issue or request'
labels: doc-issue
---
Expand Down
14 changes: 7 additions & 7 deletions .github/actions/diffs/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ runs:
- "crates/**"
- "external-crates/**"
- "narwhal/**"
- "sui-execution/**"
- "iota-execution/**"
- ".github/workflows/codecov.yml"
- ".github/workflows/rust.yml"
- ".github/workflows/external.yml"
Expand All @@ -43,13 +43,13 @@ runs:
- "doc/**"
- "*.md"
isMove:
- "crates/sui-framework/**"
- "crates/sui-framework-build/**"
- "crates/sui-framework-tests/**"
- "crates/sui_move/**"
- "crates/iota-framework/**"
- "crates/iota-framework-build/**"
- "crates/iota-framework-tests/**"
- "crates/iota-move/**"
- "Cargo.toml"
- "examples/**"
- "sui_programmability/**"
- "iota_programmability/**"
isReleaseNotesEligible:
- "consensus/**"
- "crates/**"
Expand All @@ -60,4 +60,4 @@ runs:
- "kiosk/**"
- "narwhal/**"
- "nre/**"
- "sui-execution/**"
- "iota-execution/**"
2 changes: 1 addition & 1 deletion .github/actions/ts-e2e/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ runs:
shell: bash

- name: Run TS SDK e2e tests
run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter @iota/iota.js --filter @mysten/graphql-transport test:e2e'
run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter @iota/iota.js --filter @iota/graphql-transport test:e2e'
shell: bash

- name: Run Explorer e2e tests
Expand Down
2 changes: 1 addition & 1 deletion .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Add 'Foo' to any changes within 'bar' folder or any subfolders
"Type: Documentation":
- docs/content/**/*
"sui-explorer":
"iota-explorer":
- explorer/**/*
11 changes: 6 additions & 5 deletions .github/scripts/rosetta/setup.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
#!/bin/bash
# Copyright (c) Mysten Labs, Inc.
# Modifications Copyright (c) 2024 IOTA Stiftung
# SPDX-License-Identifier: Apache-2.0

echo "Install binaries"
cargo install --locked --bin sui --path crates/sui
cargo install --locked --bin sui-rosetta --path crates/sui-rosetta
cargo install --locked --bin iota --path crates/iota
cargo install --locked --bin iota-rosetta --path crates/iota-rosetta

echo "run Sui genesis"
sui genesis
echo "run IOTA genesis"
iota genesis

echo "generate rosetta configuration"
sui-rosetta generate-rosetta-cli-config --online-url http://127.0.0.1:9002 --offline-url http://127.0.0.1:9003
iota-rosetta generate-rosetta-cli-config --online-url http://127.0.0.1:9002 --offline-url http://127.0.0.1:9003

echo "install rosetta-cli"
curl -sSfL https://raw.githubusercontent.com/coinbase/rosetta-cli/master/scripts/install.sh | sh -s
5 changes: 3 additions & 2 deletions .github/scripts/rosetta/start_rosetta.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#!/bin/bash
# Copyright (c) Mysten Labs, Inc.
# Modifications Copyright (c) 2024 IOTA Stiftung
# SPDX-License-Identifier: Apache-2.0

echo "Start Rosetta online server"
sui-rosetta start-online-server --data-path ./data &
iota-rosetta start-online-server --data-path ./data &

echo "Start Rosetta offline server"
sui-rosetta start-offline-server &
iota-rosetta start-offline-server &
4 changes: 2 additions & 2 deletions .github/workflows/cargo-llvm-cov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ env:
jobs:
cargo-llvm-cov:
name: Generate code coverage
runs-on: [ubuntu-ghcloud]
runs-on: [self-hosted]
timeout-minutes: 120
env:
CARGO_TERM_COLOR: always
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:

- name: Get slack id for the oncall
run: |
export slack_id=$(aws s3 cp s3://mysten-employees-dir/employees.json - | jq --arg ONCALL "${{ env.current_oncall }}" '.[] | if .name == $ONCALL then .slack_id else empty end')
export slack_id=$(aws s3 cp s3://iota-employees-dir/employees.json - | jq --arg ONCALL "${{ env.current_oncall }}" '.[] | if .name == $ONCALL then .slack_id else empty end')
echo "slack_id=$(echo ${slack_id} | tr -d '"')" >> $GITHUB_ENV
- name: Post to slack
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changesets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Dispatch Changesets To Operations
uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # pin@v3.0.0
with:
repository: MystenLabs/iota-operations
repository: iotaledger/iota-operations
token: ${{ secrets.CHANGESETS_DEPLOY_DISPATCH }}
event-type: changesets
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ jobs:
- name: Run TS SDK e2e tests
if: ${{ needs.diff.outputs.isTypescriptSDK == 'true' || needs.diff.outputs.isRust == 'true'}}
run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter @mysten/iota.js test:e2e'
run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter @iota/iota.js test:e2e'

- name: Run RPC/GrpahQL comaptability e2e tests
if: ${{ needs.diff.outputs.isGraphQlTransport == 'true' || needs.diff.outputs.isRust == 'true'}}
run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter @mysten/graphql-transport test:e2e'
run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter @iota/graphql-transport test:e2e'

- name: Build explorer
if: ${{ needs.diff.outputs.isTypescriptSDK == 'true' || needs.diff.outputs.isExplorer == 'true' || needs.diff.outputs.isRust == 'true'}}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-notes-monitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
export author=$(gh api -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /repos/iotaledger/iota/pulls/${{ matrix.pr }}} --jq ".user.login")
export slack_id=$(aws s3 cp s3://mysten-employees-dir/employees.json - | jq --arg AUTHOR "${author}" '.[] | if .github_handle == $AUTHOR then .slack_id else empty end')
export slack_id=$(aws s3 cp s3://iota-employees-dir/employees.json - | jq --arg AUTHOR "${author}" '.[] | if .github_handle == $AUTHOR then .slack_id else empty end')
echo "slack_id=$(echo ${slack_id} | tr -d '"')" >> $GITHUB_ENV
- name: Post to a Slack channel
uses: slackapi/slack-github-action@34c3fd73326693ef04728f8611669d918a2d781d # pin@v1.19.0
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
with:
channel-id: "#ext-mysten-release-notes"
channel-id: "#ext-iota-release-notes"
payload: |
{
"text": "PR *${{ matrix.pr }}* Release Notes",
Expand All @@ -105,7 +105,7 @@ jobs:
runs-on: self-hosted
needs: [get-list-of-prs]
if: ${{ success() && needs.get-list-of-prs.outputs.existing_commit_tag == '' }}
uses: iotaleger/iota/.github/workflows/tag.yml@main
uses: iotaledger/iota/.github/workflows/tag.yml@main
with:
iota_commit: ${{ needs.get-list-of-prs.outputs.new_commit_hash }}
tag_name: ${{ needs.get-list-of-prs.outputs.new_tag }}
Expand Down
33 changes: 16 additions & 17 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,16 @@ jobs:
timeout-minutes: 80
strategy:
matrix:
os:
[
windows-ghcloud,
self-hosted,
macos-latest-xl,
macos-arm64-self-hosted,
]
os: [
windows-ghcloud, # windows-x86_64
self-hosted, # ubuntu-x86_64
macos-latest-xl, # macos-x86_64
macos-arm64-self-hosted, # macos-arm64
]
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
- name: Clean up and validate tag name ${{ env.TAG_NAME }}
- name: Clean up and validate ${{ env.TAG_NAME }} tag name
shell: bash
run: |
export iota_tag=$(echo ${{ env.TAG_NAME }} | sed s/'refs\/tags\/'//)
Expand Down Expand Up @@ -175,11 +174,11 @@ jobs:
cat <<EOF >>VERIFICATION.txt
IOTA Binary verification steps
1. Go to https://github.com/MystenLabs/iota/releases/download/${{ env.iota_tag }}/iota-${{ env.iota_tag }}-windows-x86_64.tgz
1. Go to https://github.com/iotaledger/iota/releases/download/${{ env.iota_tag }}/iota-${{ env.iota_tag }}-windows-x86_64.tgz
2. Extract iota-windows-x86_64.exe
3. checksum.exe -t sha256 iota-windows-x86_64.exe: ${iota_sha}
File 'LICENSE.txt' is obtained from: https://github.com/MystenLabs/iota/blob/main/LICENSE
File 'LICENSE.txt' is obtained from: https://github.com/iotaledger/iota/blob/main/LICENSE
EOF
choco pack --version ${{ env.iota_version }} configuration=release
Expand All @@ -194,15 +193,15 @@ jobs:
path: |
./target/release/iota-${{ env.iota_tag }}-${{ env.os_type }}.tgz
- name: Publish binaries for ${{ env.iota_tag }} release
- name: Attach artifacts to ${{ env.iota_tag }} release in GH
uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # pin@v1
with:
tag_name: ${{ env.iota_tag }}
files: |
./target/release/iota-${{ env.iota_tag }}-${{ env.os_type }}.tgz
update-homebrew-formula:
name: run brew bump-formula-pr for iota on testnet releases
name: Run brew bump-formula-pr for iota on testnet releases
needs: release-build
runs-on: self-hosted
# releasing iota cli on testnet releases because it lags `main` less than mainnet, but is more likely to be stable than devnet
Expand All @@ -229,7 +228,7 @@ jobs:
COMMITTER_TOKEN: ${{ secrets.HOMEBREW_GH_FORMULA_BUMP }}

update-homebrew-tap:
name: update mysten-tap iota.rb file
name: Update homebrew-tap iota.rb file
needs: release-build
runs-on: self-hosted
if: ${{ contains( inputs.iota_tag, 'testnet') || contains( github.ref, 'testnet') }}
Expand All @@ -239,11 +238,11 @@ jobs:
run: |
echo "iota_tag=$(echo ${{ env.TAG_NAME }} | sed s/'refs\/tags\/'//)" >> $GITHUB_ENV
# Checkout MystenLabs/homebrew-tap
# Checkout iotaledger/homebrew-tap
- name: Checkout Target Repository
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # pin@v3
with:
repository: MystenLabs/homebrew-tap
repository: iotaledger/homebrew-tap
# @john's PAT, needs to be rotated jan 5 2025
token: ${{ secrets.HOMEBREW_TAP_REPO_READ_WRITE }}
ref: main
Expand Down Expand Up @@ -307,10 +306,10 @@ jobs:
tag-docker-hub-images:
runs-on: self-hosted
steps:
- name: Dispatch Tagging of images in DockerHub, in MystenLabs/iota-operations
- name: Dispatch Tagging of images in DockerHub, in iotaledger/iota-operations
uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # pin@v3.0.0
with:
repository: MystenLabs/iota-operations
repository: iotaledger/iota-operations
token: ${{ secrets.DOCKER_BINARY_BUILDS_DISPATCH }}
event-type: tag-docker-images
client-payload: '{"iota_commit": "${{ github.sha }}", "repo_name": "all", "tag": "${{ env.TAG_NAME }}"}'
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ jobs:

# This job ensures that Move unit tests are run if there are changes
# to Move code but not Rust code (If there are Rust changes, they
# will be run as part of a larger test iotate).
# will be run as part of a larger test suite).
move-test:
needs: diff
if: needs.diff.outputs.isRust == 'false' && needs.diff.outputs.isMove == 'true'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/simulator-nightly-mysticeti.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
uses: teleport-actions/auth@9091dad16a564f3c5b9c2ec520b234a4872b6879 # pin@v1
with:
# Specify the publically accessible address of your Teleport proxy.
proxy: proxy.mysten-int.com:443
proxy: proxy.iota-int.com:443
# Specify the name of the join token for your bot.
token: iota-simtest-token
# Specify the length of time that the generated credentials should be
Expand All @@ -57,7 +57,7 @@ jobs:
- name: Environment clean
run: |
tsh -i ${{ steps.auth.outputs.identity-file }} --ttl 5 ssh ubuntu@simtest-01 "source ~/.bashrc && source ~/.cargo/env && rm -rf ~/iota"
tsh -i ${{ steps.auth.outputs.identity-file }} --ttl 5 ssh ubuntu@simtest-01 "source ~/.bashrc && source ~/.cargo/env && cd ~/ && git clone git@github.com:MystenLabs/iota.git"
tsh -i ${{ steps.auth.outputs.identity-file }} --ttl 5 ssh ubuntu@simtest-01 "source ~/.bashrc && source ~/.cargo/env && cd ~/ && git clone git@github.com:iotaledger/iota.git"
# Deleting files in tmpfs that usually fill up pretty quickly after each run. Cargo clean to free up space as well.
- name: Tmpfs and cargo clean
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/simulator-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
uses: teleport-actions/auth@9091dad16a564f3c5b9c2ec520b234a4872b6879 # pin@v1
with:
# Specify the publically accessible address of your Teleport proxy.
proxy: proxy.mysten-int.com:443
proxy: proxy.iota-int.com:443
# Specify the name of the join token for your bot.
token: iota-simtest-token
# Specify the length of time that the generated credentials should be
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Environment clean
run: |
tsh -i ${{ steps.auth.outputs.identity-file }} --ttl 5 ssh ubuntu@simtest-01 "source ~/.bashrc && source ~/.cargo/env && rm -rf ~/iota"
tsh -i ${{ steps.auth.outputs.identity-file }} --ttl 5 ssh ubuntu@simtest-01 "source ~/.bashrc && source ~/.cargo/env && cd ~/ && git clone git@github.com:MystenLabs/iota.git"
tsh -i ${{ steps.auth.outputs.identity-file }} --ttl 5 ssh ubuntu@simtest-01 "source ~/.bashrc && source ~/.cargo/env && cd ~/ && git clone git@github.com:iotaledger/iota.git"
# Deleting files in tmpfs that usually fill up pretty quickly after each run. Cargo clean to free up space as well.
- name: Tmpfs and cargo clean
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh_job_link=$(gh api -X GET 'repos/MystenLabs/iota/actions/runs/${{ github.run_id }}/jobs' --jq '.jobs.[0].html_url')
gh_job_link=$(gh api -X GET 'repos/iotaledger/iota/actions/runs/${{ github.run_id }}/jobs' --jq '.jobs.[0].html_url')
echo "gh_job_link=${gh_job_link}" >> $GITHUB_ENV
- name: Get current oncall
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:

- name: Get slack id for the oncall
run: |
export slack_id=$(aws s3 cp s3://mysten-employees-dir/employees.json - | jq --arg ONCALL "${{ env.current_oncall }}" '.[] | if .name == $ONCALL then .slack_id else empty end')
export slack_id=$(aws s3 cp s3://iota-employees-dir/employees.json - | jq --arg ONCALL "${{ env.current_oncall }}" '.[] | if .name == $ONCALL then .slack_id else empty end')
echo "slack_id=$(echo ${slack_id} | tr -d '"')" >> $GITHUB_ENV
- name: Post to slack
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
"type": "section",
"text": {
"type": "mrkdwn",
"text": "IOTA commit: <https://github.com/MystenLabs/iota/commit/${{ env.IOTA_SHA }}|${{ env.IOTA_SHA }}> \nRun: <${{ env.GH_JOB_LINK }}|${{ github.run_id }}>"
"text": "IOTA commit: <https://github.com/iotaledger/iota/commit/${{ env.IOTA_SHA }}|${{ env.IOTA_SHA }}> \nRun: <${{ env.GH_JOB_LINK }}|${{ github.run_id }}>"
}
},
{
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/trigger-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ jobs:
docker-images:
runs-on: self-hosted
steps:
- name: Dispatch Docker Builds in MystenLabs/iota-operations
- name: Dispatch Docker Builds in iotaledger/iota-operations
uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # pin@v3.0.0
with:
repository: MystenLabs/iota-operations
repository: iotaledger/iota-operations
token: ${{ secrets.DOCKER_BINARY_BUILDS_DISPATCH }}
event-type: build-docker-images
client-payload: '{"iota_commit": "${{ github.sha }}", "docker_hub_tag": "${{ github.ref }}"}'

release-binaries:
runs-on: self-hosted
steps:
- name: Dispatch Release binaries builds in MystenLabs/iota-operations
- name: Dispatch Release binaries builds in iotaledger/iota-operations
uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # pin@v3.0.0
with:
repository: MystenLabs/iota-operations
repository: iotaledger/iota-operations
token: ${{ secrets.DOCKER_BINARY_BUILDS_DISPATCH }}
event-type: build-release-binaries
client-payload: '{"iota_commit": "${{ github.sha }}"}'
6 changes: 3 additions & 3 deletions .gitignore.rename
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

# Move build directory
build/
!crates/sui-single-node-benchmark/tests/data/package_publish_from_bytecode/package_a/build/
!crates/sui-single-node-benchmark/tests/data/package_publish_from_bytecode/package_b/build/
!crates/iota-single-node-benchmark/tests/data/package_publish_from_bytecode/package_a/build/
!crates/iota-single-node-benchmark/tests/data/package_publish_from_bytecode/package_b/build/

# Move-related files
.trace
Expand Down Expand Up @@ -50,7 +50,7 @@ playwright/.cache/

# logs
wallet.log.*
sui.log.*
iota.log.*
.vercel
npm-debug.log*
yarn-debug.log*
Expand Down
2 changes: 1 addition & 1 deletion .lycheeignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
file://.*
http://localhost.*
http://127.0.0.1.*
https://gateway.devnet.sui.io.*
https://gateway.devnet.iota.org.*
2 changes: 1 addition & 1 deletion crates/iota-framework/docs/iota-framework/event.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ event::emit(ItemPurchased { item_id: ..., buyer: .... })
Emit a custom Move event, sending the data offchain.

Used for creating custom indexes and tracking onchain
activity in a way that iotats a specific application the most.
activity in a way that suits a specific application the most.

The type <code>
T</code> is the main way to index the event, and can contain
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module iota::event {
/// Emit a custom Move event, sending the data offchain.
///
/// Used for creating custom indexes and tracking onchain
/// activity in a way that iotats a specific application the most.
/// activity in a way that suits a specific application the most.
///
/// The type `T` is the main way to index the event, and can contain
/// phantom parameters, eg `emit(MyEvent<phantom T>)`.
Expand Down
Loading

0 comments on commit f1c4fa1

Please sign in to comment.