Skip to content

Commit

Permalink
Apply automatic fantomas formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
knocte committed Apr 25, 2022
1 parent fd1eef9 commit 9899f30
Show file tree
Hide file tree
Showing 118 changed files with 26,830 additions and 13,749 deletions.
127 changes: 127 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
[*.{fs,fsx}]
end_of_line=lf
indent_size=4
max_line_length=80
fsharp_semicolon_at_end_of_line=false
fsharp_space_before_parameter=false
fsharp_space_before_lowercase_invocation=false
fsharp_space_before_uppercase_invocation=false
fsharp_space_before_class_constructor=false
fsharp_space_before_member=false
fsharp_space_before_colon=false
fsharp_space_after_comma=true
fsharp_space_before_semicolon=false
fsharp_space_after_semicolon=true
fsharp_indent_on_try_with=false
fsharp_space_around_delimiter=true
fsharp_max_if_then_else_short_width=0
fsharp_max_infix_operator_expression=80
fsharp_max_record_width=0
fsharp_max_function_binding_width=0
fsharp_max_value_binding_width=80
fsharp_multiline_block_brackets_on_same_column=true
fsharp_newline_between_type_definition_and_members=true
fsharp_keep_if_then_in_same_line=true
fsharp_strict_mode=false
fsharp_multi_line_lambda_closing_newline=true
fsharp_disable_elmish_syntax=true

[*.cs]
#Core editorconfig formatting - indentation

#use soft tabs (spaces) for indentation
indent_style = space

#Formatting - new line options

#place catch statements on a new line
csharp_new_line_before_catch = true
#place else statements on a new line
csharp_new_line_before_else = true
#require finally statements to be on a new line after the closing brace
csharp_new_line_before_finally = true
#require members of object intializers to be on separate lines
csharp_new_line_before_members_in_object_initializers = true
#require braces to be on a new line for methods, control_blocks, object_collection_array_initializers, and types (also known as "Allman" style)
csharp_new_line_before_open_brace = methods, control_blocks, object_collection_array_initializers, types

#Formatting - organize using options

#sort System.* using directives alphabetically, and place them before other usings
dotnet_sort_system_directives_first = true

#Formatting - spacing options

#require NO space between a cast and the value
csharp_space_after_cast = false
#require a space before the colon for bases or interfaces in a type declaration
csharp_space_after_colon_in_inheritance_clause = true
#require a space after a keyword in a control flow statement such as a for loop
csharp_space_after_keywords_in_control_flow_statements = true
#require a space before the colon for bases or interfaces in a type declaration
csharp_space_before_colon_in_inheritance_clause = true
#remove space within empty argument list parentheses
csharp_space_between_method_call_empty_parameter_list_parentheses = false
#remove space between method call name and opening parenthesis
csharp_space_between_method_call_name_and_opening_parenthesis = false
#do not place space characters after the opening parenthesis and before the closing parenthesis of a method call
csharp_space_between_method_call_parameter_list_parentheses = false
#place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list.
csharp_space_between_method_declaration_parameter_list_parentheses = false

#Formatting - wrapping options

#leave code block on single line
csharp_preserve_single_line_blocks = true

#Style - Code block preferences

#prefer no curly braces if allowed
csharp_prefer_braces = false:suggestion

#Style - expression bodied member options

#prefer block bodies for methods
csharp_style_expression_bodied_methods = false:suggestion
#prefer expression-bodied members for properties
csharp_style_expression_bodied_properties = true:suggestion

#Style - Expression-level preferences

#prefer default over default(T)
csharp_prefer_simple_default_expression = true:suggestion
#prefer objects to be initialized using object initializers when possible
dotnet_style_object_initializer = true:suggestion

#Style - implicit and explicit types

#prefer var over explicit type in all cases, unless overridden by another code style rule
csharp_style_var_elsewhere = true:suggestion
#prefer var is used to declare variables with built-in system types such as int
csharp_style_var_for_built_in_types = true:suggestion
#prefer explicit type over var when the type is already mentioned on the right-hand side of a declaration
csharp_style_var_when_type_is_apparent = false:suggestion

#Style - language keyword and framework type options

#prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion

#Style - modifier options

#prefer accessibility modifiers to be declared except for public interface members. This will currently not differ from always and will act as future proofing for if C# adds default interface methods.
dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion

#Style - Modifier preferences

#when this rule is set to a list of modifiers, prefer the specified ordering.
csharp_preferred_modifier_order = public,private,protected,static,override,readonly,abstract,async:suggestion

#Style - qualification options

#prefer fields not to be prefaced with this. or Me. in Visual Basic
dotnet_style_qualification_for_field = false:suggestion
#prefer methods not to be prefaced with this. or Me. in Visual Basic
dotnet_style_qualification_for_method = false:suggestion
#prefer properties not to be prefaced with this. or Me. in Visual Basic
dotnet_style_qualification_for_property = false:suggestion
15 changes: 7 additions & 8 deletions src/DotNetLightning.Core/AssemblyInfo.fs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ module AssemblyInfo
open System.Reflection
open System.Runtime.CompilerServices

