Skip to content

Commit 597cfbc

Browse files
nuo-xunuo-xu
committed
Address review comments.
1 parent fec0d6a commit 597cfbc

File tree

3 files changed

+29
-27
lines changed

3 files changed

+29
-27
lines changed

‎ios/brave-ios/Sources/BraveWallet/WalletUserAssetManager.swift

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ public protocol WalletUserAssetManagerType: AnyObject {
4545
func updateBalance(for asset: BraveWallet.BlockchainToken, account: String, balance: String, completion: (() -> Void)?)
4646
/// Remove a `WalletUserAssetBalance` representation of the given
4747
/// `BraveWallet.BlockchainToken` from CoreData
48-
func removeBalance(for asset: BraveWallet.BlockchainToken, completion: (() -> Void)?)
48+
func removeBalances(for asset: BraveWallet.BlockchainToken, completion: (() -> Void)?)
4949
/// Remove a `WalletUserAssetBalance` representation of the given
5050
/// `BraveWallet.NetworkInfo` from CoreData
51-
func removeBalance(for network: BraveWallet.NetworkInfo, completion: (() -> Void)?)
51+
func removeBalances(for network: BraveWallet.NetworkInfo, completion: (() -> Void)?)
5252
/// Add a user asset data observer
5353
func addUserAssetDataObserver(_ observer: WalletUserAssetDataObserver)
5454
/// Remove user assets and their cached balance that belongs to given network
@@ -187,7 +187,7 @@ public class WalletUserAssetManager: WalletUserAssetManagerType, WalletObserverS
187187
if existedAsset.isDeletedByUser { // this asset was added before but user marked as deleted after
188188
WalletUserAsset.updateUserAsset(for: asset, visible: true, isSpam: false, isDeletedByUser: false, completion: { [weak self] in
189189
self?.refreshBalance(for: asset)
190-
self?.retriveAllDataObserver().forEach { $0.userAssetUpdated() }
190+
self?.retrieveAllDataObserver().forEach { $0.userAssetUpdated() }
191191
completion?()
192192
})
193193
} else { // this asset already exists
@@ -199,7 +199,7 @@ public class WalletUserAssetManager: WalletUserAssetManagerType, WalletObserverS
199199
asset: asset,
200200
completion: { [weak self] in
201201
self?.refreshBalance(for: asset)
202-
self?.retriveAllDataObserver().forEach { $0.userAssetUpdated() }
202+
self?.retrieveAllDataObserver().forEach { $0.userAssetUpdated() }
203203
completion?()
204204
}
205205
)
@@ -208,8 +208,8 @@ public class WalletUserAssetManager: WalletUserAssetManagerType, WalletObserverS
208208

209209
public func removeUserAsset(_ asset: BraveWallet.BlockchainToken, completion: (() -> Void)?) {
210210
WalletUserAsset.removeUserAsset(asset: asset, completion: { [weak self] in
211-
self?.removeBalance(for: asset, completion: nil)
212-
self?.retriveAllDataObserver().forEach { $0.userAssetUpdated() }
211+
self?.removeBalances(for: asset, completion: nil)
212+
self?.retrieveAllDataObserver().forEach { $0.userAssetUpdated() }
213213
completion?()
214214
})
215215
}
@@ -230,7 +230,7 @@ public class WalletUserAssetManager: WalletUserAssetManagerType, WalletObserverS
230230
if visible {
231231
self?.refreshBalance(for: asset)
232232
}
233-
self?.retriveAllDataObserver().forEach { observer in
233+
self?.retrieveAllDataObserver().forEach { observer in
234234
observer.userAssetUpdated()
235235
}
236236
completion?()
@@ -242,7 +242,7 @@ public class WalletUserAssetManager: WalletUserAssetManagerType, WalletObserverS
242242
WalletUserAssetGroup.removeGroup(
243243
groupId,
244244
completion: { [weak self] in
245-
self?.retriveAllDataObserver().forEach { $0.userAssetUpdated() }
245+
self?.retrieveAllDataObserver().forEach { $0.userAssetUpdated() }
246246
completion?()
247247
})
248248
}
@@ -289,21 +289,21 @@ public class WalletUserAssetManager: WalletUserAssetManagerType, WalletObserverS
289289
)
290290
}
291291

