Fix Indy-Besu formatting

Signed-off-by: aziz.karabashov <[email protected]>
hyperledger · Dec 11, 2023 · d0fd1f4 · d0fd1f4
1 parent 031cf6f
commit d0fd1f4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/indy-besu/smart_contracts/contracts/utils/StringUtils.sol b/indy-besu/smart_contracts/contracts/utils/StringUtils.sol
@@ -13,6 +13,7 @@ library StringUtils {
     bytes1 private constant _ASCII_SMALL_A = 0x61;
     bytes1 private constant _ASCII_SMALL_F = 0x66;
     string private constant _HEX_PREFIX = "0x";
+    bytes private constant _ZERO_BYTES = "";
 
     /**
      * @dev Checks if two strings are equal.
@@ -61,17 +62,17 @@ library StringUtils {
         StrSlice hexPrefixSlice = _HEX_PREFIX.toSlice();
 
         // Check and remove hex prefix
-        if (!hexStringSlice.startsWith(_HEX_PREFIX.toSlice())) return "";
+        if (!hexStringSlice.startsWith(_HEX_PREFIX.toSlice())) return _ZERO_BYTES;
         hexString = hexStringSlice.stripPrefix(hexPrefixSlice).toString();
 
         bytes memory hexStringBytes = bytes(hexString);
         bytes memory resultBytes = new bytes(hexStringBytes.length / 2);
         for (uint256 i = 0; i < resultBytes.length; i++) {
             (uint8 firstByte, bool firstByteValid) = _hexCharToByte(hexStringBytes[2 * i]);
-            if (!firstByteValid) return "";
+            if (!firstByteValid) return _ZERO_BYTES;
 
             (uint8 secondByte, bool secondByteValid) = _hexCharToByte(hexStringBytes[2 * i + 1]);
-            if (!secondByteValid) return "";
+            if (!secondByteValid) return _ZERO_BYTES;
 
             resultBytes[i] = bytes1(firstByte * 16 + secondByte);
         }

diff --git a/indy-besu/vdr/src/contracts/did/did_registry.rs b/indy-besu/vdr/src/contracts/did/did_registry.rs
@@ -683,7 +683,8 @@ pub mod test {
             init_env_logger();
             let client = client(None);
             let transaction =
-                IndyDidRegistry::build_resolve_did_transaction(&client, &DID::new(ISSUER_ID)).unwrap();
+                IndyDidRegistry::build_resolve_did_transaction(&client, &DID::new(ISSUER_ID))
+                    .unwrap();
             let expected_transaction = Transaction {
                 type_: TransactionType::Read,
                 from: None,

diff --git a/indy-besu/vdr/src/lib.rs b/indy-besu/vdr/src/lib.rs
@@ -70,7 +70,8 @@ mod tests {
             // write
             let did_doc = did_doc(None);
             let transaction =
-                IndyDidRegistry::build_create_did_transaction(&client, &TRUSTEE_ACC, &did_doc).unwrap();
+                IndyDidRegistry::build_create_did_transaction(&client, &TRUSTEE_ACC, &did_doc)
+                    .unwrap();
             let signed_transaction = client.sign_transaction(&transaction).await.unwrap();
             let block_hash = client
                 .submit_transaction(&signed_transaction)
@@ -85,7 +86,8 @@ mod tests {
             let transaction =
                 IndyDidRegistry::build_resolve_did_transaction(&client, &did_doc.id).unwrap();
             let result = client.submit_transaction(&transaction).await.unwrap();
-            let resolved_did_doc = IndyDidRegistry::parse_resolve_did_result(&client, &result).unwrap();
+            let resolved_did_doc =
+                IndyDidRegistry::parse_resolve_did_result(&client, &result).unwrap();
             assert_eq!(did_doc, resolved_did_doc);
 
             Ok(())
@@ -120,9 +122,10 @@ mod tests {
                 .await
                 .unwrap();
 
-            let receipt = IndyDidRegistry::deactivate_did(&second_client, &TRUSTEE2_ACC, &did_doc.id)
-                .await
-                .unwrap();
+            let receipt =
+                IndyDidRegistry::deactivate_did(&second_client, &TRUSTEE2_ACC, &did_doc.id)
+                    .await
+                    .unwrap();
             println!("Receipt: {}", receipt);
 
             Ok(())