[<assembly:AssemblyTitleAttribute("DotNetLightning")>]
[<assembly:AssemblyProductAttribute("DotNetLightning")>]
[<assembly:AssemblyVersionAttribute("0.1.0")>]
[<assembly:AssemblyFileVersionAttribute("0.1.0")>]
[<assembly:AssemblyInformationalVersionAttribute("0.1.0")>]
[<assembly:AssemblyMetadataAttribute("ReleaseChannel", "release")>]
[<assembly:AssemblyDescriptionAttribute("Lightning Network Daemon for DotNet")>]
[<assembly: AssemblyTitleAttribute("DotNetLightning")>]
[<assembly: AssemblyProductAttribute("DotNetLightning")>]
[<assembly: AssemblyVersionAttribute("0.1.0")>]
[<assembly: AssemblyFileVersionAttribute("0.1.0")>]
[<assembly: AssemblyInformationalVersionAttribute("0.1.0")>]
[<assembly: AssemblyMetadataAttribute("ReleaseChannel", "release")>]
[<assembly: AssemblyDescriptionAttribute("Lightning Network Daemon for DotNet")>]
[<assembly: InternalsVisibleTo("DotNetLightning.Core.Tests")>]
[<assembly: InternalsVisibleTo("DotNetLightning.Infrastructure")>]
[<assembly: InternalsVisibleTo("DotNetLightning.Infrastructure.Tests")>]
Expand All @@ -34,4 +34,3 @@ module internal AssemblyVersionInformation =

[<Literal>]
let AssemblyMetadata_ReleaseChannel = "release"

7 changes: 4 additions & 3 deletions src/DotNetLightning.Core/Chain/ChainInterface.fs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
namespace DotNetLightning.Chain

open System
open NBitcoin
open DotNetLightning.Utils
Expand All @@ -15,15 +16,16 @@ type BlockChainInstanceId = BlockChainInstanceId of string

/// We want transaction index number for channel id and such.
/// So not using NBitcoin.Block directly
type BlockContent = BlockHeader * BlockHeight * (uint32 * Transaction) list
type BlockContent = BlockHeader * BlockHeight * list<(uint32 * Transaction)>

type RawOnChainEvent =
| BlockConnected of chainId: BlockChainInstanceId * content: BlockContent
| BlockDisconnected of chainId: BlockChainInstanceId * BlockHeader

type OnChainEvent =
| BlockConnected of content: BlockContent
/// value is a list of blocks which has disappeared from the blockchain.
| BlockDisconnected of header: BlockContent list
| BlockDisconnected of header: list<BlockContent>


type IBroadCaster =
Expand All @@ -36,4 +38,3 @@ type ConfirmationTarget =

type IFeeEstimator =
abstract member GetEstSatPer1000Weight: (ConfirmationTarget) -> FeeRatePerKw

42 changes: 22 additions & 20 deletions src/DotNetLightning.Core/Chain/KeysInterface.fs
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,42 @@ open DotNetLightning.Utils
open DotNetLightning.Utils.NBitcoinExtensions

/// OutPoint
type StaticOutput = {
outPoint: OutPoint
output: TxOut
}
type StaticOutput =
{
outPoint: OutPoint
output: TxOut
}

/// Outpoint commits to p2wsh
/// P2WSH should be spend by the following witness
/// `<local_delayedsig> 0 <witnessScript>` (with input nSequence set to self_delay)
/// Outputs from HTLC-Success/Timeout tx/commitment tx
type DynamicOutputP2WSH = {
outPoint: OutPoint
key: Key
witnessScript: Script
toSelfDelay: uint16
output: TxOut
}
type DynamicOutputP2WSH =
{
outPoint: OutPoint
key: Key
witnessScript: Script
toSelfDelay: uint16
output: TxOut
}

/// Outpoint commits to a P2WPKH
/// P2WPKH should be spend by the following witness.
/// `<local_sig> <local_pubkey>`
/// Outputs to_remote from a commitment tx
type DynamicOutputP2WPKH = {
/// Output spendable by user wallet
outpoint: OutPoint
/// localkey = payment_basepoint_secret + SHA256(per_commitment_point || payment_basepoint)
key: Key
/// The output which is reference by the given outpoint
output: TxOut
}
type DynamicOutputP2WPKH =
{
/// Output spendable by user wallet
outpoint: OutPoint
/// localkey = payment_basepoint_secret + SHA256(per_commitment_point || payment_basepoint)
key: Key
/// The output which is reference by the given outpoint
output: TxOut
}

/// When on-chain outputs are created by DotNetLightning an event is generated which informs the user thereof.
/// This enum describes the format of the output and provides the OutPoint.
type SpendableOutputDescriptor =
| StaticOutput of StaticOutput
| DynamicOutputP2WSH of DynamicOutputP2WSH
| DynamicOutputP2WPKH of DynamicOutputP2WPKH

Loading

0 comments on commit 9899f30

Please sign in to comment.