Backend/Ether: refactor some error handling to avoid repetition

And at the same time hopefully we workaround a fantomas bug which might be tricky to fix: fsprojects/fantomas#1390
nblockchain · Jan 27, 2021 · faa6825 · faa6825
1 parent 47dfaf6
commit faa6825
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/GWallet.Backend/Ether/EtherServer.fs b/src/GWallet.Backend/Ether/EtherServer.fs
@@ -174,16 +174,21 @@ module Server =
         | _ ->
             ()
 
+    let private err32kPossibleMessages =
+        [
+            "pruning=archive"
+            "header not found"
+            "error: no suitable peers available"
+            "missing trie node"
+        ]
+
     let MaybeRethrowRpcResponseException (ex: Exception): unit =
         let maybeRpcResponseEx = FSharpUtil.FindException<JsonRpcSharp.Client.RpcResponseException> ex
         match maybeRpcResponseEx with
         | Some rpcResponseEx ->
             if rpcResponseEx.RpcError <> null then
                 if rpcResponseEx.RpcError.Code = int RpcErrorCode.StatePruningNodeOrMissingTrieNodeOrHeaderNotFound then
-                    if (not (rpcResponseEx.RpcError.Message.Contains "pruning=archive")) &&
-                       (not (rpcResponseEx.RpcError.Message.Contains "header not found")) &&
-                       (not (rpcResponseEx.RpcError.Message.Contains "error: no suitable peers available")) &&
-                       (not (rpcResponseEx.RpcError.Message.Contains "missing trie node")) then
+                    if not (err32kPossibleMessages.Any (fun msg -> rpcResponseEx.RpcError.Message.Contains msg)) then
                         raise <| Exception(
                                      SPrintF2 "Expecting 'pruning=archive' or 'missing trie node' or 'error: no suitable peers available' or 'header not found' in message of a %d code, but got '%s'"
                                              (int RpcErrorCode.StatePruningNodeOrMissingTrieNodeOrHeaderNotFound)