Replace get()+borrow() with borrow()

onflow · Sep 14, 2023 · f6aaf58 · f6aaf58
1 parent 4aea8aa
commit f6aaf58
Show file tree

Hide file tree

Showing 33 changed files with 202 additions and 231 deletions.
diff --git a/contracts/FlowServiceAccount.cdc b/contracts/FlowServiceAccount.cdc
@@ -45,10 +45,8 @@ access(all) contract FlowServiceAccount {
     /// Returns 0 if the account has no default balance
     access(all) fun defaultTokenBalance(_ acct: &Account): UFix64 {
         var balance = 0.0
-        if let balanceCap = acct.capabilities.get<&FlowToken.Vault>(/public/flowTokenBalance) {
-            if let balanceRef = balanceCap.borrow() {
-                balance = balanceRef.getBalance()
-            }
+        if let balanceCap = acct.capabilities.borrow<&FlowToken.Vault>(/public/flowTokenBalance) {
+            balance = balanceRef.getBalance()
         }
 
         return balance

diff --git a/contracts/FlowStakingCollection.cdc b/contracts/FlowStakingCollection.cdc
@@ -1039,7 +1039,7 @@ access(all) contract FlowStakingCollection {
     access(all) fun doesStakeExist(address: Address, nodeID: String, delegatorID: UInt32?): Bool {
         let account = getAccount(address)
 
-        let stakingCollectionRef = account.capabilities.get<&StakingCollection>(self.StakingCollectionPublicPath)!.borrow()
+        let stakingCollectionRef = account.capabilities.borrow<&StakingCollection>(self.StakingCollectionPublicPath)
             ?? panic("Could not borrow ref to StakingCollection")
 
         return stakingCollectionRef.doesStakeExist(nodeID: nodeID, delegatorID: delegatorID)
@@ -1049,7 +1049,7 @@ access(all) contract FlowStakingCollection {
     access(all) fun getUnlockedTokensUsed(address: Address): UFix64 {
         let account = getAccount(address)
 
-        let stakingCollectionRef = account.capabilities.get<&StakingCollection>(self.StakingCollectionPublicPath)!.borrow()
+        let stakingCollectionRef = account.capabilities.borrow<&StakingCollection>(self.StakingCollectionPublicPath)
             ?? panic("Could not borrow ref to StakingCollection")
 
         return stakingCollectionRef.unlockedTokensUsed
@@ -1059,7 +1059,7 @@ access(all) contract FlowStakingCollection {
     access(all) fun getLockedTokensUsed(address: Address): UFix64 {
         let account = getAccount(address)
 
-        let stakingCollectionRef = account.capabilities.get<&StakingCollection>(self.StakingCollectionPublicPath)!.borrow()
+        let stakingCollectionRef = account.capabilities.borrow<&StakingCollection>(self.StakingCollectionPublicPath)
             ?? panic("Could not borrow ref to StakingCollection")
 
         return stakingCollectionRef.lockedTokensUsed
@@ -1069,7 +1069,7 @@ access(all) contract FlowStakingCollection {
     access(all) fun getNodeIDs(address: Address): [String] {
         let account = getAccount(address)
 
-        let stakingCollectionRef = account.capabilities.get<&StakingCollection>(self.StakingCollectionPublicPath)!.borrow()
+        let stakingCollectionRef = account.capabilities.borrow<&StakingCollection>(self.StakingCollectionPublicPath)
             ?? panic("Could not borrow ref to StakingCollection")
 
         return stakingCollectionRef.getNodeIDs()
@@ -1079,7 +1079,7 @@ access(all) contract FlowStakingCollection {
     access(all) fun getDelegatorIDs(address: Address): [DelegatorIDs] {
         let account = getAccount(address)
 
-        let stakingCollectionRef = account.capabilities.get<&StakingCollection>(self.StakingCollectionPublicPath)!.borrow()
+        let stakingCollectionRef = account.capabilities.borrow<&StakingCollection>(self.StakingCollectionPublicPath)
             ?? panic("Could not borrow ref to StakingCollection")
 
         return stakingCollectionRef.getDelegatorIDs()
@@ -1089,7 +1089,7 @@ access(all) contract FlowStakingCollection {
     access(all) fun getAllNodeInfo(address: Address): [FlowIDTableStaking.NodeInfo] {
         let account = getAccount(address)
 
-        let stakingCollectionRef = account.capabilities.get<&StakingCollection>(self.StakingCollectionPublicPath)!.borrow()
+        let stakingCollectionRef = account.capabilities.borrow<&StakingCollection>(self.StakingCollectionPublicPath)
             ?? panic("Could not borrow ref to StakingCollection")
 
         return stakingCollectionRef.getAllNodeInfo()
@@ -1099,7 +1099,7 @@ access(all) contract FlowStakingCollection {
     access(all) fun getAllDelegatorInfo(address: Address): [FlowIDTableStaking.DelegatorInfo] {
         let account = getAccount(address)
 
-        let stakingCollectionRef = account.capabilities.get<&StakingCollection>(self.StakingCollectionPublicPath)!.borrow()
+        let stakingCollectionRef = account.capabilities.borrow<&StakingCollection>(self.StakingCollectionPublicPath)
             ?? panic("Could not borrow ref to StakingCollection")
 
         return stakingCollectionRef.getAllDelegatorInfo()
@@ -1109,7 +1109,7 @@ access(all) contract FlowStakingCollection {
     access(all) fun getMachineAccounts(address: Address): {String: MachineAccountInfo} {
         let account = getAccount(address)
 
-        let stakingCollectionRef = account.capabilities.get<&StakingCollection>(self.StakingCollectionPublicPath)!.borrow()
+        let stakingCollectionRef = account.capabilities.borrow<&StakingCollection>(self.StakingCollectionPublicPath)
             ?? panic("Could not borrow ref to StakingCollection")
 
         return stakingCollectionRef.getMachineAccounts()

diff --git a/contracts/FlowStorageFees.cdc b/contracts/FlowStorageFees.cdc
@@ -67,10 +67,8 @@ access(all) contract FlowStorageFees {
         var balance = 0.0
         let acct = getAccount(accountAddress)
 
-        if let balanceCap = acct.capabilities.get<&FlowToken.Vault>(/public/flowTokenBalance) {
-            if let balanceRef = balanceCap.borrow() {
-                balance = balanceRef.getBalance()
-            }
+        if let balanceRef = acct.capabilities.borrow<&FlowToken.Vault>(/public/flowTokenBalance) {
+            balance = balanceRef.getBalance()
         }
 
         return self.accountBalanceToAccountStorageCapacity(balance)
@@ -96,14 +94,12 @@ access(all) contract FlowStorageFees {
             var balance = 0.0
             let acct = getAccount(accountAddress)
 
-            if let balanceCap = acct.capabilities.get<&FlowToken.Vault>(/public/flowTokenBalance) {
-                if let balanceRef = balanceCap.borrow() {
-                    if accountAddress == payer {
-                        // if the account is the payer, deduct the maximum possible transaction fees from the balance
-                        balance = balanceRef.getBalance().saturatingSubtract(maxTxFees)
-                    } else {
-                        balance = balanceRef.getBalance()
-                    }
+            if let balanceRef = acct.capabilities.borrow<&FlowToken.Vault>(/public/flowTokenBalance) {
+                if accountAddress == payer {
+                    // if the account is the payer, deduct the maximum possible transaction fees from the balance
+                    balance = balanceRef.getBalance().saturatingSubtract(maxTxFees)
+                } else {
+                    balance = balanceRef.getBalance()
                 }
             }
 
@@ -160,10 +156,8 @@ access(all) contract FlowStorageFees {
         let acct = getAccount(accountAddress)
         var balance = 0.0
 
-        if let balanceCap = acct.capabilities.get<&FlowToken.Vault>(/public/flowTokenBalance) {
-            if let balanceRef = balanceCap.borrow() {
-                balance = balanceRef.getBalance()
-            }
+        if let balanceRef = acct.capabilities.borrow<&FlowToken.Vault>(/public/flowTokenBalance) {
+            balance = balanceRef.getBalance()
         }
 
         // get how much should be reserved for storage

diff --git a/lib/go/contracts/internal/assets/assets.go b/lib/go/contracts/internal/assets/assets.go