Merge pull request #1 from overcat/improvements

Some Improvements

.git-blame-ignore-revs

@@ -0,0 +1,3 @@
+# .git-blame-ignore-revs
+# Format code using `cargo fmt`.
+dde86e68796841b98931948431fa300db0a9ef91

.github/workflows/rust.yml

@@ -0,0 +1,20 @@
+name: Rust
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: rustup update
+      - run: cargo fmt --check
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: rustup update
+      - run: cargo test

Cargo.toml

@@ -1,9 +1,7 @@
 [workspace]
 resolver = "2"
 
-members = [
-    "registry",
-]
+members = ["registry"]
 
 [profile.release-with-logs]
 inherits = "release"
@@ -20,4 +18,4 @@ codegen-units = 1
 lto = true
 
 [workspace.dependencies.soroban-sdk]
-version = "20.3.2"
+version = "20.4.0"

registry/src/contract.rs

@@ -178,7 +178,8 @@ impl RegistryContractTrait for RegistryContract {
                 panic_with_error!(&e, &ContractErrors::ExpiredDomain);
             }
 
-            let node_hash: BytesN<32> = generate_node(&e, &sub, &(Bytes::from(domain.node.clone())));
+            let node_hash: BytesN<32> =
+                generate_node(&e, &sub, &(Bytes::from(domain.node.clone())));
             let record_key: RecordKeys = RecordKeys::SubRecord(node_hash.clone());
 
             e.set_record(&Record::SubDomain(SubDomain {
@@ -212,7 +213,9 @@ impl RegistryContractTrait for RegistryContract {
                 Some(Record::Domain(domain))
             }
             Record::SubDomain(sub) => {
-                if let Record::Domain(domain) = e.record(&RecordKeys::Record(sub.parent.clone())).unwrap() {
+                if let Record::Domain(domain) =
+                    e.record(&RecordKeys::Record(sub.parent.clone())).unwrap()
+                {
                     if domain.exp_date < e.ledger().timestamp() {
                         panic_with_error!(&e, &ContractErrors::ExpiredDomain);
                     }
@@ -271,7 +274,9 @@ impl RegistryContractTrait for RegistryContract {
                 );
             }
             Record::SubDomain(sub) => {
-                if let Record::Domain(domain) = e.record(&RecordKeys::Record(sub.parent.clone())).unwrap() {
+                if let Record::Domain(domain) =
+                    e.record(&RecordKeys::Record(sub.parent.clone())).unwrap()
+                {
                     domain.owner.require_auth();
                 } else {
                     panic_with_error!(&e, &ContractErrors::InvalidParent);

registry/src/lib.rs

@@ -1,7 +1,7 @@
 #![no_std]
 
 mod contract;
-mod storage;
 mod errors;
+mod storage;
+mod tests;
 mod utils;
-mod tests;

registry/src/storage/mod.rs

@@ -1,2 +1,2 @@
 pub mod core;
-pub mod record;
+pub mod record;

registry/src/tests/mod.rs

@@ -1,4 +1,4 @@
 pub mod test_admin;
 pub mod test_records;
+pub mod test_transfers;
 pub mod test_utils;
-pub mod test_transfers;

registry/src/tests/test_admin.rs

@@ -1,9 +1,9 @@
 #![cfg(test)]
 
-use soroban_sdk::{Bytes, Env, IntoVal, Vec};
-use soroban_sdk::testutils::{MockAuth, MockAuthInvoke};
 use crate::storage::core::{CoreData, CoreDataEntity};
 use crate::tests::test_utils::{create_test_data, init_contract, TestData};
+use soroban_sdk::testutils::{MockAuth, MockAuthInvoke};
+use soroban_sdk::{Bytes, Env, IntoVal, Vec};
 
 #[test]
 pub fn test_updating_tlds() {
@@ -18,28 +18,40 @@ pub fn test_updating_tlds() {
     assert_eq!(core.allowed_tlds, test_data.allowed_tlds);
 
     // It should fail because the admin didn't sign the transaction
-    assert!(
-        test_data.contract_client.try_update_tlds(&Vec::from_array(&e, [Bytes::from_slice(&e, "eth".as_bytes())]))
-            .is_err()
-    );
-
-    test_data.contract_client
-        .mock_auths(&[
-            MockAuth {
-                address: &test_data.adm,
-                invoke: &MockAuthInvoke {
-                    contract: &test_data.contract_client.address,
-                    fn_name: "update_tlds",
-                    args: (Vec::from_array(&e, [Bytes::from_slice(&e, "eth".as_bytes())]), ).into_val(&e),
-                    sub_invokes: &[],
-                },
-            }
-        ])
-        .update_tlds(&Vec::from_array(&e, [Bytes::from_slice(&e, "eth".as_bytes())]));
+    assert!(test_data
+        .contract_client
+        .try_update_tlds(&Vec::from_array(
+            &e,
+            [Bytes::from_slice(&e, "eth".as_bytes())]
+        ))
+        .is_err());
+
+    test_data
+        .contract_client
+        .mock_auths(&[MockAuth {
+            address: &test_data.adm,
+            invoke: &MockAuthInvoke {
+                contract: &test_data.contract_client.address,
+                fn_name: "update_tlds",
+                args: (Vec::from_array(
+                    &e,
+                    [Bytes::from_slice(&e, "eth".as_bytes())],
+                ),)
+                    .into_val(&e),
+                sub_invokes: &[],
+            },
+        }])
+        .update_tlds(&Vec::from_array(
+            &e,
+            [Bytes::from_slice(&e, "eth".as_bytes())],
+        ));
 
     let updated_core: CoreData = e.as_contract(&test_data.contract_client.address, || {
         e.core_data().unwrap()
     });
 
-    assert_eq!(updated_core.allowed_tlds, Vec::from_array(&e, [Bytes::from_slice(&e, "eth".as_bytes())]));
-}
+    assert_eq!(
+        updated_core.allowed_tlds,
+        Vec::from_array(&e, [Bytes::from_slice(&e, "eth".as_bytes())])
+    );
+}