Skip to content

Commit

Permalink
Make the error messages readable (#370)
Browse files Browse the repository at this point in the history
* make the error messages readable

* Update tests.yml

* Update tests.yml

* add an install for rust

* Update tests.yml

* another ci try
  • Loading branch information
nplasterer authored Jul 24, 2024
1 parent 2d66e43 commit 325da35
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- name: Checkout project sources
uses: actions/checkout@v3

# This step and the Install Colima step have been modified to address a
# Python error started 3.11.2024, emitting the following error:
#
Expand Down Expand Up @@ -77,4 +77,4 @@ jobs:
run: script/run_tests.sh

- name: Stop local test server
run: docker-compose -p xmtp-ios -f dev/local/docker-compose.yml down
run: docker-compose -p xmtp-ios -f dev/local/docker-compose.yml down
14 changes: 12 additions & 2 deletions Sources/XMTPiOS/Client.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import web3

public typealias PreEventCallback = () async throws -> Void

public enum ClientError: Error, CustomStringConvertible {
public enum ClientError: Error, CustomStringConvertible, LocalizedError {
case creationError(String)
case noV3Client(String)

Expand All @@ -23,6 +23,10 @@ public enum ClientError: Error, CustomStringConvertible {
return "ClientError.noV3Client: \(err)"
}
}

public var errorDescription: String? {
return description
}
}

/// Specify configuration options for creating a ``Client``.
Expand Down Expand Up @@ -128,7 +132,13 @@ public final class Client {
)
return try await create(account: account, apiClient: apiClient, options: options)
} catch {
throw ClientError.creationError("\(error)")
let detailedErrorMessage: String
if let nsError = error as NSError? {
detailedErrorMessage = nsError.description
} else {
detailedErrorMessage = error.localizedDescription
}
throw ClientError.creationError(detailedErrorMessage)
}
}

Expand Down
4 changes: 4 additions & 0 deletions dev/up
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ if [[ "${OSTYPE}" == "darwin"* ]]; then
/Library/Java/JavaVirtualMachines/
fi
if ! kotlinc -version &>/dev/null; then brew install kotlin; fi
if ! which rustup &>/dev/null; then
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
source $HOME/.cargo/env
fi
fi

rustup update
Expand Down

0 comments on commit 325da35

Please sign in to comment.