Merge branch 'feat/audit-trails-dev' into chore/add-return-values-for-at

Author: itsyaasir

audit-trail-rs/src/package.rs

@@ -34,10 +34,6 @@ static AUDIT_TRAIL_PACKAGE_REGISTRY: LazyLock<RwLock<PackageRegistry>> = LazyLoc
     )
 });
 
-/// Runtime overrides for TfComponents package information.
-static TF_COMPONENTS_OVERRIDE_REGISTRY: LazyLock<RwLock<PackageRegistry>> =
-    LazyLock::new(|| RwLock::new(PackageRegistry::default()));
-
 /// Returns a read lock to the package registry.
 pub(crate) async fn audit_trail_package_registry() -> PackageRegistryLock {
     AUDIT_TRAIL_PACKAGE_REGISTRY.read().await
@@ -68,10 +64,6 @@ pub(crate) fn blocking_audit_trail_registry_mut() -> PackageRegistryLockMut {
     AUDIT_TRAIL_PACKAGE_REGISTRY.blocking_write()
 }
 
-pub(crate) async fn tf_components_override_registry_mut() -> PackageRegistryLockMut {
-    TF_COMPONENTS_OVERRIDE_REGISTRY.write().await
-}
-
 #[derive(Debug, Clone, Copy)]
 pub(crate) struct ResolvedPackageIds {
     pub audit_trail_package_id: ObjectID,
@@ -104,23 +96,20 @@ pub(crate) async fn resolve_package_ids(
 
     drop(package_registry);
 
-    let env = Env::new_with_alias(chain_id.clone(), resolved_network.as_ref());
     if let Some(audit_trail_package_id) = package_overrides.audit_trail {
+        let env = Env::new_with_alias(chain_id.clone(), resolved_network.as_ref());
         audit_trail_package_registry_mut()
             .await
-            .insert_env_history(env.clone(), vec![audit_trail_package_id]);
-    }
-    if let Some(tf_components_package_id) = package_overrides.tf_component {
-        tf_components_override_registry_mut()
-            .await
-            .insert_env_history(env, vec![tf_components_package_id]);
+            .insert_env_history(env, vec![audit_trail_package_id]);
     }
-
-    let tf_components_package_id = resolve_tf_components_package_id(resolved_network.as_ref()).await.ok_or_else(|| {
-        Error::InvalidConfig(format!(
-            "no information for a published `TfComponents` package on network {network}; try to use `AuditTrailClientReadOnly::new_with_package_overrides`"
-        ))
-    })?;
+    let tf_components_package_id = package_overrides
+        .tf_component
+        .or_else(|| tf_components_registry::tf_components_package_id(resolved_network.as_ref()))
+        .ok_or_else(|| {
+            Error::InvalidConfig(format!(
+                "no information for a published `TfComponents` package on network {network}; try to use `AuditTrailClientReadOnly::new_with_package_overrides`"
+            ))
+        })?;
 
     Ok((
         resolved_network,
@@ -131,7 +120,37 @@ pub(crate) async fn resolve_package_ids(
     ))
 }
 
-pub(crate) async fn resolve_tf_components_package_id(network: &str) -> Option<ObjectID> {
-    let override_package_id = TF_COMPONENTS_OVERRIDE_REGISTRY.read().await.package_id(network);
-    override_package_id.or_else(|| tf_components_registry::tf_components_package_id(network))
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+
+    #[tokio::test]
+    async fn resolves_tf_components_package_id() {
+        let network = NetworkName::try_from("testnet").expect("valid network");
+        let registry_package_id = tf_components_registry::tf_components_package_id("testnet")
+            .expect("testnet TfComponents package is in the registry");
+        let override_package_id = ObjectID::random();
+
+        let (_, registry_resolved_package_ids) = resolve_package_ids(&network, &PackageOverrides::default())
+            .await
+            .expect("registered package IDs are valid");
+
+        assert_eq!(
+            registry_resolved_package_ids.tf_components_package_id,
+            registry_package_id
+        );
+
+        let (_, resolved_package_ids) = resolve_package_ids(
+            &network,
+            &PackageOverrides {
+                audit_trail: Some(ObjectID::random()),
+                tf_component: Some(override_package_id),
+            },
+        )
+        .await
+        .expect("explicit package overrides are valid");
+
+        assert_eq!(resolved_package_ids.tf_components_package_id, override_package_id);
+    }
 }

bindings/wasm/audit_trail_wasm/examples/src/02_add_and_read_records.ts

@@ -58,6 +58,10 @@ export async function addAndReadRecords(): Promise<void> {
     assert.equal(seedRecord.data.toString(), "seed record");
     assert.equal(secondRecord.data.toString(), "record 2");
 
+    const count = await recordAdminRecords.recordCount();
+    console.log(`Current record count: ${count}`);
+    assert.equal(count, 3n, `expected 3 records, got ${count}`);
+
     // Pagination uses the previous page cursor to continue from the next record.
     const firstPage = await recordAdminRecords.listPage(undefined, 2);
     const secondPage = await recordAdminRecords.listPage(firstPage.nextCursor, 2);

bindings/wasm/audit_trail_wasm/examples/src/advanced/11_manage_record_tags.ts

@@ -96,10 +96,13 @@ export async function manageRecordTags(): Promise<void> {
     }
     assert.equal(removeFinanceSucceeded, false, "a tag referenced by a role or record must not be removable");
 
-    // TagAdmin removes "legal" tag — should succeed because nothing uses it.
-    await tagAdminClient.trail(trailId).tags().remove("legal").withGasBudget(TEST_GAS_BUDGET).buildAndExecute(
-        tagAdminClient,
-    );
+    // TagAdmin removes "legal" tag because nothing uses it.
+    await tagAdminClient
+        .trail(trailId)
+        .tags()
+        .remove("legal")
+        .withGasBudget(TEST_GAS_BUDGET)
+        .buildAndExecute(tagAdminClient);
 
     onChainTrail = await adminClient.trail(trailId).get();
     console.log("Registry after removing \"legal\":", onChainTrail.tags.map((t) => t.tag), "\n");