Skip to content

Commit

Permalink
renaming to spark (#63)
Browse files Browse the repository at this point in the history
  • Loading branch information
error2215 authored May 20, 2024
1 parent d56e430 commit 8239602
Show file tree
Hide file tree
Showing 29 changed files with 121 additions and 120 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/BUG-FORM.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ body:
description: What component is the bug in?
multiple: true
options:
- Forge
- Spark
- Cast
- Anvil
- Foxarup
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/FEATURE-FORM.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ body:
description: What component is the feature for?
multiple: true
options:
- Forge
- Spark
- Cast
- Anvil
- Foxarup
Expand Down
2 changes: 1 addition & 1 deletion abi/src/bindings/console.rs

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

2 changes: 1 addition & 1 deletion abi/src/bindings/hevm.rs

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

2 changes: 1 addition & 1 deletion cli/assets/CounterTemplate.s.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^1.1.0;

import "forge-std/Script.sol";
import "spark-std/Script.sol";

contract CounterScript is Script {
function setUp() public {}
Expand Down
2 changes: 1 addition & 1 deletion cli/assets/CounterTemplate.t.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^1.1.0;

import "forge-std/Test.sol";
import "spark-std/Test.sol";
import "../src/Counter.sol";

contract CounterTest is Test {
Expand Down
4 changes: 2 additions & 2 deletions cli/assets/workflowTemplate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
with:
version: nightly

- name: Run Forge build
- name: Run Spark build
run: |
spark --version
spark build --sizes
id: build

- name: Run Forge tests
- name: Run Spark tests
run: |
spark test -vvv
id: test
2 changes: 1 addition & 1 deletion cli/src/cmd/spark/bind.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ impl BindArgs {
if !self.skip.is_empty() {
return ExcludeContracts::default().extend_regex(self.skip.clone()).into();
}
// This excludes all Test/Script and forge-std contracts
// This excludes all Test/Script and spark-std contracts
ExcludeContracts::default()
.extend_pattern([
".*Test.*",
Expand Down
8 changes: 4 additions & 4 deletions cli/src/cmd/spark/init.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@ impl Cmd for InitArgs {
init_git_repo(git, no_commit)?;
}

// install forge-std
// install spark-std
if !offline {
if root.join("lib/forge-std").exists() {
p_println!(!quiet => "\"lib/forge-std\" already exists, skipping install....");
if root.join("lib/spark-std").exists() {
p_println!(!quiet => "\"lib/spark-std\" already exists, skipping install....");
self.opts.install(&mut config, vec![])?;
} else {
let dep = "https://github.com/bchainhub/forge-std".parse()?;
let dep = "https://github.com/bchainhub/spark-std".parse()?;
self.opts.install(&mut config, vec![dep])?;
}
}
Expand Down
2 changes: 1 addition & 1 deletion cli/src/cmd/spark/script/executor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ impl ScriptArgs {
// Identify all contracts created during the call.
if traces.is_empty() {
eyre::bail!(
"Forge script requires tracing enabled to collect created contracts."
"Spark script requires tracing enabled to collect created contracts."
)
}

Expand Down
6 changes: 3 additions & 3 deletions cli/src/cmd/spark/test/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ pub struct TestArgs {
debug: Option<Regex>,

/// Print a gas report.
#[clap(long, env = "FORGE_GAS_REPORT")]
#[clap(long, env = "SPARK_GAS_REPORT")]
gas_report: bool,

/// Exit with code 0 even if a test fails.
#[clap(long, env = "FORGE_ALLOW_FAILURE")]
#[clap(long, env = "SPARK_ALLOW_FAILURE")]
allow_failure: bool,

/// Output test results in JSON format.
Expand Down Expand Up @@ -519,7 +519,7 @@ async fn test(
let filter_str = filter.to_string();
if filter_str.is_empty() {
println!(
"\nNo tests found in project! Forge looks for functions that starts with `test`."
"\nNo tests found in project! Spark looks for functions that starts with `test`."
);
} else {
println!("\nNo tests match the provided pattern:");
Expand Down
2 changes: 1 addition & 1 deletion cli/src/opts/spark.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ pub enum Subcommands {
#[clap(visible_alias = "c")]
Create(CreateArgs),

/// Create a new Forge project.
/// Create a new Spark project.
Init(InitArgs),

/// Generate shell completions script.
Expand Down
Loading

0 comments on commit 8239602

Please sign in to comment.