wip

xmtp · Sep 25, 2023 · 0c14db0 · 0c14db0
1 parent 50181dc
commit 0c14db0
Show file tree

Hide file tree

Showing 23 changed files with 0 additions and 67 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -143,15 +143,6 @@
         "revision" : "2d9d2188a08eef4a869d368daab21b3c08510991",
         "version" : "2.6.1"
       }
-    },
-    {
-      "identity" : "xmtp-rust-swift",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/xmtp/xmtp-rust-swift",
-      "state" : {
-        "revision" : "4a76e5401fa780c40610e2f0d248f695261d08dd",
-        "version" : "0.3.1-beta0"
-      }
     }
   ],
   "version" : 2

diff --git a/Package.swift b/Package.swift
@@ -26,7 +26,6 @@ let package = Package(
 		.package(url: "https://github.com/1024jp/GzipSwift", from: "5.2.0"),
 		.package(url: "https://github.com/bufbuild/connect-swift", from: "0.3.0"),
 		.package(url: "https://github.com/apple/swift-docc-plugin.git", from: "1.0.0"),
-		.package(url: "https://github.com/xmtp/xmtp-rust-swift", from: "0.3.1-beta0"),
 	],
 	targets: [
 		// Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -38,7 +37,6 @@ let package = Package(
 				"web3.swift",
 				.product(name: "Gzip", package: "GzipSwift"),
 				.product(name: "Connect", package: "connect-swift"),
-				.product(name: "XMTPRust", package: "xmtp-rust-swift"),
 			]
 		),
 		.target(

diff --git a/Sources/XMTP/ApiClient.swift b/Sources/XMTP/ApiClient.swift
@@ -6,8 +6,6 @@
 //
 
 import Foundation
-import XMTPRust
-import XMTPRustSwift
 
 public typealias PublishRequest = Xmtp_MessageApi_V1_PublishRequest
 public typealias PublishResponse = Xmtp_MessageApi_V1_PublishResponse

diff --git a/Sources/XMTP/Client.swift b/Sources/XMTP/Client.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 import web3
-import XMTPRust
 
 public enum ClientError: Error {
     case creationError(String)

diff --git a/Sources/XMTP/Extensions/Data.swift b/Sources/XMTP/Extensions/Data.swift
@@ -6,17 +6,12 @@
 //
 
 import Foundation
-import XMTPRust
 
 extension Data {
 	init?(base64String: String) {
 		self.init(base64Encoded: Data(base64String.utf8))
 	}
 
-	init(_ rustVec: RustVec<UInt8>) {
-		self.init(rustVec.map { $0 })
-	}
-
 	var toHex: String {
 		return reduce("") { $0 + String(format: "%02x", $1) }
 	}

diff --git a/Sources/XMTP/Extensions/RustVec.swift b/Sources/XMTP/Extensions/RustVec.swift
diff --git a/Sources/XMTP/KeyUtil.swift b/Sources/XMTP/KeyUtil.swift
@@ -6,7 +6,6 @@ import Foundation
 import Logging
 import secp256k1
 import web3
-import XMTPRust
 
 enum KeyUtilError: Error {
 	case invalidContext

diff --git a/Sources/XMTP/Messages/ContactBundle.swift b/Sources/XMTP/Messages/ContactBundle.swift
@@ -6,7 +6,6 @@
 //
 
 import web3
-import XMTPRust
 
 typealias ContactBundle = Xmtp_MessageContents_ContactBundle
 typealias ContactBundleV1 = Xmtp_MessageContents_ContactBundleV1

diff --git a/Sources/XMTP/Messages/MessageV2.swift b/Sources/XMTP/Messages/MessageV2.swift
@@ -7,7 +7,6 @@
 
 import CryptoKit
 import Foundation
-import XMTPRust
 
 typealias MessageV2 = Xmtp_MessageContents_MessageV2
 

diff --git a/Sources/XMTP/Messages/PrivateKey.swift b/Sources/XMTP/Messages/PrivateKey.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import XMTPRust
 import CryptoKit
 
 /// Represents a secp256k1 private key.  ``PrivateKey`` conforms to ``SigningKey`` so you can use it

diff --git a/Sources/XMTP/Messages/PrivateKeyBundleV1.swift b/Sources/XMTP/Messages/PrivateKeyBundleV1.swift
@@ -7,8 +7,6 @@
 
 import CryptoKit
 import Foundation
-import XMTPRust
-
 
 public typealias PrivateKeyBundleV1 = Xmtp_MessageContents_PrivateKeyBundleV1
 

diff --git a/Sources/XMTP/Messages/PrivateKeyBundleV2.swift b/Sources/XMTP/Messages/PrivateKeyBundleV2.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import XMTPRust
 
 public typealias PrivateKeyBundleV2 = Xmtp_MessageContents_PrivateKeyBundleV2
 

diff --git a/Sources/XMTP/Messages/PublicKey.swift b/Sources/XMTP/Messages/PublicKey.swift
@@ -6,8 +6,6 @@
 //
 
 import Foundation
-
-import XMTPRust
 import web3
 import CryptoKit
 

diff --git a/Sources/XMTP/Messages/Signature.swift b/Sources/XMTP/Messages/Signature.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import XMTPRust
 
 /// Represents a secp256k1 compact recoverable signature.
 public typealias Signature = Xmtp_MessageContents_Signature

diff --git a/Sources/XMTP/Messages/SignedPublicKey.swift b/Sources/XMTP/Messages/SignedPublicKey.swift
@@ -7,8 +7,6 @@
 
 import CryptoKit
 import Foundation
-
-import XMTPRust
 import web3
 
 typealias SignedPublicKey = Xmtp_MessageContents_SignedPublicKey

diff --git a/Sources/XMTP/SigningKey.swift b/Sources/XMTP/SigningKey.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 import web3
-import XMTPRust
 
 /// Defines a type that is used by a ``Client`` to sign keys and messages.
 ///

diff --git a/Sources/XMTPTestHelpers/TestHelpers.swift b/Sources/XMTPTestHelpers/TestHelpers.swift
@@ -9,7 +9,6 @@
 import Combine
 import XCTest
 @testable import XMTP
-import XMTPRust
 
 public struct TestConfig {
     static let TEST_SERVER_ENABLED = _env("TEST_SERVER_ENABLED") == "true"

diff --git a/Tests/XMTPTests/ClientTests.swift b/Tests/XMTPTests/ClientTests.swift
@@ -9,7 +9,6 @@ import Foundation
 
 import XCTest
 @testable import XMTP
-import XMTPRust
 import XMTPTestHelpers
 
 @available(iOS 15, *)

diff --git a/Tests/XMTPTests/IntegrationTests.swift b/Tests/XMTPTests/IntegrationTests.swift
@@ -9,9 +9,7 @@ import Foundation
 import secp256k1
 import web3
 import XCTest
-import XMTPRust
 @testable import XMTP
-import XMTPRust
 import XMTPTestHelpers
 
 @available(macOS 13.0, *)

diff --git a/Tests/XMTPTests/MessageTests.swift b/Tests/XMTPTests/MessageTests.swift
@@ -7,7 +7,6 @@
 
 import CryptoKit
 import XCTest
-import XMTPRust
 @testable import XMTP
 import XMTPTestHelpers
 

diff --git a/Tests/XMTPTests/PaginationTests.swift b/Tests/XMTPTests/PaginationTests.swift
@@ -9,7 +9,6 @@ import Foundation
 
 import XCTest
 @testable import XMTP
-import XMTPRust
 import XMTPTestHelpers
 
 @available(iOS 15, *)

diff --git a/...xample/XMTPiOSExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...xample/XMTPiOSExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -170,15 +170,6 @@
         "revision" : "2d9d2188a08eef4a869d368daab21b3c08510991",
         "version" : "2.6.1"
       }
-    },
-    {
-      "identity" : "xmtp-rust-swift",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/xmtp/xmtp-rust-swift",
-      "state" : {
-        "revision" : "4a76e5401fa780c40610e2f0d248f695261d08dd",
-        "version" : "0.3.1-beta0"
-      }
     }
   ],
   "version" : 2

diff --git a/dev/local/docker-compose.yml b/dev/local/docker-compose.yml
@@ -2,7 +2,6 @@ version: "3.8"
 services:
   wakunode:
     image: xmtp/node-go
-    platform: linux/arm64
     environment:
       - GOWAKU-NODEKEY=8a30dcb604b0b53627a5adc054dbf434b446628d4bd1eccc681d223f0550ce67
     command:
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ @@
     //
     import Foundation
-    import XMTPRust
     public typealias PrivateKeyBundleV2 = Xmtp_MessageContents_PrivateKeyBundleV2
@@ Expand Down @@