Skip to content

Commit

Permalink
fix(general): fix some things not handled by the rename script (#955)
Browse files Browse the repository at this point in the history
* fix(general): fix some things not handled by the rename script

* More renames

* Rename in ts-e2e action.yml
  • Loading branch information
Thoralf-M authored Jul 3, 2024
1 parent 53b55ec commit e275e1f
Show file tree
Hide file tree
Showing 12 changed files with 54 additions and 52 deletions.
6 changes: 3 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

# These files are used in "porcelain" file comparison,
# we don't want an equality to fail because of line endings.
crates/sui-core/tests/staged/sui.yaml text eol=lf
crates/sui-open-rpc/spec/openrpc.json text eol=lf
sui_core/tests/staged/sui.yaml text eol=lf
crates/iota-core/tests/staged/iota.yaml text eol=lf
crates/iota-open-rpc/spec/openrpc.json text eol=lf
iota_core/tests/staged/iota.yaml text eol=lf

# These files are auto generated
sdk/graphql-transport/src/queries/generated.ts linguist-generated=true
Expand Down
60 changes: 31 additions & 29 deletions .github/actions/ts-e2e/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ description: Run e2e tests with specified branch

inputs:
ref:
description: 'The branch to checkout and run e2e tests on'
description: "The branch to checkout and run e2e tests on"
required: true

runs:
using: composite
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
with:
ref: ${{ inputs.ref }}
# Disabled for now as it makes test runs take longer
Expand All @@ -18,63 +18,65 @@ runs:
with:
version: 9

- name: Check s3 if binaries have been uploaded already
continue-on-error: true
id: check_s3
run: |
echo "Checking if s3 binaries have been built for ${{ github.sha }}"
echo "s3_file_exist=$(curl -Is https://sui-releases.s3.us-east-1.amazonaws.com/${{ github.sha }}/debug/sui-test-validator | head -n 1 | grep '200 OK')" >> $GITHUB_ENV
shell: bash
# TODO: we don't upload any releases to S3 yet
# - name: Check s3 if binaries have been uploaded already
# continue-on-error: true
# id: check_s3
# run: |
# echo "Checking if s3 binaries have been built for ${{ github.sha }}"
# echo "s3_file_exist=$(curl -Is https://iota-releases.s3.us-east-1.amazonaws.com/${{ github.sha }}/debug/iota-test-validator | head -n 1 | grep '200 OK')" >> $GITHUB_ENV
# shell: bash

- name: cargo build
if: env.s3_file_exist == '' # if empty, we have not built and uploaded this binary to s3 yet
run: |
cargo build --bin sui-test-validator --bin sui
cargo build --bin iota-test-validator --bin iota
shell: bash

- name: Dowload from S3
if: env.s3_file_exist != '' # only download if the s3 file exists
working-directory: ./target/debug
run: |
mkdir -p $PWD/target/debug
wget -O target/debug/sui-test-validator https://sui-releases.s3.us-east-1.amazonaws.com/${{ github.sha }}/debug/sui-test-validator
chmod +x $PWD/target/debug/sui-test-validator
wget -O target/debug/sui-test-validator https://sui-releases.s3.us-east-1.amazonaws.com/${{ github.sha }}/debug/sui
chmod +x $PWD/target/debug/sui
shell: bash
# TODO: we don't upload any releases to S3 yet
# - name: Download from S3
# if: env.s3_file_exist != '' # only download if the s3 file exists
# working-directory: ./target/debug
# run: |
# mkdir -p $PWD/target/debug
# wget -O target/debug/iota-test-validator https://iota-releases.s3.us-east-1.amazonaws.com/${{ github.sha }}/debug/iota-test-validator
# chmod +x $PWD/target/debug/iota-test-validator
# wget -O target/debug/iota-test-validator https://iota-releases.s3.us-east-1.amazonaws.com/${{ github.sha }}/debug/iota
# chmod +x $PWD/target/debug/iota
# shell: bash

# checkout current branch
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
with:
clean: false

- name: Install Nodejs
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # [email protected]
with:
node-version: '18'
cache: 'pnpm'
node-version: "18"
cache: "pnpm"
- name: Install dependencies
run: pnpm install --frozen-lockfile
shell: bash
- name: Build explorer
run: pnpm turbo --filter=sui-explorer build
run: pnpm turbo --filter=iota-explorer build
shell: bash
- name: Install Playwright Browsers
run: pnpm --filter sui-explorer playwright install --with-deps chromium
run: pnpm --filter iota-explorer playwright install --with-deps chromium
shell: bash

- name: Set env
run: |
echo "E2E_RUN_LOCAL_NET_CMD=(RUST_LOG=\"consensus=off\" $(echo $PWD/target/debug/sui-test-validator) --with-indexer --pg-port 5432 --pg-db-name sui_indexer_v2 --graphql-host 127.0.0.1 --graphql-port 9125)" >> $GITHUB_ENV
echo "VITE_SUI_BIN=$PWD/target/debug/sui" >> $GITHUB_ENV
echo "E2E_RUN_LOCAL_NET_CMD=(RUST_LOG=\"consensus=off\" $(echo $PWD/target/debug/iota-test-validator) --with-indexer --pg-port 5432 --pg-db-name iota_indexer_v2 --graphql-host 127.0.0.1 --graphql-port 9125)" >> $GITHUB_ENV
echo "VITE_IOTA_BIN=$PWD/target/debug/iota" >> $GITHUB_ENV
shell: bash

- name: Run TS SDK e2e tests
run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter @mysten/sui.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 @mysten/graphql-transport test:e2e'
shell: bash

- name: Run Explorer e2e tests
run: pnpm --filter sui-explorer playwright test
run: pnpm --filter iota-explorer playwright test
shell: bash

- uses: actions/upload-artifact@v3
Expand Down
22 changes: 11 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@

# 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/
storage/
!consensus/core/src/storage/
!crates/sui-types/src/storage/
!crates/iota-types/src/storage/
!narwhal/storage/

# Move-related files
Move.lock
!crates/sui-framework/packages/move-stdlib/Move.lock
!crates/sui-framework/packages/sui-framework/Move.lock
!crates/sui-framework/packages/sui-system/Move.lock
!crates/sui-framework/packages/deepbook/Move.lock
!crates/sui-framework/packages/stardust/Move.lock
!crates/sui-framework/packages/timelock/Move.lock
!crates/iota-framework/packages/move-stdlib/Move.lock
!crates/iota-framework/packages/iota-framework/Move.lock
!crates/iota-framework/packages/iota-system/Move.lock
!crates/iota-framework/packages/deepbook/Move.lock
!crates/iota-framework/packages/stardust/Move.lock
!crates/iota-framework/packages/timelock/Move.lock
.trace
.coverage_map.mvcov

Expand Down Expand Up @@ -61,7 +61,7 @@ playwright/.cache/

# logs
wallet.log.*
sui.log.*
iota.log.*
.vercel
npm-debug.log*
yarn-debug.log*
Expand All @@ -81,4 +81,4 @@ lcov.info
# iota-private-network
docker/iota-private-network/data
docker/iota-private-network/configs/validators/validator*
docker/iota-private-network/configs/genesis/genesis.blob
docker/iota-private-network/configs/genesis/genesis.blob
2 changes: 1 addition & 1 deletion apps/core/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# `@iota/core`

This JavaScript library contains helper utilities meant to be used across Mysten Lab's frontend applications.
This JavaScript library contains helper utilities meant to be used across IOTA's frontend applications.
2 changes: 1 addition & 1 deletion apps/wallet/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Iota Wallet

A Chrome extension wallet for [Iota](https://iota.io).
A Chrome extension wallet for [Iota](https://iota.org).

# Set Up

Expand Down
2 changes: 1 addition & 1 deletion chocolatey/iota.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ enclosed in quotation marks, you should use an editor that supports UTF-8, not t
<owners>iota</owners>
<title>Main Iota Binary</title>
<authors>iota</authors>
<projectUrl>https://iota.io/</projectUrl>
<projectUrl>https://iota.org/</projectUrl>
<licenseUrl>https://github.com/iotaledger/iota/blob/main/LICENSE</licenseUrl>
<iconUrl>https://assets-global.website-files.com/6425f546844727ce5fb9e5ab/643775f4a15c9a9e10426daa_Iota_Favicon_256.png</iconUrl>
<projectSourceUrl>https://github.com/iotaledger/iota/</projectSourceUrl>
Expand Down
2 changes: 1 addition & 1 deletion crates/iota-rosetta/src/operations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ impl Operations {
.metadata
.ok_or_else(|| Error::MissingInput("Stake metadata".to_string()))?;

// Total issued SUi is less than u64, safe to cast.
// Total issued IOTA is less than u64, safe to cast.
let amount = if let Some(amount) = op.amount {
if amount.value.is_positive() {
return Err(Error::MalformedOperationError(
Expand Down
2 changes: 1 addition & 1 deletion crates/iota-sdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ async fn main() -> Result<(), anyhow::Error> {

## Documentation for iota-sdk crate

[GitHub Pages](https://mystenlabs.github.io/iota/iota_sdk/index.html) hosts the generated documentation for all Rust crates in the Iota repository.
[GitHub Pages](https://iotaledger.github.io/iota/iota_sdk/index.html) hosts the generated documentation for all Rust crates in the Iota repository.

### Building documentation locally

Expand Down
2 changes: 1 addition & 1 deletion docs/site/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ const config = {
logo: {
alt: "IOTA Logo",
src: "img/iota-logo-footer.svg",
href: "https://iota.io",
href: "https://iota.org",
},
style: "dark",
copyright: ${new Date().getFullYear()} IOTA Foundation | Documentation distributed under <a href="https://github.com/iota-foundation/iota-docs/blob/main/LICENSE">CC BY 4.0</a>`,
Expand Down
2 changes: 1 addition & 1 deletion sdk/docs/pages/typescript/cryptography/keypairs.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ const { schema, secretKey } = decodeIotaPrivateKey(encoded);
const keypair = Ed25519Keypair.fromSecretKey(secretKey);
```

See [SIP-15](https://github.com/iota-foundation/sips/blob/main/sips/sip-15.md) for additional context
See [SIP-15](https://github.com/sui-foundation/sips/blob/main/sips/sip-15.md) for additional context
and motivation.

## Deriving a `Keypair` from a hex encoded secret key
Expand Down
2 changes: 1 addition & 1 deletion sdk/iotans-toolkit/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ const nameObject = await iotansClient.getNameObject('iotans.iota', {

## License

[Apache-2.0](https://github.com/IotaNSdapp/toolkit/blob/main/LICENSE)
[Apache-2.0](https://github.com/SuiNSdapp/toolkit/blob/main/LICENSE)
2 changes: 1 addition & 1 deletion sdk/ledgerjs-hw-app-iota/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ledgerjs-hw-app-iota

[Ledger Hardware Wallet](https://www.ledger.com/) JavaScript bindings for [Iota](https://iota.io/),
[Ledger Hardware Wallet](https://www.ledger.com/) JavaScript bindings for [Iota](https://iota.org/),
based on [LedgerJS](https://github.com/LedgerHQ/ledgerjs).

## Using LedgerJS for Iota
Expand Down

0 comments on commit e275e1f

Please sign in to comment.