Skip to content

Commit e633fd2

Browse files
some changes
1 parent b40b29f commit e633fd2

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

web3swift/Utils/EIP/EIP681.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,8 @@ extension Web3 {
126126
do {
127127
let web = web3(provider: InfuraProvider(Networks.fromInt(Int(code.chainID ?? 1)) ?? Networks.Mainnet)!)
128128
let ensModel = ENS(web3: web)
129-
guard let address = try ensModel?.useENSResolver(withDomain: ens)
130-
.getAddress(forNode: ens) else {
131-
return nil
132-
}
129+
try ensModel?.setENSResolver(withDomain: ens)
130+
let address = try ensModel?.getAddress(forNode: ens)
133131
nativeValue = address as AnyObject
134132
} catch {
135133
return nil

web3swift/Utils/ENS/ENS.swift

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,48 +24,42 @@ public class ENS {
2424
self.registry = registry
2525
}
2626

27-
func useENSResolver(_ resolver: Resolver) throws -> ENS {
27+
func setENSResolver(_ resolver: Resolver) throws {
2828
guard resolver.web3.provider.url == self.web3.provider.url else {
2929
throw Web3Error.processingError(desc: "Resolver should use same provider as ENS")
3030
}
3131
self.resolver = resolver
32-
return self
3332
}
3433

35-
func useENSResolver(withDomain domain: String) throws -> ENS {
34+
func setENSResolver(withDomain domain: String) throws {
3635
guard let resolver = try? self.registry.getResolver(forDomain: domain) else {
3736
throw Web3Error.processingError(desc: "No resolver for this domain")
3837
}
3938
self.resolver = resolver
40-
return self
4139
}
4240

43-
func useBaseRegistrar(_ baseRegistrar: BaseRegistrar) throws -> ENS {
41+
func setBaseRegistrar(_ baseRegistrar: BaseRegistrar) throws {
4442
guard baseRegistrar.web3.provider.url == self.web3.provider.url else {
4543
throw Web3Error.processingError(desc: "Base registrar should use same provider as ENS")
4644
}
4745
self.baseRegistrar = baseRegistrar
48-
return self
4946
}
5047

51-
func useBaseRegistrar(withAddress address: EthereumAddress) -> ENS {
48+
func setBaseRegistrar(withAddress address: EthereumAddress) {
5249
let baseRegistrar = BaseRegistrar(web3: web3, address: address)
5350
self.baseRegistrar = baseRegistrar
54-
return self
5551
}
5652

57-
func useRegistrarController(_ registrarController: ETHRegistrarController) throws -> ENS {
53+
func setRegistrarController(_ registrarController: ETHRegistrarController) throws {
5854
guard registrarController.web3.provider.url == self.web3.provider.url else {
5955
throw Web3Error.processingError(desc: "Registrar controller should use same provider as ENS")
6056
}
6157
self.registrarController = registrarController
62-
return self
6358
}
6459

65-
func useRegistrarController(withAddress address: EthereumAddress) -> ENS {
60+
func setRegistrarController(withAddress address: EthereumAddress) {
6661
let registrarController = ETHRegistrarController(web3: web3, address: address)
6762
self.registrarController = registrarController
68-
return self
6963
}
7064

7165
lazy var defaultOptions: TransactionOptions = {

0 commit comments

Comments
 (0)