Skip to content

Commit

Permalink
feat: remove unused code
Browse files Browse the repository at this point in the history
  • Loading branch information
bigearsenal committed Jul 19, 2023
1 parent 1c195e8 commit 0228adc
Show file tree
Hide file tree
Showing 15 changed files with 77 additions and 711 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import FeeRelayerSwift
import Foundation
import OrcaSwapSwift
import Resolver
import SolanaSwift

public class SwapServiceWrapper: Send.SwapService {
let orcaSwap: OrcaSwap
let relayService: RelayService

public init(orcaSwap: OrcaSwap, relayService: RelayService) {
self.orcaSwap = orcaSwap
self.relayService = relayService
}

public func calculateFeeInPayingToken(
feeInSOL: SolanaSwift.FeeAmount,
payingFeeTokenMint: SolanaSwift.PublicKey
) async throws -> SolanaSwift.FeeAmount? {
try await orcaSwap.load()
return try await relayService.feeCalculator.calculateFeeInPayingToken(
orcaSwap: orcaSwap,
feeInSOL: feeInSOL,
payingFeeTokenMint: payingFeeTokenMint
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ extension Publisher {
/// - Parameter initialPreviousValue: The initial value to use as the "previous" value when the upstream publisher
/// emits for the first time.
/// - Returns: A publisher of a tuple of the previous and current elements from the upstream publisher.
func withPrevious(_ initialPreviousValue: Output) -> AnyPublisher<(previous: Output, current: Output), Failure> {
scan((initialPreviousValue, initialPreviousValue)) { ($0.1, $1) }.eraseToAnyPublisher()
}
// func withPrevious(_ initialPreviousValue: Output) -> AnyPublisher<(previous: Output, current: Output), Failure> {
// scan((initialPreviousValue, initialPreviousValue)) { ($0.1, $1) }.eraseToAnyPublisher()
// }
}
133 changes: 0 additions & 133 deletions p2p_wallet/Common/Models/PayingFee.swift

This file was deleted.

13 changes: 0 additions & 13 deletions p2p_wallet/Common/Services/Cache/UserSessionCache.swift

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import Foundation

protocol SensitiveDataFilter {
var rules: [SensitiveDataFilterRule] { get }
func map(string: String) -> String
func map(data: [AnyHashable: AnyHashable]) -> [AnyHashable: AnyHashable]
}

/// Default sensitive data filter, consist of basic rules
class DefaultSensitiveDataFilter: SensitiveDataFilter {
class DefaultSensitiveDataFilter {
var rules: [SensitiveDataFilterRule] = [PrivateKeySensitiveDataFilterRule()]

func map(string: String) -> String {
Expand All @@ -17,19 +11,8 @@ class DefaultSensitiveDataFilter: SensitiveDataFilter {
}
return ret
}

func map(data: [AnyHashable: AnyHashable]) -> [AnyHashable: AnyHashable] {
var newData = data
data.keys.forEach { key in
if let value = data[key] as? String {
newData[key] = self.map(string: value)
}
}
return newData
}
}


protocol SensitiveDataFilterRule {
func map(_ string: String) -> String
}
Expand All @@ -42,7 +25,10 @@ struct PrivateKeySensitiveDataFilterRule: SensitiveDataFilterRule {
func map(_ string: String) -> String {
var str = string
regs.forEach { reg in
guard let regex = try? NSRegularExpression(pattern: reg, options: NSRegularExpression.Options.caseInsensitive) else {
guard let regex = try? NSRegularExpression(
pattern: reg,
options: NSRegularExpression.Options.caseInsensitive
) else {
return
}
let range = NSMakeRange(0, string.count)
Expand Down
1 change: 0 additions & 1 deletion p2p_wallet/Common/Services/Storage/KeychainStorage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ class KeychainStorage: StorageType {
localKeychain.delete(pincodeAttemptsKey)

removeAccountCache()
Resolver.resolve(UserSessionCache.self).clear()
}

private func removeAccountCache() {
Expand Down
83 changes: 0 additions & 83 deletions p2p_wallet/Common/Services/Swap/SwapServiceType.swift

This file was deleted.

Loading

0 comments on commit 0228adc

Please sign in to comment.