292-
public func removeBalance(for asset: BraveWallet.BlockchainToken, completion: (() -> Void)?) {
293-
WalletUserAssetBalance.removeBalance(
292+
public func removeBalances(for asset: BraveWallet.BlockchainToken, completion: (() -> Void)?) {
293+
WalletUserAssetBalance.removeBalances(
294294
for: asset,
295295
completion: { [weak self] in
296-
self?.retriveAllDataObserver().forEach { $0.cachedBalanceRefreshed() }
296+
self?.retrieveAllDataObserver().forEach { $0.cachedBalanceRefreshed() }
297297
completion?()
298298
}
299299
)
300300
}
301301

302-
public func removeBalance(for network: BraveWallet.NetworkInfo, completion: (() -> Void)?) {
303-
WalletUserAssetBalance.removeBalance(
302+
public func removeBalances(for network: BraveWallet.NetworkInfo, completion: (() -> Void)?) {
303+
WalletUserAssetBalance.removeBalances(
304304
for: network,
305305
completion: { [weak self] in
306-
self?.retriveAllDataObserver().forEach { $0.cachedBalanceRefreshed() }
306+
self?.retrieveAllDataObserver().forEach { $0.cachedBalanceRefreshed() }
307307
completion?()
308308
})
309309
}
@@ -326,9 +326,11 @@ public class WalletUserAssetManager: WalletUserAssetManagerType, WalletObserverS
326326
of: Void.self,
327327
body: { @MainActor [rpcService] group in
328328
for account in accounts {
329+
guard !Task.isCancelled else { return }
329330
group.addTask { @MainActor in
330331
let allTokenBalanceForAccount = await rpcService.fetchBalancesForTokens(account: account, networkAssets: allUserAssets)
331332
for tokenBalanceForAccount in allTokenBalanceForAccount {
333+
guard !Task.isCancelled else { return }
332334
let networkAssets = allUserAssets.first { oneNetworkAssets in
333335
oneNetworkAssets.tokens.contains { asset in
334336
asset.id == tokenBalanceForAccount.key
@@ -342,7 +344,7 @@ public class WalletUserAssetManager: WalletUserAssetManagerType, WalletObserverS
342344
}
343345
}
344346
)
345-
retriveAllDataObserver().forEach { $0.cachedBalanceRefreshed() }
347+
retrieveAllDataObserver().forEach { $0.cachedBalanceRefreshed() }
346348
completion?()
347349
}
348350
}
@@ -355,7 +357,7 @@ public class WalletUserAssetManager: WalletUserAssetManagerType, WalletObserverS
355357
group.leave()
356358
}
357359
group.enter()
358-
WalletUserAssetBalance.removeBalance(for: network) {
360+
WalletUserAssetBalance.removeBalances(for: network) {
359361
group.leave()
360362
}
361363
} else {
@@ -364,7 +366,7 @@ public class WalletUserAssetManager: WalletUserAssetManagerType, WalletObserverS
364366
group.leave()
365367
}
366368
group.enter()
367-
WalletUserAssetBalance.removeBalance {
369+
WalletUserAssetBalance.removeBalances {
368370
group.leave()
369371
}
370372
}
@@ -394,7 +396,7 @@ public class WalletUserAssetManager: WalletUserAssetManagerType, WalletObserverS
394396
}
395397
}
396398
)
397-
retriveAllDataObserver().forEach { $0.cachedBalanceRefreshed() }
399+
retrieveAllDataObserver().forEach { $0.cachedBalanceRefreshed() }
398400
completion?()
399401
}
400402
}
@@ -425,7 +427,7 @@ public class WalletUserAssetManager: WalletUserAssetManagerType, WalletObserverS
425427
}
426428
}
427429

