From 30d5fe3be2637f8dd598ebab29b80351d278b77c Mon Sep 17 00:00:00 2001 From: keefertaylor Date: Sat, 1 Jun 2019 13:00:14 +0100 Subject: [PATCH 1/4] Updates for proto4 --- Tests/TezosKit/OriginateAccountOperation.swift | 8 ++++---- TezosKit/Operation/OriginateAccountOperation.swift | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Tests/TezosKit/OriginateAccountOperation.swift b/Tests/TezosKit/OriginateAccountOperation.swift index 8b02f12c..f08182e8 100644 --- a/Tests/TezosKit/OriginateAccountOperation.swift +++ b/Tests/TezosKit/OriginateAccountOperation.swift @@ -9,8 +9,8 @@ class OriginateAccountOperationTest: XCTestCase { let operation = OriginateAccountOperation(address: address) let dictionary = operation.dictionaryRepresentation - XCTAssertNotNil(dictionary["managerPubkey"]) - XCTAssertEqual(dictionary["managerPubkey"] as? String, address) + XCTAssertNotNil(dictionary["manager_pub_key"]) + XCTAssertEqual(dictionary["manager_pub_key"] as? String, address) XCTAssertNotNil(dictionary["balance"]) XCTAssertEqual(dictionary["balance"] as? String, "0") @@ -25,8 +25,8 @@ class OriginateAccountOperationTest: XCTestCase { let operation = OriginateAccountOperation(wallet: wallet) let dictionary = operation.dictionaryRepresentation - XCTAssertNotNil(dictionary["managerPubkey"]) - XCTAssertEqual(dictionary["managerPubkey"] as? String, wallet.address) + XCTAssertNotNil(dictionary["manager_pub_key"]) + XCTAssertEqual(dictionary["manager_pub_key"] as? String, wallet.address) XCTAssertNotNil(dictionary["balance"]) XCTAssertEqual(dictionary["balance"] as? String, "0") diff --git a/TezosKit/Operation/OriginateAccountOperation.swift b/TezosKit/Operation/OriginateAccountOperation.swift index 51d1993d..14e30691 100644 --- a/TezosKit/Operation/OriginateAccountOperation.swift +++ b/TezosKit/Operation/OriginateAccountOperation.swift @@ -10,7 +10,7 @@ public class OriginateAccountOperation: AbstractOperation { public override var dictionaryRepresentation: [String: Any] { var operation = super.dictionaryRepresentation operation["balance"] = "0" - operation["managerPubkey"] = managerPublicKeyHash + operation["manager_pub_key"] = managerPublicKeyHash if let contractCode = self.contractCode { operation["script"] = [ From d7ef2e0eba0eef7dacc705b7a0ac743d268e7518 Mon Sep 17 00:00:00 2001 From: keefertaylor Date: Sat, 1 Jun 2019 13:07:32 +0100 Subject: [PATCH 2/4] Upgrade xcode proj for swift 5 --- TezosKit.xcodeproj/project.pbxproj | 17 ++++++++--------- .../xcshareddata/xcschemes/TezosKit.xcscheme | 2 +- .../xcschemes/TezosKitTests.xcscheme | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/TezosKit.xcodeproj/project.pbxproj b/TezosKit.xcodeproj/project.pbxproj index e1f1d234..8969b660 100644 --- a/TezosKit.xcodeproj/project.pbxproj +++ b/TezosKit.xcodeproj/project.pbxproj @@ -7,9 +7,10 @@ objects = { /* Begin PBXBuildFile section */ - 772F48A82224894E00DF0F9D /* TezosNodeIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 772F48A72224894E00DF0F9D /* TezosNodeIntegrationTests.swift */; }; 772F48AA2224894E00DF0F9D /* TezosKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77CE359621F7DC76006ADABA /* TezosKit.framework */; }; 7741B95D226DF5860005B398 /* GetOriginatedContractsRPC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7741B95C226DF5860005B398 /* GetOriginatedContractsRPC.swift */; }; + 774C9B2022A2A0F400CEB509 /* TezosNodeIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 772F48A72224894E00DF0F9D /* TezosNodeIntegrationTests.swift */; }; + 774C9B2122A2A0F400CEB509 /* TezosNodeIntegrationTests+Promises.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B1EAE9222730D600EA4FCE /* TezosNodeIntegrationTests+Promises.swift */; }; 77633D532247EFE20011106A /* TezosNodeClientTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77633D522247EFE20011106A /* TezosNodeClientTests.swift */; }; 7774780522221DE50010BA4D /* AbstractClientTest+Promises.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7774780422221DE50010BA4D /* AbstractClientTest+Promises.swift */; }; 7774780B2222281B0010BA4D /* TezosKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77CE359621F7DC76006ADABA /* TezosKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; @@ -18,7 +19,6 @@ 7776493B227616B200451DD5 /* FakeObjects.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7776493A227616B200451DD5 /* FakeObjects.swift */; }; 7794E97B224C2518000D9F1E /* Header.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7794E97A224C2518000D9F1E /* Header.swift */; }; 77B1EADE222496B500EA4FCE /* TezosNodeClient+Promises.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B1EADD222496B500EA4FCE /* TezosNodeClient+Promises.swift */; }; - 77B1EAEA222730D600EA4FCE /* TezosNodeIntegrationTests+Promises.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B1EAE9222730D600EA4FCE /* TezosNodeIntegrationTests+Promises.swift */; }; 77B1EAED2227342200EA4FCE /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77F4D26B221F899800D34B01 /* PromiseKit.framework */; }; 77B1EAEF222736FC00EA4FCE /* PromiseKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7774780E222228E50010BA4D /* PromiseKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 77B1EAF1222745F600EA4FCE /* RunOperationRPC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B1EAF0222745F600EA4FCE /* RunOperationRPC.swift */; }; @@ -770,7 +770,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1010; - LastUpgradeCheck = 1010; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = "Keefer Taylor"; TargetAttributes = { 772F48A42224894E00DF0F9D = { @@ -783,6 +783,7 @@ }; 77CE359E21F7DC76006ADABA = { CreatedOnToolsVersion = 10.1; + LastSwiftMigration = 1020; }; }; }; @@ -890,12 +891,10 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 772F48A82224894E00DF0F9D /* TezosNodeIntegrationTests.swift in Sources */, - 77B1EAEA222730D600EA4FCE /* TezosNodeIntegrationTests+Promises.swift in Sources */, + 774C9B2022A2A0F400CEB509 /* TezosNodeIntegrationTests.swift in Sources */, + 774C9B2122A2A0F400CEB509 /* TezosNodeIntegrationTests+Promises.swift in Sources */, 77B69ED522534F2B00DB4319 /* ConseilClientIntegrationTests+Promises.swift in Sources */, - 772F48A82224894E00DF0F9D /* TezosNodeIntegrationTests.swift in Sources */, 77B69ECF2251127D00DB4319 /* ConseilClientIntegrationTests.swift in Sources */, - 77B1EAEA222730D600EA4FCE /* TezosNodeIntegrationTests+Promises.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1293,7 +1292,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.keefertaylor.TezosKitTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -1316,7 +1315,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.keefertaylor.TezosKitTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/TezosKit.xcodeproj/xcshareddata/xcschemes/TezosKit.xcscheme b/TezosKit.xcodeproj/xcshareddata/xcschemes/TezosKit.xcscheme index 7c1a7bb0..e1bca5fe 100644 --- a/TezosKit.xcodeproj/xcshareddata/xcschemes/TezosKit.xcscheme +++ b/TezosKit.xcodeproj/xcshareddata/xcschemes/TezosKit.xcscheme @@ -1,6 +1,6 @@ Date: Sat, 1 Jun 2019 13:53:20 +0100 Subject: [PATCH 3/4] redact conseil --- IntegrationTests/TezosKit/ConseilClientIntegrationTests.swift | 4 ++-- IntegrationTests/TezosKit/TezosNodeIntegrationTests.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/IntegrationTests/TezosKit/ConseilClientIntegrationTests.swift b/IntegrationTests/TezosKit/ConseilClientIntegrationTests.swift index 30ca08ef..f251fbd7 100644 --- a/IntegrationTests/TezosKit/ConseilClientIntegrationTests.swift +++ b/IntegrationTests/TezosKit/ConseilClientIntegrationTests.swift @@ -16,8 +16,8 @@ import XCTest /// *** Configuration must be done before theses tests can be run. Please configure: *** /// - Conseil URL /// - Conseil API Key -let apiKey = "hooman" -let remoteNodeURL = URL(string: "https://conseil-dev.cryptonomic-infra.tech:443")! +let apiKey = "" +let remoteNodeURL = URL(string: "")! class ConseilClientIntegrationTests: XCTestCase { public lazy var conseilClient: ConseilClient = { diff --git a/IntegrationTests/TezosKit/TezosNodeIntegrationTests.swift b/IntegrationTests/TezosKit/TezosNodeIntegrationTests.swift index f6ecb716..ea874e32 100644 --- a/IntegrationTests/TezosKit/TezosNodeIntegrationTests.swift +++ b/IntegrationTests/TezosKit/TezosNodeIntegrationTests.swift @@ -54,10 +54,10 @@ class TezosNodeIntegrationTests: XCTestCase { /// Sending a bunch of requests quickly can cause race conditions in the Tezos network as counters and operations /// propagate. Define a throttle period in seconds to wait between each test. - let intertestWaitTime: UInt32 = 30 + let intertestWaitTime: UInt32 = 0 sleep(intertestWaitTime) - nodeClient = TezosNodeClient(remoteNodeURL: .nodeURL) + //nodeClient = TezosNodeClient(remoteNodeURL: .nodeURL) } public func testOrigination() { From e7ecbb99f67e0b98d1f781250b130d2bf633e670 Mon Sep 17 00:00:00 2001 From: keefertaylor Date: Sat, 1 Jun 2019 14:22:24 +0100 Subject: [PATCH 4/4] Fix json --- Tests/TezosKit/OriginateAccountOperation.swift | 8 ++++---- TezosKit/Operation/OriginateAccountOperation.swift | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Tests/TezosKit/OriginateAccountOperation.swift b/Tests/TezosKit/OriginateAccountOperation.swift index f08182e8..5555f652 100644 --- a/Tests/TezosKit/OriginateAccountOperation.swift +++ b/Tests/TezosKit/OriginateAccountOperation.swift @@ -9,8 +9,8 @@ class OriginateAccountOperationTest: XCTestCase { let operation = OriginateAccountOperation(address: address) let dictionary = operation.dictionaryRepresentation - XCTAssertNotNil(dictionary["manager_pub_key"]) - XCTAssertEqual(dictionary["manager_pub_key"] as? String, address) + XCTAssertNotNil(dictionary["manager_pupkey"]) + XCTAssertEqual(dictionary["manager_pubpkey"] as? String, address) XCTAssertNotNil(dictionary["balance"]) XCTAssertEqual(dictionary["balance"] as? String, "0") @@ -25,8 +25,8 @@ class OriginateAccountOperationTest: XCTestCase { let operation = OriginateAccountOperation(wallet: wallet) let dictionary = operation.dictionaryRepresentation - XCTAssertNotNil(dictionary["manager_pub_key"]) - XCTAssertEqual(dictionary["manager_pub_key"] as? String, wallet.address) + XCTAssertNotNil(dictionary["manager_pubkey"]) + XCTAssertEqual(dictionary["manager_pubkey"] as? String, wallet.address) XCTAssertNotNil(dictionary["balance"]) XCTAssertEqual(dictionary["balance"] as? String, "0") diff --git a/TezosKit/Operation/OriginateAccountOperation.swift b/TezosKit/Operation/OriginateAccountOperation.swift index 14e30691..771dd025 100644 --- a/TezosKit/Operation/OriginateAccountOperation.swift +++ b/TezosKit/Operation/OriginateAccountOperation.swift @@ -10,7 +10,7 @@ public class OriginateAccountOperation: AbstractOperation { public override var dictionaryRepresentation: [String: Any] { var operation = super.dictionaryRepresentation operation["balance"] = "0" - operation["manager_pub_key"] = managerPublicKeyHash + operation["manager_pubkey"] = managerPublicKeyHash if let contractCode = self.contractCode { operation["script"] = [