Updates schema

XuJiandong · Jan 16, 2024 · d26e650 · d26e650
1 parent 7c8adac
commit d26e650
Show file tree

Hide file tree

Showing 11 changed files with 4,604 additions and 9,459 deletions.
diff --git a/Makefile b/Makefile
@@ -90,8 +90,7 @@ build/omni_lock: build/omni_lock.o build/cobuild.o
 	$(OBJCOPY) --strip-debug --strip-all $@
 
 cobuild_mol:
-	${MOLC} --language rust --schema-file schemas/blockchain.mol > tests/omni_lock_rust/src/schemas/blockchain.rs
-	${MOLC} --language rust --schema-file schemas/basic.mol > tests/omni_lock_rust/src/schemas/basic.rs
+	${MOLC} --language rust --schema-file c/basic.mol | rustfmt > tests/omni_lock_rust/src/schemas/basic.rs
 
 clean:
 	rm -rf build/secp256k1_data_info_20210801.h build/dump_secp256k1_data_20210801

diff --git a/schemas/basic.mol → c/basic.mol b/schemas/basic.mol → c/basic.mol
diff --git a/schemas/blockchain.mol b/schemas/blockchain.mol
diff --git a/tests/omni_lock_rust/rust-toolchain b/tests/omni_lock_rust/rust-toolchain
@@ -1 +1 @@
-1.75.0
+1.71.1
diff --git a/tests/omni_lock_rust/src/lib.rs b/tests/omni_lock_rust/src/lib.rs
@@ -1,6 +1,5 @@
+pub mod blake2b;
 pub mod debug_utils;
 pub mod omni_lock;
-pub mod schemas_test;
+pub mod schemas;
 pub mod xudt_rce_mol;
-
-pub mod blake2b;