428-
private func retriveAllDataObserver() -> [WalletUserAssetDataObserver] {
430+
private func retrieveAllDataObserver() -> [WalletUserAssetDataObserver] {
429431
return dataObservers.allObjects as? [WalletUserAssetDataObserver] ?? []
430432
}
431433
}
@@ -434,7 +436,7 @@ extension WalletUserAssetManager: PreferencesObserver {
434436
public func preferencesDidChange(for key: String) {
435437
if key == Preferences.Wallet.showTestNetworks.key {
436438
refreshBalances { [weak self] in
437-
self?.retriveAllDataObserver().forEach { $0.cachedBalanceRefreshed() }
439+
self?.retrieveAllDataObserver().forEach { $0.cachedBalanceRefreshed() }
438440
}
439441
}
440442
}
@@ -503,11 +505,11 @@ public class TestableWalletUserAssetManager: WalletUserAssetManagerType {
503505
completion?()
504506
}
505507

506-
public func removeBalance(for asset: BraveWallet.BlockchainToken, completion: (() -> Void)?) {
508+
public func removeBalances(for asset: BraveWallet.BlockchainToken, completion: (() -> Void)?) {
507509
completion?()
508510
}
509511

510-
public func removeBalance(for network: BraveWallet.NetworkInfo, completion: (() -> Void)?) {
512+
public func removeBalances(for network: BraveWallet.NetworkInfo, completion: (() -> Void)?) {
511513
completion?()
512514
}
513515

‎ios/brave-ios/Sources/Data/models/WalletUserAssetBalance.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public final class WalletUserAssetBalance: NSManagedObject, CRUD {
123123
/// - asset: An optional value of `BraveWallet.BlockchainToken` to be removed from CD, nil value will remove the restriction of asset matching
124124
/// - account: An optional value of `String`. It is the account's address value. nil value will remove the restriction of account address matching
125125
/// - completion: An optional completion block
126-
public static func removeBalance(
126+
public static func removeBalances(
127127
for asset: BraveWallet.BlockchainToken? = nil,
128128
account: String? = nil,
129129
completion: (() -> Void)? = nil
@@ -157,7 +157,7 @@ public final class WalletUserAssetBalance: NSManagedObject, CRUD {
157157
/// - network: `BraveWallet.NetworkInfo`, any user asset balance that matches this network's chainId
158158
/// will be removed
159159
/// - completion: An optional completion block
160-
public static func removeBalance(
160+
public static func removeBalances(
161161
for network: BraveWallet.NetworkInfo,
162162
completion: (() -> Void)? = nil
163163
) {

‎ios/brave-ios/Tests/DataTests/WalletUserAssetBalanceTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class WalletUserAssetBalanceTests: CoreDataTestCase {
5252
XCTAssertEqual(try! DataController.viewContext.count(for: fetchRequest), 2)
5353

5454
backgroundSaveAndWaitForExpectation {
55-
WalletUserAssetBalance.removeBalance(for: asset)
55+
WalletUserAssetBalance.removeBalances(for: asset)
5656
}
5757

5858
XCTAssertEqual(try! DataController.viewContext.count(for: self.fetchRequest), 0)
@@ -64,7 +64,7 @@ class WalletUserAssetBalanceTests: CoreDataTestCase {
6464
XCTAssertEqual(try! DataController.viewContext.count(for: fetchRequest), 2)
6565

6666
backgroundSaveAndWaitForExpectation {
67-
WalletUserAssetBalance.removeBalance(for: asset, account: account1)
67+
WalletUserAssetBalance.removeBalances(for: asset, account: account1)
6868
}
6969

7070
XCTAssertEqual(try! DataController.viewContext.count(for: self.fetchRequest), 1)
@@ -77,7 +77,7 @@ class WalletUserAssetBalanceTests: CoreDataTestCase {
7777
XCTAssertEqual(try! DataController.viewContext.count(for: fetchRequest), 3)
7878

7979
backgroundSaveAndWaitForExpectation {
80-
WalletUserAssetBalance.removeBalance(for: mockSolNetwork)
80+
WalletUserAssetBalance.removeBalances(for: mockSolNetwork)
8181
}
8282

8383
XCTAssertEqual(try! DataController.viewContext.count(for: self.fetchRequest), 2)

0 commit comments

Comments
 (0)