refactor: move gw-types and gw-common to gwos folder

.github/workflows/scripts.yml

@@ -71,7 +71,6 @@ jobs:
     - name: Copy contracts from prebuild docker images
       run: devtools/fetch-binaries.sh
     - name: Test C Uint256
-      working-directory: gwos
-      run: cargo test
+      run: cargo test -p c-uint256-tests
     - name: Script tests
       run: cargo test --features scripts script_tests

Cargo.toml

@@ -1,15 +1,16 @@
 [workspace]
 members = [
+  "gwos/crates/types",
+  "gwos/crates/common",
+  "gwos/crates/c-uint256-tests",
   "crates/challenge",
   "crates/chain",
   "crates/config",
-  "crates/common",
   "crates/mem-pool",
   "crates/generator",
   "crates/traits",
   "crates/db",
   "crates/store",
-  "crates/types",
   "crates/block-producer",
   "crates/jsonrpc-types",
   "crates/rpc-server",
@@ -30,7 +31,8 @@ members = [
 ]
 
 exclude = [
- "gwos-evm/polyjuice-tests"
+ "gwos-evm/polyjuice-tests",
+ "gwos/contracts",
 ]
 
 [profile.release]

crates/benches/Cargo.toml

@@ -14,10 +14,11 @@ anyhow = "1.0.66"
 criterion = { version = "0.3", features = ["html_reports"] }
 pprof = { version = "0.6", features = ["flamegraph", "criterion"] }
 gw-store = { path = "../store" }
-gw-common = { path = "../common" }
+gw-common = { path = "../../gwos/crates/common" }
+gw-smt = { path = "../smt" }
 gw-mem-pool = { path = "../mem-pool" }
 gw-generator = { path = "../generator" }
-gw-types = { path = "../types" }
+gw-types = { path = "../../gwos/crates/types" }
 gw-traits = { path = "../traits" }
 gw-db = { path = "../db" }
 gw-config = { path = "../config" }

crates/benches/benches/benchmarks/fee_queue.rs

@@ -1,5 +1,5 @@
 use criterion::{criterion_group, Bencher, Criterion};
-use gw_common::{h256_ext::H256Ext, state::State, H256};
+use gw_common::state::State;
 use gw_config::GenesisConfig;
 use gw_generator::genesis::init_genesis;
 use gw_mem_pool::fee::{
@@ -13,6 +13,7 @@ use gw_store::{
 };
 use gw_types::{
     bytes::Bytes,
+    h256::*,
     packed::{AllowedTypeHash, L2Transaction, RawL2Transaction, RollupConfig},
     prelude::{Builder, Entity, Pack, PackVec, Unpack},
 };
@@ -165,10 +166,7 @@ fn setup_genesis(store: &Store) {
         meta_contract_validator_type_hash: [0u8; 32].into(),
         eth_registry_validator_type_hash: [1u8; 32].into(),
         rollup_config: rollup_config.into(),
-        rollup_type_hash: {
-            let h: [u8; 32] = rollup_type_hash.into();
-            h.into()
-        },
+        rollup_type_hash: rollup_type_hash.into(),
         secp_data_dep: Default::default(),
     };
     init_genesis(store, &genesis_config, &[0u8; 32], Bytes::default()).unwrap();