From 3a7339e959618b15f0aa2335a4033c919d768c4e Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Tue, 2 Jul 2024 17:01:00 +1200 Subject: [PATCH] rename withConfig --- .../Types/AvailabilitySpecifications.swift | 2 +- .../Sources/Blockchain/Types/Block.swift | 12 ++--- .../Sources/Blockchain/Types/Extrinsic.swift | 20 ++++---- .../Types/ExtrinsicAvailability.swift | 8 ++-- .../Types/ExtrinsicGuarantees.swift | 16 +++---- .../Blockchain/Types/ExtrinsicJudgement.swift | 10 ++-- .../Blockchain/Types/ExtrinsicPreimages.swift | 2 +- .../Blockchain/Types/ExtrinsicTickets.swift | 2 +- .../Sources/Blockchain/Types/Header.swift | 12 ++--- .../Blockchain/Types/JudgementsState.swift | 2 +- .../Blockchain/Types/RefinementContext.swift | 2 +- .../Blockchain/Types/SafroleState.swift | 18 +++---- .../Blockchain/Types/ServiceAccount.swift | 2 +- .../Sources/Blockchain/Types/State.swift | 48 +++++++++---------- .../Sources/Blockchain/Types/Ticket.swift | 2 +- .../Blockchain/Types/ValidatorKey.swift | 2 +- .../Sources/Blockchain/Types/WorkReport.swift | 12 ++--- .../Sources/Blockchain/Types/WorkResult.swift | 2 +- Node/Sources/Node/Genesis.swift | 4 +- Node/Sources/Node/Node.swift | 2 +- .../Utils/ConfigLimitedSizeArray.swift | 8 ++-- Utils/Sources/Utils/Dummy.swift | 2 +- Utils/Sources/Utils/Ref.swift | 4 +- 23 files changed, 97 insertions(+), 97 deletions(-) diff --git a/Blockchain/Sources/Blockchain/Types/AvailabilitySpecifications.swift b/Blockchain/Sources/Blockchain/Types/AvailabilitySpecifications.swift index f19174bd..b3f78c0e 100644 --- a/Blockchain/Sources/Blockchain/Types/AvailabilitySpecifications.swift +++ b/Blockchain/Sources/Blockchain/Types/AvailabilitySpecifications.swift @@ -29,7 +29,7 @@ public struct AvailabilitySpecifications: Sendable { extension AvailabilitySpecifications: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig _: Config) -> AvailabilitySpecifications { + public static func dummy(config _: Config) -> AvailabilitySpecifications { AvailabilitySpecifications( workPackageHash: Data32(), length: 0, diff --git a/Blockchain/Sources/Blockchain/Types/Block.swift b/Blockchain/Sources/Blockchain/Types/Block.swift index c3adcb2d..a82ac0b5 100644 --- a/Blockchain/Sources/Blockchain/Types/Block.swift +++ b/Blockchain/Sources/Blockchain/Types/Block.swift @@ -15,19 +15,19 @@ public typealias BlockRef = Ref extension Block: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig config: Config) -> Block { + public static func dummy(config: Config) -> Block { Block( - header: Header.dummy(withConfig: config), - extrinsic: Extrinsic.dummy(withConfig: config) + header: Header.dummy(config: config), + extrinsic: Extrinsic.dummy(config: config) ) } } extension Block: ScaleCodec.Encodable { - public init(withConfig config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { + public init(config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { try self.init( - header: Header(withConfig: config, from: &decoder), - extrinsic: Extrinsic(withConfig: config, from: &decoder) + header: Header(config: config, from: &decoder), + extrinsic: Extrinsic(config: config, from: &decoder) ) } diff --git a/Blockchain/Sources/Blockchain/Types/Extrinsic.swift b/Blockchain/Sources/Blockchain/Types/Extrinsic.swift index 889f98ea..17c2d179 100644 --- a/Blockchain/Sources/Blockchain/Types/Extrinsic.swift +++ b/Blockchain/Sources/Blockchain/Types/Extrinsic.swift @@ -36,25 +36,25 @@ public struct Extrinsic: Sendable { extension Extrinsic: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig config: Config) -> Extrinsic { + public static func dummy(config: Config) -> Extrinsic { Extrinsic( - tickets: ExtrinsicTickets.dummy(withConfig: config), - judgements: ExtrinsicJudgement.dummy(withConfig: config), - preimages: ExtrinsicPreimages.dummy(withConfig: config), - availability: ExtrinsicAvailability.dummy(withConfig: config), - reports: ExtrinsicGuarantees.dummy(withConfig: config) + tickets: ExtrinsicTickets.dummy(config: config), + judgements: ExtrinsicJudgement.dummy(config: config), + preimages: ExtrinsicPreimages.dummy(config: config), + availability: ExtrinsicAvailability.dummy(config: config), + reports: ExtrinsicGuarantees.dummy(config: config) ) } } extension Extrinsic: ScaleCodec.Encodable { - public init(withConfig config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { + public init(config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { try self.init( tickets: decoder.decode(), - judgements: ExtrinsicJudgement(withConfig: config, from: &decoder), + judgements: ExtrinsicJudgement(config: config, from: &decoder), preimages: decoder.decode(), - availability: ExtrinsicAvailability(withConfig: config, from: &decoder), - reports: ExtrinsicGuarantees(withConfig: config, from: &decoder) + availability: ExtrinsicAvailability(config: config, from: &decoder), + reports: ExtrinsicGuarantees(config: config, from: &decoder) ) } diff --git a/Blockchain/Sources/Blockchain/Types/ExtrinsicAvailability.swift b/Blockchain/Sources/Blockchain/Types/ExtrinsicAvailability.swift index fc05e422..9651a74d 100644 --- a/Blockchain/Sources/Blockchain/Types/ExtrinsicAvailability.swift +++ b/Blockchain/Sources/Blockchain/Types/ExtrinsicAvailability.swift @@ -43,15 +43,15 @@ public struct ExtrinsicAvailability: Sendable { extension ExtrinsicAvailability: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig config: Config) -> ExtrinsicAvailability { - ExtrinsicAvailability(assurances: ConfigLimitedSizeArray(withConfig: config)) + public static func dummy(config: Config) -> ExtrinsicAvailability { + ExtrinsicAvailability(assurances: ConfigLimitedSizeArray(config: config)) } } extension ExtrinsicAvailability: ScaleCodec.Encodable { - public init(withConfig config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { + public init(config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { try self.init( - assurances: ConfigLimitedSizeArray(withConfig: config, from: &decoder) + assurances: ConfigLimitedSizeArray(config: config, from: &decoder) ) } diff --git a/Blockchain/Sources/Blockchain/Types/ExtrinsicGuarantees.swift b/Blockchain/Sources/Blockchain/Types/ExtrinsicGuarantees.swift index 2eb08d20..d020c77f 100644 --- a/Blockchain/Sources/Blockchain/Types/ExtrinsicGuarantees.swift +++ b/Blockchain/Sources/Blockchain/Types/ExtrinsicGuarantees.swift @@ -43,22 +43,22 @@ public struct ExtrinsicGuarantees: Sendable { self.guarantees = guarantees } - public init(withConfig config: ProtocolConfigRef) { - guarantees = ConfigLimitedSizeArray(withConfig: config) + public init(config: ProtocolConfigRef) { + guarantees = ConfigLimitedSizeArray(config: config) } } extension ExtrinsicGuarantees: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig config: Config) -> ExtrinsicGuarantees { - ExtrinsicGuarantees(withConfig: config) + public static func dummy(config: Config) -> ExtrinsicGuarantees { + ExtrinsicGuarantees(config: config) } } extension ExtrinsicGuarantees: ScaleCodec.Encodable { - public init(withConfig config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { + public init(config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { try self.init( - guarantees: ConfigLimitedSizeArray(withConfig: config, from: &decoder) { try GuaranteeItem(withConfig: config, from: &$0) } + guarantees: ConfigLimitedSizeArray(config: config, from: &decoder) { try GuaranteeItem(config: config, from: &$0) } ) } @@ -68,10 +68,10 @@ extension ExtrinsicGuarantees: ScaleCodec.Encodable { } extension ExtrinsicGuarantees.GuaranteeItem: ScaleCodec.Encodable { - public init(withConfig config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { + public init(config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { try self.init( coreIndex: decoder.decode(), - workReport: WorkReport(withConfig: config, from: &decoder), + workReport: WorkReport(config: config, from: &decoder), timeslot: decoder.decode(), credential: decoder.decode() ) diff --git a/Blockchain/Sources/Blockchain/Types/ExtrinsicJudgement.swift b/Blockchain/Sources/Blockchain/Types/ExtrinsicJudgement.swift index f93a446a..a256bede 100644 --- a/Blockchain/Sources/Blockchain/Types/ExtrinsicJudgement.swift +++ b/Blockchain/Sources/Blockchain/Types/ExtrinsicJudgement.swift @@ -50,15 +50,15 @@ public struct ExtrinsicJudgement: Sendable { extension ExtrinsicJudgement: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig _: Config) -> ExtrinsicJudgement { + public static func dummy(config _: Config) -> ExtrinsicJudgement { ExtrinsicJudgement(judgements: []) } } extension ExtrinsicJudgement: ScaleCodec.Encodable { - public init(withConfig config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { + public init(config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { try self.init( - judgements: decoder.decode(.array { try JudgementItem(withConfig: config, from: &$0) }) + judgements: decoder.decode(.array { try JudgementItem(config: config, from: &$0) }) ) } @@ -68,10 +68,10 @@ extension ExtrinsicJudgement: ScaleCodec.Encodable { } extension ExtrinsicJudgement.JudgementItem: ScaleCodec.Encodable { - public init(withConfig config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { + public init(config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { try self.init( reportHash: decoder.decode(), - signatures: ConfigFixedSizeArray(withConfig: config, from: &decoder) + signatures: ConfigFixedSizeArray(config: config, from: &decoder) ) } diff --git a/Blockchain/Sources/Blockchain/Types/ExtrinsicPreimages.swift b/Blockchain/Sources/Blockchain/Types/ExtrinsicPreimages.swift index e42390a5..9d692c26 100644 --- a/Blockchain/Sources/Blockchain/Types/ExtrinsicPreimages.swift +++ b/Blockchain/Sources/Blockchain/Types/ExtrinsicPreimages.swift @@ -24,7 +24,7 @@ public struct ExtrinsicPreimages: Sendable { extension ExtrinsicPreimages: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig _: Config) -> ExtrinsicPreimages { + public static func dummy(config _: Config) -> ExtrinsicPreimages { ExtrinsicPreimages(preimages: []) } } diff --git a/Blockchain/Sources/Blockchain/Types/ExtrinsicTickets.swift b/Blockchain/Sources/Blockchain/Types/ExtrinsicTickets.swift index f38f7e4a..69ff18af 100644 --- a/Blockchain/Sources/Blockchain/Types/ExtrinsicTickets.swift +++ b/Blockchain/Sources/Blockchain/Types/ExtrinsicTickets.swift @@ -26,7 +26,7 @@ public struct ExtrinsicTickets: Sendable { extension ExtrinsicTickets: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig _: Config) -> ExtrinsicTickets { + public static func dummy(config _: Config) -> ExtrinsicTickets { ExtrinsicTickets(tickets: []) } } diff --git a/Blockchain/Sources/Blockchain/Types/Header.swift b/Blockchain/Sources/Blockchain/Types/Header.swift index 0b138d59..9189b91c 100644 --- a/Blockchain/Sources/Blockchain/Types/Header.swift +++ b/Blockchain/Sources/Blockchain/Types/Header.swift @@ -91,7 +91,7 @@ public struct Header: Sendable { extension Header: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig _: Config) -> Header { + public static func dummy(config _: Config) -> Header { Header( parentHash: Data32(), priorStateRoot: Data32(), @@ -108,14 +108,14 @@ extension Header: Dummy { } extension Header: ScaleCodec.Encodable { - public init(withConfig config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { + public init(config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { try self.init( parentHash: decoder.decode(), priorStateRoot: decoder.decode(), extrinsicsRoot: decoder.decode(), timeslotIndex: decoder.decode(), - epoch: EpochMarker(withConfig: config, from: &decoder), - winningTickets: ConfigFixedSizeArray(withConfig: config, from: &decoder), + epoch: EpochMarker(config: config, from: &decoder), + winningTickets: ConfigFixedSizeArray(config: config, from: &decoder), judgementsMarkers: decoder.decode(), authorKey: decoder.decode(), vrfSignature: decoder.decode(), @@ -138,10 +138,10 @@ extension Header: ScaleCodec.Encodable { } extension Header.EpochMarker: ScaleCodec.Encodable { - public init(withConfig config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { + public init(config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { try self.init( entropy: decoder.decode(), - validators: ConfigFixedSizeArray(withConfig: config, from: &decoder) + validators: ConfigFixedSizeArray(config: config, from: &decoder) ) } diff --git a/Blockchain/Sources/Blockchain/Types/JudgementsState.swift b/Blockchain/Sources/Blockchain/Types/JudgementsState.swift index 645dbbb2..12351d93 100644 --- a/Blockchain/Sources/Blockchain/Types/JudgementsState.swift +++ b/Blockchain/Sources/Blockchain/Types/JudgementsState.swift @@ -26,7 +26,7 @@ public struct JudgementsState: Sendable { extension JudgementsState: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig _: Config) -> JudgementsState { + public static func dummy(config _: Config) -> JudgementsState { JudgementsState( allowSet: [], banSet: [], diff --git a/Blockchain/Sources/Blockchain/Types/RefinementContext.swift b/Blockchain/Sources/Blockchain/Types/RefinementContext.swift index 2a75f8f3..82949cf5 100644 --- a/Blockchain/Sources/Blockchain/Types/RefinementContext.swift +++ b/Blockchain/Sources/Blockchain/Types/RefinementContext.swift @@ -37,7 +37,7 @@ public struct RefinementContext: Sendable { extension RefinementContext: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig _: Config) -> RefinementContext { + public static func dummy(config _: Config) -> RefinementContext { RefinementContext( anchor: ( headerHash: Data32(), diff --git a/Blockchain/Sources/Blockchain/Types/SafroleState.swift b/Blockchain/Sources/Blockchain/Types/SafroleState.swift index 1e949724..8f8d9148 100644 --- a/Blockchain/Sources/Blockchain/Types/SafroleState.swift +++ b/Blockchain/Sources/Blockchain/Types/SafroleState.swift @@ -59,27 +59,27 @@ public struct SafroleState: Sendable { extension SafroleState: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig config: Config) -> SafroleState { + public static func dummy(config: Config) -> SafroleState { SafroleState( - nextValidators: ConfigFixedSizeArray(withConfig: config, defaultValue: ValidatorKey.dummy(withConfig: config)), + nextValidators: ConfigFixedSizeArray(config: config, defaultValue: ValidatorKey.dummy(config: config)), ticketsVerifierKey: BandersnatchRingVRFRoot(), - ticketsOrKeys: .right(ConfigFixedSizeArray(withConfig: config, defaultValue: BandersnatchPublicKey())), - ticketsAccumulator: ConfigLimitedSizeArray(withConfig: config) + ticketsOrKeys: .right(ConfigFixedSizeArray(config: config, defaultValue: BandersnatchPublicKey())), + ticketsAccumulator: ConfigLimitedSizeArray(config: config) ) } } extension SafroleState: ScaleCodec.Encodable { - public init(withConfig config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { + public init(config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { try self.init( - nextValidators: ConfigFixedSizeArray(withConfig: config, from: &decoder), + nextValidators: ConfigFixedSizeArray(config: config, from: &decoder), ticketsVerifierKey: decoder.decode(), ticketsOrKeys: Either( from: &decoder, - decodeLeft: { try ConfigFixedSizeArray(withConfig: config, from: &$0) }, - decodeRight: { try ConfigFixedSizeArray(withConfig: config, from: &$0) } + decodeLeft: { try ConfigFixedSizeArray(config: config, from: &$0) }, + decodeRight: { try ConfigFixedSizeArray(config: config, from: &$0) } ), - ticketsAccumulator: ConfigLimitedSizeArray(withConfig: config, from: &decoder) + ticketsAccumulator: ConfigLimitedSizeArray(config: config, from: &decoder) ) } diff --git a/Blockchain/Sources/Blockchain/Types/ServiceAccount.swift b/Blockchain/Sources/Blockchain/Types/ServiceAccount.swift index 21169161..d68315fe 100644 --- a/Blockchain/Sources/Blockchain/Types/ServiceAccount.swift +++ b/Blockchain/Sources/Blockchain/Types/ServiceAccount.swift @@ -57,7 +57,7 @@ public struct ServiceAccount: Sendable { extension ServiceAccount: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig _: Config) -> ServiceAccount { + public static func dummy(config _: Config) -> ServiceAccount { ServiceAccount( storage: [:], preimages: [:], diff --git a/Blockchain/Sources/Blockchain/Types/State.swift b/Blockchain/Sources/Blockchain/Types/State.swift index dafa26cd..d4353967 100644 --- a/Blockchain/Sources/Blockchain/Types/State.swift +++ b/Blockchain/Sources/Blockchain/Types/State.swift @@ -144,36 +144,36 @@ public typealias StateRef = Ref extension State: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig config: Config) -> State { + public static func dummy(config: Config) -> State { State( - coreAuthorizationPool: ConfigFixedSizeArray(withConfig: config, defaultValue: ConfigLimitedSizeArray(withConfig: config)), - lastBlock: Block.dummy(withConfig: config), - safroleState: SafroleState.dummy(withConfig: config), + coreAuthorizationPool: ConfigFixedSizeArray(config: config, defaultValue: ConfigLimitedSizeArray(config: config)), + lastBlock: Block.dummy(config: config), + safroleState: SafroleState.dummy(config: config), serviceAccounts: [:], entropyPool: (Data32(), Data32(), Data32(), Data32()), - validatorQueue: ConfigFixedSizeArray(withConfig: config, defaultValue: ValidatorKey.dummy(withConfig: config)), - currentValidators: ConfigFixedSizeArray(withConfig: config, defaultValue: ValidatorKey.dummy(withConfig: config)), - previousValidators: ConfigFixedSizeArray(withConfig: config, defaultValue: ValidatorKey.dummy(withConfig: config)), - reports: ConfigFixedSizeArray(withConfig: config, defaultValue: nil), + validatorQueue: ConfigFixedSizeArray(config: config, defaultValue: ValidatorKey.dummy(config: config)), + currentValidators: ConfigFixedSizeArray(config: config, defaultValue: ValidatorKey.dummy(config: config)), + previousValidators: ConfigFixedSizeArray(config: config, defaultValue: ValidatorKey.dummy(config: config)), + reports: ConfigFixedSizeArray(config: config, defaultValue: nil), timestamp: 0, authorizationQueue: ConfigFixedSizeArray( - withConfig: config, - defaultValue: ConfigFixedSizeArray(withConfig: config, defaultValue: Data32()) + config: config, + defaultValue: ConfigFixedSizeArray(config: config, defaultValue: Data32()) ), privilegedServiceIndices: ( empower: ServiceIdentifier(), assign: ServiceIdentifier(), designate: ServiceIdentifier() ), - judgements: JudgementsState.dummy(withConfig: config) + judgements: JudgementsState.dummy(config: config) ) } } extension State.ReportItem: ScaleCodec.Encodable { - public init(withConfig config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { + public init(config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { try self.init( - workReport: WorkReport(withConfig: config, from: &decoder), + workReport: WorkReport(config: config, from: &decoder), guarantors: decoder.decode(), timestamp: decoder.decode() ) @@ -187,22 +187,22 @@ extension State.ReportItem: ScaleCodec.Encodable { } extension State: ScaleCodec.Encodable { - public init(withConfig config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { + public init(config: ProtocolConfigRef, from decoder: inout some ScaleCodec.Decoder) throws { try self.init( - coreAuthorizationPool: ConfigFixedSizeArray(withConfig: config, from: &decoder) { - try ConfigLimitedSizeArray(withConfig: config, from: &$0) { try $0.decode() } + coreAuthorizationPool: ConfigFixedSizeArray(config: config, from: &decoder) { + try ConfigLimitedSizeArray(config: config, from: &$0) { try $0.decode() } }, - lastBlock: Block(withConfig: config, from: &decoder), - safroleState: SafroleState(withConfig: config, from: &decoder), + lastBlock: Block(config: config, from: &decoder), + safroleState: SafroleState(config: config, from: &decoder), serviceAccounts: decoder.decode(), entropyPool: decoder.decode(), - validatorQueue: ConfigFixedSizeArray(withConfig: config, from: &decoder), - currentValidators: ConfigFixedSizeArray(withConfig: config, from: &decoder), - previousValidators: ConfigFixedSizeArray(withConfig: config, from: &decoder), - reports: ConfigFixedSizeArray(withConfig: config, from: &decoder) { try ReportItem(withConfig: config, from: &$0) }, + validatorQueue: ConfigFixedSizeArray(config: config, from: &decoder), + currentValidators: ConfigFixedSizeArray(config: config, from: &decoder), + previousValidators: ConfigFixedSizeArray(config: config, from: &decoder), + reports: ConfigFixedSizeArray(config: config, from: &decoder) { try ReportItem(config: config, from: &$0) }, timestamp: decoder.decode(), - authorizationQueue: ConfigFixedSizeArray(withConfig: config, from: &decoder) { - try ConfigFixedSizeArray(withConfig: config, from: &$0) + authorizationQueue: ConfigFixedSizeArray(config: config, from: &decoder) { + try ConfigFixedSizeArray(config: config, from: &$0) }, privilegedServiceIndices: decoder.decode(), judgements: decoder.decode() diff --git a/Blockchain/Sources/Blockchain/Types/Ticket.swift b/Blockchain/Sources/Blockchain/Types/Ticket.swift index aa7bb19e..58b1e7f9 100644 --- a/Blockchain/Sources/Blockchain/Types/Ticket.swift +++ b/Blockchain/Sources/Blockchain/Types/Ticket.swift @@ -8,7 +8,7 @@ public struct Ticket: Sendable { extension Ticket: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig _: Config) -> Ticket { + public static func dummy(config _: Config) -> Ticket { Ticket(id: Data32(), attempt: 0) } } diff --git a/Blockchain/Sources/Blockchain/Types/ValidatorKey.swift b/Blockchain/Sources/Blockchain/Types/ValidatorKey.swift index 102255ef..61c74ebc 100644 --- a/Blockchain/Sources/Blockchain/Types/ValidatorKey.swift +++ b/Blockchain/Sources/Blockchain/Types/ValidatorKey.swift @@ -22,7 +22,7 @@ public struct ValidatorKey: Sendable { extension ValidatorKey: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig _: Config) -> ValidatorKey { + public static func dummy(config _: Config) -> ValidatorKey { ValidatorKey( bandersnatch: BandersnatchPublicKey(), ed25519: Ed25519PublicKey(), diff --git a/Blockchain/Sources/Blockchain/Types/WorkReport.swift b/Blockchain/Sources/Blockchain/Types/WorkReport.swift index c5ee799c..a95d09ef 100644 --- a/Blockchain/Sources/Blockchain/Types/WorkReport.swift +++ b/Blockchain/Sources/Blockchain/Types/WorkReport.swift @@ -43,25 +43,25 @@ public struct WorkReport: Sendable { extension WorkReport: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig config: Config) -> WorkReport { + public static func dummy(config: Config) -> WorkReport { WorkReport( authorizerHash: Data32(), output: Data(), - refinementContext: RefinementContext.dummy(withConfig: config), - packageSpecification: AvailabilitySpecifications.dummy(withConfig: config), - results: ConfigLimitedSizeArray(withConfig: config, defaultValue: WorkResult.dummy(withConfig: config)) + refinementContext: RefinementContext.dummy(config: config), + packageSpecification: AvailabilitySpecifications.dummy(config: config), + results: ConfigLimitedSizeArray(config: config, defaultValue: WorkResult.dummy(config: config)) ) } } extension WorkReport: ScaleCodec.Encodable { - public init(withConfig config: Config, from decoder: inout some ScaleCodec.Decoder) throws { + public init(config: Config, from decoder: inout some ScaleCodec.Decoder) throws { try self.init( authorizerHash: decoder.decode(), output: decoder.decode(), refinementContext: decoder.decode(), packageSpecification: decoder.decode(), - results: ConfigLimitedSizeArray(withConfig: config, from: &decoder) + results: ConfigLimitedSizeArray(config: config, from: &decoder) ) } diff --git a/Blockchain/Sources/Blockchain/Types/WorkResult.swift b/Blockchain/Sources/Blockchain/Types/WorkResult.swift index ab3f30eb..abfe8174 100644 --- a/Blockchain/Sources/Blockchain/Types/WorkResult.swift +++ b/Blockchain/Sources/Blockchain/Types/WorkResult.swift @@ -37,7 +37,7 @@ public struct WorkResult: Sendable { extension WorkResult: Dummy { public typealias Config = ProtocolConfigRef - public static func dummy(withConfig _: Config) -> WorkResult { + public static func dummy(config _: Config) -> WorkResult { WorkResult( serviceIdentifier: ServiceIdentifier(), codeHash: Data32(), diff --git a/Node/Sources/Node/Genesis.swift b/Node/Sources/Node/Genesis.swift index 36431fc7..4c707d15 100644 --- a/Node/Sources/Node/Genesis.swift +++ b/Node/Sources/Node/Genesis.swift @@ -7,12 +7,12 @@ public enum Genesis { } extension Genesis { - public func toState(withConfig config: ProtocolConfigRef) throws -> StateRef { + public func toState(config: ProtocolConfigRef) throws -> StateRef { switch self { case .file: fatalError("TODO: not implemented") case .dev: - StateRef.dummy(withConfig: config) + StateRef.dummy(config: config) } } } diff --git a/Node/Sources/Node/Node.swift b/Node/Sources/Node/Node.swift index 367215f4..3500ef9d 100644 --- a/Node/Sources/Node/Node.swift +++ b/Node/Sources/Node/Node.swift @@ -4,7 +4,7 @@ public class Node { public private(set) var blockchain: Blockchain public init(genesis: Genesis, config: ProtocolConfigRef) throws { - let genesisState = try genesis.toState(withConfig: config) + let genesisState = try genesis.toState(config: config) blockchain = Blockchain(heads: [genesisState], finalizedHead: genesisState) } diff --git a/Utils/Sources/Utils/ConfigLimitedSizeArray.swift b/Utils/Sources/Utils/ConfigLimitedSizeArray.swift index 83201b6a..6372ae09 100644 --- a/Utils/Sources/Utils/ConfigLimitedSizeArray.swift +++ b/Utils/Sources/Utils/ConfigLimitedSizeArray.swift @@ -10,7 +10,7 @@ public struct ConfigLimitedSizeArray = ConfigLimitedSizeAr extension ConfigLimitedSizeArray { public init( - withConfig config: TMinLength.TConfig, + config: TMinLength.TConfig, from decoder: inout D, decodeItem: @escaping (inout D) throws -> T ) throws { @@ -139,7 +139,7 @@ extension ConfigLimitedSizeArray { // not ScaleCodec.Decodable because we need to have the config to know the size limit extension ConfigLimitedSizeArray where T: ScaleCodec.Decodable { - public init(withConfig config: TMinLength.TConfig, from decoder: inout some ScaleCodec.Decoder) throws { + public init(config: TMinLength.TConfig, from decoder: inout some ScaleCodec.Decoder) throws { let minLength = TMinLength.read(config: config) let maxLength = TMaxLength.read(config: config) diff --git a/Utils/Sources/Utils/Dummy.swift b/Utils/Sources/Utils/Dummy.swift index a9944b3b..2aed41e1 100644 --- a/Utils/Sources/Utils/Dummy.swift +++ b/Utils/Sources/Utils/Dummy.swift @@ -3,5 +3,5 @@ /// should be avoided in production code public protocol Dummy { associatedtype Config - static func dummy(withConfig config: Config) -> Self + static func dummy(config: Config) -> Self } diff --git a/Utils/Sources/Utils/Ref.swift b/Utils/Sources/Utils/Ref.swift index 6339e33f..ceb6e5a2 100644 --- a/Utils/Sources/Utils/Ref.swift +++ b/Utils/Sources/Utils/Ref.swift @@ -30,7 +30,7 @@ extension Ref: Hashable where T: Hashable { extension Ref: Dummy where T: Dummy { public typealias Config = T.Config - public static func dummy(withConfig config: Config) -> Self { - Self(T.dummy(withConfig: config)) + public static func dummy(config: Config) -> Self { + Self(T.dummy(config: config)) } }