chore: Submodule workspace (#888)

* chore: template as submodule --------- Co-authored-by: Colin Roberts <[email protected]>
anthias-labs · Feb 15, 2024 · fe6b556 · fe6b556
1 parent 5c51063
commit fe6b556
Show file tree

Hide file tree

Showing 13 changed files with 120 additions and 597 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -19,7 +19,8 @@ jobs:
         with:
           toolchain: nightly
           components: rustfmt
-
+      - name: git submodule update
+        run: git submodule update --init --recursive
       - name: cargo fmt
         run: cargo +nightly fmt --all -- --check
 
@@ -35,7 +36,8 @@ jobs:
         with:
           toolchain: stable
           components: clippy
-
+      - name: git submodule update
+        run: git submodule update --init --recursive
       - name: cargo clippy
         run: cargo clippy --workspace --all-features -- -D warnings
 

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -18,6 +18,7 @@ jobs:
         with:
           toolchain: 1.75.0
           override: true
-
+      - name: git submodule update
+        run: git submodule update --init --recursive
       - name: test
         run: cargo test --workspace --all-features --exclude documentation
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,15 +30,15 @@ name = "arbiter"
 path = "bin/main.rs"
 
 [[example]]
-name = "project"
-path = "examples/project/main.rs"
+name = "template"
+path = "examples/arbiter-template/src/main.rs"
 
 [workspace.dependencies]
 # Local
-arbiter-bindings = { path = "arbiter-bindings" }
-arbiter-core = { path = "arbiter-core" }
-arbiter-engine = { path = "arbiter-engine" }
-arbiter-macros = { path = "arbiter-macros" }
+arbiter-bindings = "0.1.4"
+arbiter-core = "0.10.1"
+arbiter-engine = "0.2.0"
+arbiter-macros = "0.1.1"
 
 revm = { version = "5.0.0", features = ["ethersdb", "std", "serde"] }
 revm-primitives = "=2.0.0"

diff --git a/arbiter-bindings/lib/forge-std b/arbiter-bindings/lib/forge-std
diff --git a/examples/arbiter-template b/examples/arbiter-template
diff --git a/examples/project/behaviors/incrementer.rs b/examples/project/behaviors/incrementer.rs
diff --git a/examples/project/behaviors/mod.rs b/examples/project/behaviors/mod.rs
diff --git a/examples/project/bindings/mod.rs b/examples/project/bindings/mod.rs
+1 −0		.gitattributes
+1 −1		package.json
+635 −0		scripts/vm.py
+5 −1		src/StdChains.sol
+2 −2		src/StdCheats.sol
+1 −1		src/StdJson.sol
+61 −33		src/StdUtils.sol
+807 −458		src/Vm.sol
+234 −0		src/mocks/MockERC20.sol
+235 −0		src/mocks/MockERC721.sol
+3 −1		test/StdError.t.sol
+2 −2		test/StdUtils.t.sol
+2 −2		test/Vm.t.sol
+441 −0		test/mocks/MockERC20.t.sol
+721 −0		test/mocks/MockERC721.t.sol