Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/stable'
Browse files Browse the repository at this point in the history
Conflict in FiatValueEstimation: which I have decided not to
resolve. So that part is not brought yet from stable branch,
we might do it later.

# Conflicts:
#	src/GWallet.Backend/FiatValueEstimation.fs
  • Loading branch information
knocte committed Jun 27, 2024
2 parents e84fc42 + 02730f8 commit 3af561c
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/GWallet.Backend/Ether/EtherServer.fs
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ module Server =

let HttpRequestExceptionMatchesErrorCode (ex: Http.HttpRequestException) (errorCode: int): bool =
ex.Message.StartsWith(SPrintF1 "%i " errorCode) || ex.Message.Contains(SPrintF1 " %i " errorCode)
|| ex.Message.Contains(SPrintF1 " %i." errorCode)

let exMsg = "Could not communicate with EtherServer"
let PerformEtherRemoteCallWithTimeout<'T,'R> (job: Async<'R>): Async<'R> = async {
Expand Down

0 comments on commit 3af561c

Please sign in to comment.