fixed test

Author: zkToha

web3swiftTests/web3swift_ENS_Tests.swift

@@ -26,8 +26,8 @@ class web3swift_ENS_Tests: XCTestCase {
             let web = web3(provider: InfuraProvider(Networks.Mainnet)!)
             let ens = ENS(web3: web)
             let domain = "somename.eth"
-            let resolver = try ens.resolver(forDomain: domain)
-            XCTAssertEqual(resolver.resolverAddress.address.lowercased(), "0x5ffc014343cd971b7eb70732021e26c35b744cc4")
+            let address = try ens?.registry.getResolver(forDomain: domain).resolverContractAddress
+            XCTAssertEqual(address?.address.lowercased(), "0x5ffc014343cd971b7eb70732021e26c35b744cc4")
         } catch {
             XCTFail()
         }
@@ -38,9 +38,8 @@ class web3swift_ENS_Tests: XCTestCase {
             let web = web3(provider: InfuraProvider(Networks.Mainnet)!)
             let ens = ENS(web3: web)
             let domain = "somename.eth"
-            var resolver = try ens.resolver(forDomain: domain)
-            let address = try resolver.addr(forDomain: domain)
-            XCTAssertEqual(address.address.lowercased(), "0x3487acfb1479ad1df6c0eb56ae743d34897798ac")
+            let address = try ens?.getAddress(forNode: domain)
+            XCTAssertEqual(address?.address.lowercased(), "0x3487acfb1479ad1df6c0eb56ae743d34897798ac")
         } catch {
             XCTFail()
         }
@@ -51,11 +50,11 @@ class web3swift_ENS_Tests: XCTestCase {
             let web = web3(provider: InfuraProvider(Networks.Mainnet)!)
             let ens = ENS(web3: web)
             let domain = "somename.eth"
-            var resolver = try ens.resolver(forDomain: domain)
-            let isAddrSupports = try resolver.supportsInterface(interfaceID: ResolverENS.InterfaceName.addr.hash())
-            let isNameSupports = try resolver.supportsInterface(interfaceID: ResolverENS.InterfaceName.name.hash())
-            let isABIsupports = try resolver.supportsInterface(interfaceID: ResolverENS.InterfaceName.ABI.hash())
-            let isPubkeySupports = try resolver.supportsInterface(interfaceID: ResolverENS.InterfaceName.pubkey.hash())
+            let resolver = try ens?.registry.getResolver(forDomain: domain)
+            let isAddrSupports = try resolver?.supportsInterface(interfaceID: ENS.Resolver.InterfaceName.addr.hash())
+            let isNameSupports = try resolver?.supportsInterface(interfaceID: ENS.Resolver.InterfaceName.name.hash())
+            let isABIsupports = try resolver?.supportsInterface(interfaceID: ENS.Resolver.InterfaceName.ABI.hash())
+            let isPubkeySupports = try resolver?.supportsInterface(interfaceID: ENS.Resolver.InterfaceName.pubkey.hash())
             XCTAssertEqual(isAddrSupports, true)
             XCTAssertEqual(isNameSupports, true)
             XCTAssertEqual(isABIsupports, true)
@@ -70,12 +69,12 @@ class web3swift_ENS_Tests: XCTestCase {
             let web = web3(provider: InfuraProvider(Networks.Mainnet)!)
             let ens = ENS(web3: web)
             let domain = "somename.eth"
-            var resolver = try ens.resolver(forDomain: domain)
-            let isABIsupported = try resolver.supportsInterface(interfaceID: ResolverENS.InterfaceName.ABI.hash())
-            if isABIsupported {
-                let res = try resolver.ABI(node: domain, contentType: 2)
-                XCTAssert(res.0 == 0)
-                XCTAssert(res.1.count == 0)
+            let resolver = try ens?.registry.getResolver(forDomain: domain)
+            if let isABIsupported = try resolver?.supportsInterface(interfaceID: ENS.Resolver.InterfaceName.ABI.hash()),
+                isABIsupported {
+                let res = try resolver?.getContractABI(forNode: domain, contentType: .zlibCompressedJSON)
+                XCTAssert(res?.0 == 0)
+                XCTAssert(res?.1.count == 0)
             } else {
                 XCTFail()
             }
@@ -89,8 +88,8 @@ class web3swift_ENS_Tests: XCTestCase {
             let web = web3(provider: InfuraProvider(Networks.Mainnet)!)
             let ens = ENS(web3: web)
             let domain = "somename.eth"
-            let owner = try ens.owner(node: domain)
-            XCTAssertEqual("0xc67247454e720328714c4e17bec7640572657bee", owner.address.lowercased())
+            let owner = try ens?.registry.getOwner(node: domain)
+            XCTAssertEqual("0xc67247454e720328714c4e17bec7640572657bee", owner?.address.lowercased())
         } catch {
             XCTFail()
         }
@@ -101,7 +100,7 @@ class web3swift_ENS_Tests: XCTestCase {
             let web = web3(provider: InfuraProvider(Networks.Mainnet)!)
             let ens = ENS(web3: web)
             let domain = "somename.eth"
-            let ttl = try ens.ttl(node: domain)
+            let ttl = try ens?.registry.getTTL(node: domain)
             print(ttl)
         } catch {
             XCTFail()
@@ -113,8 +112,9 @@ class web3swift_ENS_Tests: XCTestCase {
             let web = web3(provider: InfuraProvider(Networks.Mainnet)!)
             let ens = ENS(web3: web)
             let domain = "somename.eth"
-            let address = try ens.getAddress(domain)
-            XCTAssertEqual(address.address.lowercased(), "0x3487acfb1479ad1df6c0eb56ae743d34897798ac")
+            let resolver = try ens?.registry.getResolver(forDomain: domain)
+            let address = try resolver?.getAddress(forNode: domain)
+            XCTAssertEqual(address?.address.lowercased(), "0x3487acfb1479ad1df6c0eb56ae743d34897798ac")
         } catch {
             XCTFail()
         }
@@ -125,9 +125,10 @@ class web3swift_ENS_Tests: XCTestCase {
             let web = web3(provider: InfuraProvider(Networks.Mainnet)!)
             let ens = ENS(web3: web)
             let domain = "somename.eth"
-            let pubkey = try ens.getPubkey(domain: domain)
-            XCTAssert(pubkey.x == "0x0000000000000000000000000000000000000000000000000000000000000000")
-            XCTAssert(pubkey.y == "0x0000000000000000000000000000000000000000000000000000000000000000")
+            let resolver = try ens?.registry.getResolver(forDomain: domain)
+            let pubkey = try resolver?.getPublicKey(forNode: domain)
+            XCTAssert(pubkey?.x == "0x0000000000000000000000000000000000000000000000000000000000000000")
+            XCTAssert(pubkey?.y == "0x0000000000000000000000000000000000000000000000000000000000000000")
         } catch {
             XCTFail()
         }