address comments

onflow · Sep 5, 2023 · 85d27b1 · 85d27b1
1 parent 1151139
commit 85d27b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/contracts/HybridCustody.cdc b/contracts/HybridCustody.cdc
@@ -198,8 +198,8 @@ pub contract HybridCustody {
         pub fun getPublicCapability(path: PublicPath, type: Type): Capability?
         pub fun getPublicCapFromDelegator(type: Type): Capability?
         pub fun getAddress(): Address
-        pub fun getCapabilityFactory(): Capability<&CapabilityFactory.Manager{CapabilityFactory.Getter}>
-        pub fun getCapabilityFilter(): Capability<&{CapabilityFilter.Filter}>
+        pub fun getCapabilityFactoryManager(): &{CapabilityFactory.Getter}?
+        pub fun getCapabilityFilter(): &{CapabilityFilter.Filter}?
     }
 
     /// Methods accessible to the designated parent of a ChildAccount
@@ -720,14 +720,14 @@ pub contract HybridCustody {
 
         /// Returns a capability to this child account's CapabilityFilter
         ///
-        pub fun getCapabilityFilter(): Capability<&{CapabilityFilter.Filter}> {
-            return self.filter
+        pub fun getCapabilityFilter(): &{CapabilityFilter.Filter}? {
+            return self.filter.check() ? self.filter.borrow() : nil
         }
 
         /// Returns a capability to this child account's CapabilityFactory
         ///
-        pub fun getCapabilityFactory(): Capability<&CapabilityFactory.Manager{CapabilityFactory.Getter}> {
-            return self.factory
+        pub fun getCapabilityFactoryManager(): &{CapabilityFactory.Getter}? {
+            return self.factory.check() ? self.factory.borrow() : nil
         }
 
         destroy () {

diff --git a/scripts/test/can_get_child_factory_and_filter_caps.cdc b/scripts/test/can_get_child_factory_and_filter_caps.cdc
@@ -9,11 +9,11 @@ pub fun main(addr: Address, parent: Address): Bool {
     let acctPublic = getAuthAccount(addr).getCapability<&HybridCustody.ChildAccount{HybridCustody.AccountPublic}>(path)
         .borrow() ?? panic("account public not found")
 
-    let filter = acctPublic.getCapabilityFactory()
-    assert(filter.check(), message: "capability filter is not valid")
+    let factory = acctPublic.getCapabilityFactoryManager()
+    assert(factory != nil, message: "capability factory is not valid")
 
-    let factory = acctPublic.getCapabilityFilter()
-    assert(factory.check(), message: "capability factory is not valid")
+    let filter = acctPublic.getCapabilityFilter()
+    assert(filter != nil, message: "capability filter is not valid")
 
     return true
 }