Rebase

XuJiandong · Jan 22, 2024 · a8309eb · a8309eb
1 parent 694ae00
commit a8309eb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/c/ckb_identity.h b/c/ckb_identity.h
@@ -25,11 +25,7 @@
 #define MAX_PREIMAGE_SIZE 1024
 #define MESSAGE_HEX_LEN 64
 
-<<<<<<< HEAD
 const char BTC_PREFIX[] = "CKB (Bitcoin Layer) transaction: 0x";
-=======
-const char BTC_PREFIX[] = "CKB (Bitcoin Layer-2) transaction: 0x";
->>>>>>> bcd9b58 (Add missing auth id(0x02~0x05))
 // BTC_PREFIX_LEN = 35
 const size_t BTC_PREFIX_LEN = sizeof(BTC_PREFIX) - 1;
 

diff --git a/tests/omni_lock_rust/tests/test_omni_lock.rs b/tests/omni_lock_rust/tests/test_omni_lock.rs
@@ -678,7 +678,7 @@ fn test_binary_unchanged() {
 
     let actual_hash = faster_hex::hex_string(&hash);
     assert_eq!(
-        "256a5e55e8527be362429b08b700911d96169605d35fb0676bf5ee97abb35234",
+        "1ccec8cb13993eaa3a9cf3c6fd9a9855874dd4711dcfebc5467ec13c0ab5136c",
         &actual_hash
     );
 }