Skip to content

Commit

Permalink
Fix the move-binary-format name clash with the wasm version (Mysten…
Browse files Browse the repository at this point in the history
…Labs#13922)

## Description 
This PR fixes the issue of compiling a Rust project that pulls Sui as a
dependency from the git repo, due to name clashing in the
`move-binary-format` crates. It should fix and close MystenLabs#13853

## Test Plan 
`cargo check`
`cargo build` 
Tested via a new cargo project that pulls Sui as a dependency using the
git repository from our GitHub.
```
***Cargo.toml excerpt***
[dependencies]
sui-types = { git = "https://github.com/stefan-mysten/sui", branch = "fix_wasm_move" }
```
<img width="843" alt="image"
src="https://github.com/MystenLabs/sui/assets/135084671/421eca75-1d8a-4b7f-bc4e-60a6d2f8b704">


---
If your changes are not user-facing and not a breaking change, you can
skip the following section. Otherwise, please indicate what changed, and
then add to the Release Notes section as highlighted during the release
process.

### Type of Change (Check all that apply)

- [ ] protocol change
- [ ] user-visible impact
- [ ] breaking change for a client SDKs
- [ ] breaking change for FNs (FN binary must upgrade)
- [ ] breaking change for validators or node operators (must upgrade
binaries)
- [ ] breaking change for on-chain data layout
- [ ] necessitate either a data wipe or data migration

### Release notes
This PR fixes the issue of compiling a Rust project that pulls the sui
repo through a git dependency, due to name clashing in the
`move-binary-format` crates. It should fix and close MystenLabs#13853
  • Loading branch information
stefan-mysten authored Sep 23, 2023
1 parent 64df54b commit 446c1e5
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ exclude = [
"external-crates/move/tools/read-write-set",
"external-crates/move/tools/read-write-set/dynamic",
"external-crates/move/tools/read-write-set/types",
"sdk/move-binary-format",
"sdk/move-binary-format-wasm",
]

members = [
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"kiosk": "pnpm --filter ./sdk/kiosk",
"suins": "pnpm --filter ./sdk/suins-toolkit",
"deepbook": "pnpm --filter ./sdk/deepbook",
"mbf": "pnpm --filter ./sdk/move-binary-format",
"mbf": "pnpm --filter ./sdk/move-binary-format-wasm",
"multisig": "pnpm --filter ./dapps/multisig-toolkit",
"changeset-version": "pnpm changeset version && pnpm sdk codegen:version",
"prettier:check": "prettier -c --ignore-unknown .",
Expand Down
4 changes: 3 additions & 1 deletion pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "move-binary-format"
description = "WASM versions of the move-binary-format"
name = "move-binary-format-wasm"
description = "WASM variant of the move-binary-format"
version = "0.1.0"
authors = ["Mysten Labs <build@mystenlabs.com>"]
edition = "2021"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 446c1e5

Please sign in to comment.