Skip to content

Commit

Permalink
Rename chia-wallet to chia-puzzles
Browse files Browse the repository at this point in the history
  • Loading branch information
Rigidity committed Apr 29, 2024
1 parent 6da9f22 commit 439ba81
Show file tree
Hide file tree
Showing 26 changed files with 57 additions and 57 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-crate-and-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@ jobs:
cd crates/chia-protocol
cargo publish
- name: publish to crates.io if tagged (chia-wallet)
- name: publish to crates.io if tagged (chia-puzzles)
continue-on-error: true
if: startsWith(github.event.ref, 'refs/tags')
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.cargo_registry_token }}
run: |
cd crates/chia-wallet
cd crates/chia-puzzles
cargo publish
- name: publish to crates.io if tagged (chia-client)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,9 @@ jobs:
cd crates/chia-protocol
cargo +nightly fuzz build
cargo fuzz list | xargs -I "%" sh -c "cargo +nightly fuzz run % -- -max_total_time=20 || exit 255"
- name: cargo fuzz (chia-wallet)
- name: cargo fuzz (chia-puzzles)
run: |
cd crates/chia-wallet
cd crates/chia-puzzles
cargo +nightly fuzz build
cargo fuzz list | xargs -I "%" sh -c "cargo +nightly fuzz run % -- -max_total_time=20 || exit 255"
Expand Down
60 changes: 30 additions & 30 deletions Cargo.lock

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

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ members = [
"crates/chia-ssl",
"crates/chia-tools",
"crates/chia-traits",
"crates/chia-wallet",
"crates/chia-wallet/fuzz",
"crates/chia-puzzles",
"crates/chia-puzzles/fuzz",
"crates/clvm-derive",
"crates/clvm-traits",
"crates/clvm-utils",
Expand Down Expand Up @@ -44,7 +44,7 @@ default = [
"protocol",
"ssl",
"traits",
"wallet",
"puzzles",
"clvm-traits",
"clvm-utils"
]
Expand All @@ -55,7 +55,7 @@ consensus = ["dep:chia-consensus"]
protocol = ["dep:chia-protocol"]
ssl = ["dep:chia-ssl"]
traits = ["dep:chia-traits"]
wallet = ["dep:chia-wallet"]
puzzles = ["dep:chia-puzzles"]
clvm-traits = ["dep:clvm-traits"]
clvm-utils = ["dep:clvm-utils"]

Expand All @@ -66,7 +66,7 @@ chia-consensus = { path = "./crates/chia-consensus", version = "0.7.0", optional
chia-protocol = { path = "./crates/chia-protocol", version = "0.7.0", optional = true }
chia-ssl = { path = "./crates/chia-ssl", version = "0.7.0", optional = true }
chia-traits = { path = "./crates/chia-traits", version = "0.7.0", optional = true }
chia-wallet = { path = "./crates/chia-wallet", version = "0.7.0", optional = true }
chia-puzzles = { path = "./crates/chia-puzzles", version = "0.7.0", optional = true }
clvm-traits = { path = "./crates/clvm-traits", version = "0.7.0", optional = true }
clvm-utils = { path = "./crates/clvm-utils", version = "0.7.0", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ The following crates have fuzzers:

* chia-bls
* chia-protocol
* chia-wallet
* chia-puzzles
* clvm-utils
* chia (the root crate)

Expand Down
4 changes: 2 additions & 2 deletions bump-version.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
"crates/chia-tools",
"crates/clvm-utils",
"crates/clvm-derive",
"crates/chia-wallet",
"crates/chia-puzzles",
"crates/chia-client",
"crates/chia-ssl",
"crates/chia-consensus",
"crates/chia-consensus/fuzz",
"crates/chia-wallet/fuzz",
"crates/chia-puzzles/fuzz",
"crates/clvm-utils/fuzz",
]

Expand Down
2 changes: 1 addition & 1 deletion crates/chia-consensus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ chia-traits = { version = "0.7.0", path = "../chia-traits" }
clvm-traits = { version = "0.7.0", path = "../clvm-traits" }
clvm-derive = { version = "0.6.0", path = "../clvm-derive" }
chia-protocol = { version = "0.7.0", path = "../chia-protocol" }
chia-wallet = { version = "0.7.0", path = "../chia-wallet" }
chia-puzzles = { version = "0.7.0", path = "../chia-puzzles" }
hex-literal = "0.4.1"
thiserror = "1.0.44"

Expand Down
4 changes: 2 additions & 2 deletions crates/chia-consensus/src/fast_forward.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use crate::error::{Error, Result};
use chia_protocol::Bytes32;
use chia_protocol::Coin;
use chia_wallet::singleton::{
use chia_puzzles::singleton::{
SingletonArgs, SingletonSolution, SingletonStruct, SINGLETON_TOP_LAYER_PUZZLE_HASH,
};
use chia_wallet::Proof;
use chia_puzzles::Proof;
use clvm_traits::{FromClvm, ToClvm};
use clvm_utils::CurriedProgram;
use clvm_utils::{tree_hash, tree_hash_atom, tree_hash_pair};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "chia-wallet"
name = "chia-puzzles"
version = "0.7.0"
edition = "2021"
license = "Apache-2.0"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "chia-wallet-fuzz"
name = "chia-puzzles-fuzz"
version = "0.6.0"
authors = ["Automatically generated"]
publish = false
Expand All @@ -12,7 +12,7 @@ cargo-fuzz = true
libfuzzer-sys = "0.4"
clvmr = "0.6.1"
pyo3 = { version = ">=0.19.0", features = ["auto-initialize"]}
chia-wallet = { path = "..", features = ["arbitrary"] }
chia-puzzles = { path = "..", features = ["arbitrary"] }
clvm-traits = { version = "0.7.0", path = "../../clvm-traits" }

[[bin]]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use std::fmt;

use chia_wallet::{nft::NftMetadata, Proof};
use chia_puzzles::{nft::NftMetadata, Proof};
use clvm_traits::{FromClvm, ToClvm};
use clvmr::{allocator::NodePtr, Allocator};
use libfuzzer_sys::arbitrary::{Arbitrary, Unstructured};
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion crates/chia-tools/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ chia-protocol = { version = "0.7.0", path = "../chia-protocol" }
chia-traits = { version = "0.7.0", path = "../chia-traits" }
clvm-utils = { version = "0.7.0", path = "../clvm-utils" }
clvm-traits = { version = "0.7.0", path = "../clvm-traits" }
chia-wallet = { version = "0.7.0", path = "../chia-wallet" }
chia-puzzles = { version = "0.7.0", path = "../chia-puzzles" }
chia-bls = { version = "0.7.0", path = "../chia-bls" }
chia-consensus = { version = "0.7.0", path = "../chia-consensus" }
clvmr = { version = "0.6.0", features = ["counters"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/chia-tools/src/bin/gen-corpus.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use chia_tools::{iterate_tx_blocks, visit_spends};
use chia_traits::streamable::Streamable;

use chia_protocol::{Bytes32, Coin, CoinSpend, Program, SpendBundle};
use chia_wallet::singleton::SINGLETON_TOP_LAYER_PUZZLE_HASH;
use chia_puzzles::singleton::SINGLETON_TOP_LAYER_PUZZLE_HASH;
use clvm_traits::{FromClvm, FromNodePtr};
use clvm_utils::{tree_hash, CurriedProgram};
use clvmr::allocator::NodePtr;
Expand Down
10 changes: 5 additions & 5 deletions crates/chia-tools/src/bin/run-spend.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
use chia_consensus::gen::conditions::Condition;
use chia_puzzles::Proof;
use chia_traits::Streamable;
use chia_wallet::Proof;
use clap::Parser;
use clvm_traits::{FromClvm, ToNodePtr};
use clvm_utils::tree_hash;
use clvm_utils::CurriedProgram;
use clvmr::{allocator::NodePtr, Allocator};

use chia_wallet::cat::{CatArgs, CatSolution, CAT_PUZZLE_HASH};
use chia_wallet::did::{DidArgs, DidSolution, DID_INNER_PUZZLE_HASH};
use chia_wallet::singleton::{SingletonArgs, SingletonSolution, SINGLETON_TOP_LAYER_PUZZLE_HASH};
use chia_wallet::standard::{StandardArgs, StandardSolution, STANDARD_PUZZLE_HASH};
use chia_puzzles::cat::{CatArgs, CatSolution, CAT_PUZZLE_HASH};
use chia_puzzles::did::{DidArgs, DidSolution, DID_INNER_PUZZLE_HASH};
use chia_puzzles::singleton::{SingletonArgs, SingletonSolution, SINGLETON_TOP_LAYER_PUZZLE_HASH};
use chia_puzzles::standard::{StandardArgs, StandardSolution, STANDARD_PUZZLE_HASH};

/// Run a puzzle given a solution and print the resulting conditions
#[derive(Parser, Debug)]
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ pub use chia_bls as bls;
pub use chia_client as client;
pub use chia_consensus as consensus;
pub use chia_protocol as protocol;
pub use chia_puzzles as puzzles;
pub use chia_ssl as ssl;
pub use chia_traits as traits;
pub use chia_wallet as wallet;
pub use clvm_traits;
pub use clvm_utils;

0 comments on commit 439ba81

Please sign in to comment.