Skip to content

Improve snforge_std api #2885

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

Closed
wants to merge 5 commits into from
Closed

Improve snforge_std api #2885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a86bf1
Improve `snforge_std` api
danielrobotz Jan 27, 2025
22892a1
fix: fix the internal import function
danielrobotz Jan 30, 2025
79aa328
feat: fix necessary tests
danielrobotz Jan 30, 2025
beacb9d
Improve `snforge_std` api
danielrobotz Jan 30, 2025
c1a550a
Improve `snforge_std` api
danielrobotz Jan 30, 2025
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
2 changes: 1 addition & 1 deletion crates/snforge-scarb-plugin/tests/integration/single_attributes/available_gas.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fn work_with_number() {
if snforge_std::_internals::_is_config_run() {
let mut data = array![];

snforge_std::_config_types::AvailableGasConfig {
snforge_std::_internals::_config_types::AvailableGasConfig {
gas: 0x7b
}
.serialize(ref data);
Expand Down
18 changes: 9 additions & 9 deletions crates/snforge-scarb-plugin/tests/integration/single_attributes/fork.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ fn accepts_string() {

let mut data = array![];

snforge_std::_config_types::ForkConfig::Named("test")
snforge_std::_internals::_config_types::ForkConfig::Named("test")
.serialize(ref data);

starknet::testing::cheatcode::<'set_config_fork'>(data.span());
Expand Down Expand Up @@ -136,8 +136,8 @@ fn accepts_inline_config() {

let mut data = array![];

snforge_std::_config_types::ForkConfig::Inline(
snforge_std::_config_types::InlineForkConfig {
snforge_std::_internals::_config_types::ForkConfig::Inline(
snforge_std::_internals::_config_types::InlineForkConfig {
url: "http://example.com/",
block: snforge_std::_config_types::BlockId::BlockNumber(0x17)
}
Expand Down Expand Up @@ -170,9 +170,9 @@ fn overriding_config_name_first() {

let mut data = array![];

snforge_std::_config_types::ForkConfig::Overridden(
snforge_std::_config_types::OverriddenForkConfig {
block: snforge_std::_config_types::BlockId::BlockNumber(0x17),
snforge_std::_internals::_config_types::ForkConfig::Overridden(
snforge_std::_internals::_config_types::OverriddenForkConfig {
block: snforge_std::_internals::_config_types::BlockId::BlockNumber(0x17),
name: "MAINNET"
}
)
Expand Down Expand Up @@ -204,9 +204,9 @@ fn overriding_config_name_second() {

let mut data = array![];

snforge_std::_config_types::ForkConfig::Overridden(
snforge_std::_config_types::OverriddenForkConfig {
block: snforge_std::_config_types::BlockId::BlockNumber(0x17),
snforge_std::_internals::_config_types::ForkConfig::Overridden(
snforge_std::_internals::_config_types::OverriddenForkConfig {
block: snforge_std::_internals::_config_types::BlockId::BlockNumber(0x17),
name: "MAINNET"
}
)
Expand Down
8 changes: 4 additions & 4 deletions crates/snforge-scarb-plugin/tests/integration/single_attributes/fuzzer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fn work_without_args() {
if snforge_std::_internals::_is_config_run() {
let mut data = array![];

snforge_std::_config_types::FuzzerConfig {
snforge_std::_internals::_config_types::FuzzerConfig {
seed: Option::None,
runs: Option::None
}
Expand Down Expand Up @@ -50,7 +50,7 @@ fn work_with_both_args() {
if snforge_std::_internals::_is_config_run() {
let mut data = array![];

snforge_std::_config_types::FuzzerConfig {
snforge_std::_internals::_config_types::FuzzerConfig {
seed: Option::Some(0x1f597a5),
runs: Option::Some(0x28f)
}
Expand Down Expand Up @@ -81,7 +81,7 @@ fn work_with_runs_only() {
if snforge_std::_internals::_is_config_run() {
let mut data = array![];

snforge_std::_config_types::FuzzerConfig {
snforge_std::_internals::_config_types::FuzzerConfig {
seed: Option::None,
runs: Option::Some(0x28f)
}
Expand Down Expand Up @@ -112,7 +112,7 @@ fn work_with_seed_only() {
if snforge_std::_internals::_is_config_run() {
let mut data = array![];

snforge_std::_config_types::FuzzerConfig {
snforge_std::_internals::_config_types::FuzzerConfig {
seed: Option::Some(0x28f),
runs: Option::None
}
Expand Down
2 changes: 1 addition & 1 deletion crates/snforge-scarb-plugin/tests/integration/single_attributes/ignore.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fn works_without_args() {
if snforge_std::_internals::_is_config_run() {
let mut data = array![];

snforge_std::_config_types::IgnoreConfig {
snforge_std::_internals::_config_types::IgnoreConfig {
is_ignored: true
}
.serialize(ref data);
Expand Down
26 changes: 13 additions & 13 deletions crates/snforge-scarb-plugin/tests/integration/single_attributes/should_panic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ fn work_with_empty() {
&result,
r"
fn empty_fn() {
if snforge_std::_internals::_is_config_run() {
if _is_config_run() {
let mut data = array![];

snforge_std::_config_types::ShouldPanicConfig {
expected: snforge_std::_config_types::Expected::Any
ShouldPanicConfig {
expected: snforge_std::_internals::_config_types::Expected::Any
}
.serialize(ref data);

Expand Down Expand Up @@ -48,8 +48,8 @@ fn work_with_expected_string() {
if snforge_std::_internals::_is_config_run() {
let mut data = array![];

snforge_std::_config_types::ShouldPanicConfig {
expected: snforge_std::_config_types::Expected::ByteArray("panic data")
ShouldPanicConfig {
expected: snforge_std::_internals::_config_types::Expected::ByteArray("panic data")
}
.serialize(ref data);

Expand Down Expand Up @@ -77,8 +77,8 @@ fn work_with_expected_string_escaped() {
if snforge_std::_internals::_is_config_run() {
let mut data = array![];

snforge_std::_config_types::ShouldPanicConfig {
expected: snforge_std::_config_types::Expected::ByteArray("can\"t \0 null byte")
snforge_std::internals::_config_types::ShouldPanicConfig {
expected: snforge_std::_internals::_config_types::Expected::ByteArray("can\"t \0 null byte")
}
.serialize(ref data);

Expand Down Expand Up @@ -106,8 +106,8 @@ fn work_with_expected_short_string() {
if snforge_std::_internals::_is_config_run() {
let mut data = array![];

snforge_std::_config_types::ShouldPanicConfig {
expected: snforge_std::_config_types::Expected::ShortString('panic data')
snforge_std::_internals::_config_types::ShouldPanicConfig {
expected: snforge_std::_internals::_config_types::Expected::ShortString('panic data')
}
.serialize(ref data);

Expand Down Expand Up @@ -135,8 +135,8 @@ fn work_with_expected_short_string_escaped() {
if snforge_std::_internals::_is_config_run() {
let mut data = array![];

snforge_std::_config_types::ShouldPanicConfig {
expected: snforge_std::_config_types::Expected::ShortString('can\'t')
ShouldPanicConfig {
expected: snforge_std::_internals::_config_types::Expected::ShortString('can\'t')
}
.serialize(ref data);

Expand Down Expand Up @@ -164,8 +164,8 @@ fn work_with_expected_tuple() {
if snforge_std::_internals::_is_config_run() {
let mut data = array![];

snforge_std::_config_types::ShouldPanicConfig {
expected: snforge_std::_config_types::Expected::Array(array!['panic data',' or not',])
snforge_std::_internals::_config_types::ShouldPanicConfig {
expected: snforge_std::_internals::_config_types::Expected::Array(array!['panic data',' or not',])
}
.serialize(ref data);

Expand Down
7 changes: 4 additions & 3 deletions snforge_std/src/lib.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,13 @@ pub mod trace;

pub mod byte_array;

pub mod _config_types;

mod _cheatcode;

pub mod _internals {
use super::_cheatcode;
use super::_config_types;

pub use _cheatcode::_is_config_run;
}

pub use _config_types::*;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
}
}

newline

Loading