Update fantomas to v4.4.0-alpha-008

Things I don't like: member __.GetLastCachedData (): CachedNetworkData = lock cacheFiles.CachedNetworkData - (fun _ -> sessionCachedNetworkData) + (fun _ -> sessionCachedNetworkData + ) Things I should report (if not reported yet): 1) Processing src/GWallet.Backend/Ether/EtherServer.fs The following exception occurs while formatting stdin: Fantomas.FormatConfig+FormatException: Formatted content is not valid F# code at Fantomas.Extras.FakeHelpers.formatContentInternalAsync@95-5.Invoke(Boolean _arg2) in C:\Users\nojaf\Projects\fantomas\src\Fantomas.Extras\FakeHelpers.fs:line 96 at Microsoft.FSharp.Control.AsyncPrimitives.CallThenInvokeNoHijackCheck[a,b](AsyncActivation`1 ctxt, FSharpFunc`2 userCode, b result1) in F:\workspace\_work\1\s\src\fsharp\FSharp.Core\async.fs:line 404 at [email protected](AsyncActivation`1 ctxt) in C:\Users\nojaf\Projects\fantomas\src\Fantomas\CodeFormatterImpl.fs:line 378 at Microsoft.FSharp.Control.Trampoline.Execute(FSharpFunc`2 firstAction) in F:\workspace\_work\1\s\src\fsharp\FSharp.Core\async.fs:line 104 --- End of stack trace from previous location --- at Microsoft.FSharp.Control.AsyncResult`1.Commit() in F:\workspace\_work\1\s\src\fsharp\FSharp.Core\async.fs:line 337 at Microsoft.FSharp.Control.AsyncPrimitives.RunSynchronouslyInCurrentThread[a](CancellationToken cancellationToken, FSharpAsync`1 computation) in F:\workspace\_work\1\s\src\fsharp\FSharp.Core\async.fs:line 870 at Microsoft.FSharp.Control.AsyncPrimitives.RunSynchronously[T](CancellationToken cancellationToken, FSharpAsync`1 computation, FSharpOption`1 timeout) in F:\workspace\_work\1\s\src\fsharp\FSharp.Core\async.fs:line 878 at Microsoft.FSharp.Control.FSharpAsync.RunSynchronously[T](FSharpAsync`1 computation, FSharpOption`1 timeout, FSharpOption`1 cancellationToken) in F:\workspace\_work\1\s\src\fsharp\FSharp.Core\async.fs:line 1142 at Program.processSourceString(Boolean isFsiFile, String s, FSharpChoice`2 tw, FormatConfig config) in C:\Users\nojaf\Projects\fantomas\src\Fantomas.CoreGlobalTool\Program.fs:line 113 at Program.stringToFile@310(Boolean force, Boolean profile, String s, String outFile, FormatConfig config) in C:\Users\nojaf\Projects\fantomas\src\Fantomas.CoreGlobalTool\Program.fs:line 322 2) Processing src/GWallet.Backend/FaultTolerantParallelClient.fs The following exception occurs while formatting stdin: Fantomas.FormatConfig+FormatException: Formatted content is not valid F# code at Fantomas.Extras.FakeHelpers.formatContentInternalAsync@95-5.Invoke(Boolean _arg2) in C:\Users\nojaf\Projects\fantomas\src\Fantomas.Extras\FakeHelpers.fs:line 96 at Microsoft.FSharp.Control.AsyncPrimitives.CallThenInvokeNoHijackCheck[a,b](AsyncActivation`1 ctxt, FSharpFunc`2 userCode, b result1) in F:\workspace\_work\1\s\src\fsharp\FSharp.Core\async.fs:line 404 at [email protected](AsyncActivation`1 ctxt) in C:\Users\nojaf\Projects\fantomas\src\Fantomas\CodeFormatterImpl.fs:line 378 at Microsoft.FSharp.Control.Trampoline.Execute(FSharpFunc`2 firstAction) in F:\workspace\_work\1\s\src\fsharp\FSharp.Core\async.fs:line 104 --- End of stack trace from previous location --- at Microsoft.FSharp.Control.AsyncResult`1.Commit() in F:\workspace\_work\1\s\src\fsharp\FSharp.Core\async.fs:line 337 at Microsoft.FSharp.Control.AsyncPrimitives.RunSynchronouslyInCurrentThread[a](CancellationToken cancellationToken, FSharpAsync`1 computation) in F:\workspace\_work\1\s\src\fsharp\FSharp.Core\async.fs:line 870 at Microsoft.FSharp.Control.AsyncPrimitives.RunSynchronously[T](CancellationToken cancellationToken, FSharpAsync`1 computation, FSharpOption`1 timeout) in F:\workspace\_work\1\s\src\fsharp\FSharp.Core\async.fs:line 878 at Microsoft.FSharp.Control.FSharpAsync.RunSynchronously[T](FSharpAsync`1 computation, FSharpOption`1 timeout, FSharpOption`1 cancellationToken) in F:\workspace\_work\1\s\src\fsharp\FSharp.Core\async.fs:line 1142 at Program.processSourceString(Boolean isFsiFile, String s, FSharpChoice`2 tw, FormatConfig config) in C:\Users\nojaf\Projects\fantomas\src\Fantomas.CoreGlobalTool\Program.fs:line 113 at Program.stringToFile@310(Boolean force, Boolean profile, String s, String outFile, FormatConfig config) in C:\Users\nojaf\Projects\fantomas\src\Fantomas.CoreGlobalTool\Program.fs:line 322 NOTE: one of these two above may be fsprojects/fantomas#1241
nblockchain · Jan 17, 2021 · 93fd2c3 · 93fd2c3
1 parent 8c1a8ea
commit 93fd2c3
Show file tree

