Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename 'nft-candy-machine' to 'candy-machine' for consistency #152

Merged
merged 3 commits into from
Jan 25, 2022
Merged

rename 'nft-candy-machine' to 'candy-machine' for consistency #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7f5305
rename 'nft-candy-machine' to 'candy-machine' for consistency
samuelvanderwaal Jan 25, 2022
29903d1
update root package.json and README
samuelvanderwaal Jan 25, 2022
c17a4d6
update workflows for rename
samuelvanderwaal Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/program-candy-machine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
core:
- 'core/**'
package:
- 'nft-candy-machine/**'
- 'candy-machine/**'
build-and-test-candy-machine:
needs: changes
if: ${{ needs.changes.outputs.core == 'true' || needs.changes.outputs.package == 'true' }}
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
# Run test
- name: test-candy-machine
id: run_test
working-directory: ./nft-candy-machine/program
working-directory: ./candy-machine/program
run: |
cargo +${{ env.RUST_TOOLCHAIN }} test -- --nocapture --test-threads 1
cargo +${{ env.RUST_TOOLCHAIN }} test-bpf --version
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sdk-candy-machine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
core:
- 'core/**'
package:
- 'nft-candy-machine/**'
- 'candy-machine/**'
build-lint-and-test-auction:
needs: changes
if: ${{ needs.changes.outputs.core == 'true' || needs.changes.outputs.package == 'true' }}
Expand All @@ -34,4 +34,4 @@ jobs:
- uses: ./.github/actions/yarn-install-and-verify
with:
cache_id: sdk-candy-machine
working_dir: ./nft-candy-machine/js
working_dir: ./candy-machine/js
28 changes: 14 additions & 14 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ members=[
"token-metadata/program",
"token-metadata/test",
"nft-packs/program",
"nft-candy-machine/program",
"candy-machine/program",
"membership-token/program"
]
exclude = [
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Metaplex smart contracts and SDK.

| Name | Program | SDK | Integration Test |
| -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| [Candy Machine](./nft-candy-machine) | [![Program Candy Machine ](https://github.com/metaplex/metaplex-program-library/actions/workflows/program-candy-machine.yml/badge.svg)](https://github.com/metaplex/teamplex/actions/workflows/program-candy-machine.yml) | [![SDK Metaplex](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-candy-machine.yml/badge.svg)](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-candy-machine.yml) | |
| [Candy Machine](./candy-machine) | [![Program Candy Machine ](https://github.com/metaplex/metaplex-program-library/actions/workflows/program-candy-machine.yml/badge.svg)](https://github.com/metaplex/teamplex/actions/workflows/program-candy-machine.yml) | [![SDK Metaplex](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-candy-machine.yml/badge.svg)](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-candy-machine.yml) | |
| [Token Vault](./token-vault) | [![Program Token Vault](https://github.com/metaplex/metaplex-program-library/actions/workflows/program-token-vault.yml/badge.svg)](https://github.com/metaplex/teamplex/actions/workflows/program-token-vault.yml) | [![SDK Token Vault](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-token-vault.yml/badge.svg)](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-token-vault.yml) | |
| [Token Entangler](./token-entangler) | [![Program Token Entangler](https://github.com/metaplex/metaplex-program-library/actions/workflows/program-token-entangler.yml/badge.svg)](https://github.com/metaplex/teamplex/actions/workflows/program-token-entangler.yml) | [![SDK Token Entangler](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-token-entangler.yml/badge.svg)](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-token-entangler.yml) | |
| [Token Metadata](./token-metadata) | [![Program Token Metadata ](https://github.com/metaplex/metaplex-program-library/actions/workflows/program-token-metadata.yml/badge.svg)](https://github.com/metaplex/teamplex/actions/workflows/program-token-metadata.yml) | [![SDK Token Metadata](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-token-metadata.yml/badge.svg)](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-token-metadata.yml) | [![Integration Token Metadata](https://github.com/metaplex-foundation/metaplex-program-library/actions/workflows/integration-token-metadata.yml/badge.svg)](https://github.com/metaplex-foundation/metaplex-program-library/actions/workflows/integration-token-metadata.yml) |
Expand Down
0 nft-candy-machine/js/.eslintignore → candy-machine/js/.eslintignore
View file
Open in desktop
File renamed without changes.
0 nft-candy-machine/js/.eslintrc.js → candy-machine/js/.eslintrc.js
View file
Open in desktop
File renamed without changes.
0 nft-candy-machine/js/.gitignore → candy-machine/js/.gitignore
View file
Open in desktop
File renamed without changes.
0 nft-candy-machine/js/.prettierignore → candy-machine/js/.prettierignore
View file
Open in desktop
File renamed without changes.
0 nft-candy-machine/js/.prettierrc.js → candy-machine/js/.prettierrc.js
View file
Open in desktop
File renamed without changes.
0 nft-candy-machine/js/LICENSE → candy-machine/js/LICENSE
View file
Open in desktop
File renamed without changes.
0 nft-candy-machine/js/README.md → candy-machine/js/README.md
View file
Open in desktop
File renamed without changes.
0 nft-candy-machine/js/package.json → candy-machine/js/package.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion nft-candy-machine/js/scripts/api-gen-ts.js → candy-machine/js/scripts/api-gen-ts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @ts-check
'use strict';

const PROGRAM_NAME = 'nft-candy-machine-v2';
const PROGRAM_NAME = 'mpl-candy-machine';

const path = require('path');
const generatedIdlDir = path.join(__dirname, '..', 'idl');
Expand Down
0 ...candy-machine/js/src/mpl-candy-machine.ts → candy-machine/js/src/mpl-candy-machine.ts
View file
Open in desktop
File renamed without changes.
0 nft-candy-machine/js/tsconfig.build.json → candy-machine/js/tsconfig.build.json
View file
Open in desktop
File renamed without changes.
0 nft-candy-machine/js/tsconfig.json → candy-machine/js/tsconfig.json
View file
Open in desktop
File renamed without changes.
0 nft-candy-machine/js/typedoc.json → candy-machine/js/typedoc.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion nft-candy-machine/program/Cargo.toml → candy-machine/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "mpl-nft-candy-machine"
name = "mpl-candy-machine"
version = "2.0.1"
description = "NFT Candy Machine v2: programmatic and trustless NFT drops."
authors = ["Jordan Prince", "Metaplex Developers <[email protected]>"]
Expand Down
0 nft-candy-machine/program/Xargo.toml → candy-machine/program/Xargo.toml
View file
Open in desktop
File renamed without changes.
0 nft-candy-machine/program/src/lib.rs → candy-machine/program/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 nft-candy-machine/program/src/utils.rs → candy-machine/program/src/utils.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"metaplex/js",
"auction-house/js",
"gumdrop/js",
"nft-candy-machine/js",
"candy-machine/js",
"membership-token/js"
],
"repository": "[email protected]:metaplex-foundation/metaplex-program-library.git",
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,9 +1059,9 @@ __metadata:
languageName: unknown
linkType: soft

"@metaplex-foundation/mpl-candy-machine@workspace:nft-candy-machine/js":
"@metaplex-foundation/mpl-candy-machine@workspace:candy-machine/js":
version: 0.0.0-use.local
resolution: "@metaplex-foundation/mpl-candy-machine@workspace:nft-candy-machine/js"
resolution: "@metaplex-foundation/mpl-candy-machine@workspace:candy-machine/js"
dependencies:
"@metaplex-foundation/beet": 0.0.0
"@metaplex-foundation/beet-solana": 0.0.0
Expand Down