reduce the build time

.github/workflows/cd.yml

@@ -28,7 +28,6 @@ jobs:
                   toolchain: ${{ matrix.rust }}
                   profile: minimal
                   override: true
-
             - uses: Swatinem/rust-cache@v2
             - name: Setup build env
               run: |
@@ -41,7 +40,6 @@ jobs:
                   if [[ ${{ matrix.job.target }} == x86_64-apple-darwin ]]; then
                     brew install protobuf
                   fi
-
             - name: Cargo build
               uses: actions-rs/cargo@v1
               with:
@@ -70,8 +68,5 @@ jobs:
                   files: |
                       target/${{ matrix.job.target }}/release/db3*.tar.gz
                       target/${{ matrix.job.target }}/release/db3*.sha256
-                      tools/db3up
-                      config/devnet/genesis.json
               env:
                   GITHUB_TOKEN: ${{ secrets.CR_PAT }}
-

.github/workflows/ci.yml

@@ -58,20 +58,20 @@ jobs:
           cd ${ROOT_DIR}/metadata && npx hardhat test && echo "return code $?"
           test -e ${ROOT_DIR}/metadata/artifacts/contracts/DB3MetaStore.sol/DB3MetaStore.json && cp -f ${ROOT_DIR}/metadata/artifacts/contracts/DB3MetaStore.sol/DB3MetaStore.json ${ROOT_DIR}/abi/
           cd ${ROOT_DIR} && cargo build
-          cd ${ROOT_DIR}/tools && bash start_localnet.sh >db3.log 2>&1 &
-          sleep 3
-          cd ${ROOT_DIR}/tools && tail -n200 db3.log
-      - name: Run rust test with coverage
-        run: |
-          cargo llvm-cov nextest --workspace --exclude merkdb  --lcov --output-path lcov.info --no-fail-fast
-      - name: Run sdk test
+          cd ${ROOT_DIR}/tools && bash start_localnet.sh
+          sleep 2
+      - name: Run Typescript sdk test
         run: |
           ROOT_DIR=`pwd`
           cd $ROOT_DIR/sdk && yarn && make
           cd $ROOT_DIR/sdk && yarn test --coverage
-      - name: Rust java sdk test
+      - name: Rust Java sdk test
         run: |
-          cd java && mvn test
+          ROOT_DIR=`pwd`
+          cd ${ROOT_DIR}/java && mvn test
+      - name: Run rust test with coverage
+        run: |
+          cargo llvm-cov nextest --workspace --exclude merkdb  --lcov --output-path lcov.info --no-fail-fast
       - uses: codecov/codecov-action@v3
         with:
           token: ${{secrets.COV_TOKEN}}

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "thirdparty/merkdb"]
-	path = thirdparty/merkdb
-	url = https://github.com/dbpunk-labs/merkdb.git
 [submodule "thirdparty/arweave-rs"]
 	path = thirdparty/arweave-rs
 	url = https://github.com/imotai/arweave-rs.git

Cargo.toml

@@ -6,12 +6,10 @@ members = [
     "src/error",
     "src/types",
     "src/base",
-    "src/session",
     "src/storage",
     "src/node",
     "src/sdk",
-    "src/event",
-    "src/cmd"
+    "src/event"
 ]
 
 [workspace.dependencies]

java/src/test/java/network/db3/provider/ClientTest.java

@@ -76,7 +76,7 @@ public void testAddCollection() {
             AddDocResult addDocResult = client.addDoc(result.getDb(), "col1", doc);
             Assert.assertNotNull(addDocResult.getMutationId());
             Thread.sleep(1000 * 3);
-            ResultSet resultSet = client.runQuery(result.getDb(), "col1", "/[name=\"a\"]");
+            ResultSet resultSet = client.runQuery(result.getDb(), "col1", "/[name=1]");
             Assert.assertEquals(1, resultSet.getDocs().size());
         } catch (Exception e) {
             e.printStackTrace();

sdk/tests/client_v2.test.ts

@@ -497,14 +497,12 @@ describe('test db3.js client module', () => {
                     [index]
                 )
                 const collection2 = await getCollection(db.addr, 'col', client2)
-
                 await new Promise((r) => setTimeout(r, 3000))
                 const docId2 = await addDoc(collection, {
                     city: 'beijing',
                     author: 'imotai',
                     age: 10,
                 })
-
                 const docId3 = await addDoc(collection2, {
                     city: 'beijing2',
                     author: 'imotai1',
@@ -523,6 +521,7 @@ describe('test db3.js client module', () => {
                     expect(resultSet.docs[0].doc.age).toBe(10)
                     expect(resultSet.docs[0].id).toBe(docId2.id)
                 }
+
                 {
                     const queryStr = '/[city = beijing]'
                     const resultSet = await queryDoc<Profile>(
@@ -540,7 +539,7 @@ describe('test db3.js client module', () => {
                     await deleteDoc(collection, [docId3.id])
                     fail('should not be here')
                 } catch (e) {
-                    expect(decodeURI(e.message)).toBe(
+                    expect(e.message).toBe(
                         'fail to verify the owner with error doc owner is not the sender'
                     )
                 }

src/cmd/Cargo.toml

@@ -15,7 +15,6 @@ db3-base={ path = "../base" }
 db3-sdk={ path = "../sdk" }
 db3-proto={ path = "../proto" }
 db3-crypto={ path = "../crypto" }
-db3-session={ path = "../session" }
 ethereum-types = { version = "0.14.0", default-features = false }
 prost = "0.11"
 prost-types = "0.11"
@@ -42,6 +41,5 @@ tonic = {workspace=true}
 http = "0.2"
 eyre = "0.6"
 [dev-dependencies]
-db3-session={ path = "../session"}
 db3-crypto={ path = "../crypto"}
 tokio = { version = "1.17.0", features = ["full"] }

src/cmd/src/command.rs

@@ -29,16 +29,10 @@ use db3_proto::db3_mutation_proto::{
     CollectionMutation, DatabaseAction, DatabaseMutation, DocumentMask, DocumentMutation,
 };
 use db3_proto::db3_node_proto::NetworkStatus;
-use db3_sdk::mutation_sdk::MutationSDK;
-use db3_sdk::store_sdk::StoreSDK;
 use db3_sdk::store_sdk_v2::StoreSDKV2;
 use prettytable::{format, Table};
 use std::time::{SystemTime, UNIX_EPOCH};
 
-pub struct DB3ClientContext {
-    pub mutation_sdk: Option<MutationSDK>,
-    pub store_sdk: Option<StoreSDK>,
-}
 pub struct DB3ClientContextV2 {
     pub store_sdk: Option<StoreSDKV2>,
 }

src/cmd/src/lib.rs

@@ -15,10 +15,10 @@
 // limitations under the License.
 //
 
-#![feature(iter_intersperse)]
-#[macro_use]
-extern crate prettytable;
-pub mod command;
-pub mod console;
-pub mod keystore;
-pub mod shell;
+//#![feature(iter_intersperse)]
+//#[macro_use]
+//extern crate prettytable;
+//pub mod command;
+//pub mod console;
+//pub mod keystore;
+//pub mod shell;