Hide file tree

Showing 27 changed files with 1,450 additions and 1,065 deletions.
diff --git a/src/GWallet.Backend/Account.fs b/src/GWallet.Backend/Account.fs
diff --git a/src/GWallet.Backend/AccountTypes.fs b/src/GWallet.Backend/AccountTypes.fs
@@ -44,9 +44,12 @@ type IAccount =
     abstract PublicAddress: string
 
 [<AbstractClass>]
-type BaseAccount (currency: Currency,
-                  accountFile: FileRepresentation,
-                  fromAccountFileToPublicAddress: FileRepresentation -> string) =
+type BaseAccount
+    (
+        currency: Currency,
+        accountFile: FileRepresentation,
+        fromAccountFileToPublicAddress: FileRepresentation -> string
+    ) =
     member val AccountFile = accountFile
 
     abstract Kind: AccountKind
@@ -56,27 +59,36 @@ type BaseAccount (currency: Currency,
         member val PublicAddress = fromAccountFileToPublicAddress accountFile
 
 
-type NormalAccount (currency: Currency,
-                    accountFile: FileRepresentation,
-                    fromAccountFileToPublicAddress: FileRepresentation -> string) =
-    inherit BaseAccount(currency, accountFile, fromAccountFileToPublicAddress)
+type NormalAccount
+    (
+        currency: Currency,
+        accountFile: FileRepresentation,
+        fromAccountFileToPublicAddress: FileRepresentation -> string
+    ) =
+    inherit BaseAccount (currency, accountFile, fromAccountFileToPublicAddress)
 
     member internal __.GetEncryptedPrivateKey () =
         accountFile.Content ()
 
     override __.Kind = AccountKind.Normal
 
-type ReadOnlyAccount (currency: Currency,
-                      accountFile: FileRepresentation,
-                      fromAccountFileToPublicAddress: FileRepresentation -> string) =
-    inherit BaseAccount(currency, accountFile, fromAccountFileToPublicAddress)
+type ReadOnlyAccount
+    (
+        currency: Currency,
+        accountFile: FileRepresentation,
+        fromAccountFileToPublicAddress: FileRepresentation -> string
+    ) =
+    inherit BaseAccount (currency, accountFile, fromAccountFileToPublicAddress)
 
     override __.Kind = AccountKind.ReadOnly
 
-type ArchivedAccount (currency: Currency,
-                      accountFile: FileRepresentation,
-                      fromAccountFileToPublicAddress: FileRepresentation -> string) =
-    inherit BaseAccount(currency, accountFile, fromAccountFileToPublicAddress)
+type ArchivedAccount
+    (
+        currency: Currency,
+        accountFile: FileRepresentation,
+        fromAccountFileToPublicAddress: FileRepresentation -> string
+    ) =
+    inherit BaseAccount (currency, accountFile, fromAccountFileToPublicAddress)
 
     member internal __.GetUnencryptedPrivateKey () =
         accountFile.Content ()