rename (#289)

Author: xlc

Blockchain/Sources/Blockchain/BlockchainServices.swift

@@ -83,7 +83,7 @@ public class BlockchainServices {
                 eventBus: eventBus,
                 keystore: keystore,
                 scheduler: scheduler,
-                extrinsicPool: ExtrinsicPoolService(config: config, dataProvider: dataProvider, eventBus: eventBus)
+                safroleTicketPool: SafroleTicketPoolService(config: config, dataProvider: dataProvider, eventBus: eventBus)
             )
             _blockAuthorRef = _blockAuthor
             return _blockAuthor!

Blockchain/Sources/Blockchain/Validator/BlockAuthor.swift

@@ -7,7 +7,7 @@ import Utils
 public final class BlockAuthor: ServiceBase2, @unchecked Sendable {
     private let dataProvider: BlockchainDataProvider
     private let keystore: KeyStore
-    private let extrinsicPool: ExtrinsicPoolService
+    private let safroleTicketPool: SafroleTicketPoolService
 
     private let tickets: ThreadSafeContainer<[RuntimeEvents.SafroleTicketsGenerated]> = .init([])
 
@@ -17,11 +17,11 @@ public final class BlockAuthor: ServiceBase2, @unchecked Sendable {
         eventBus: EventBus,
         keystore: KeyStore,
         scheduler: Scheduler,
-        extrinsicPool: ExtrinsicPoolService
+        safroleTicketPool: SafroleTicketPoolService
     ) async {
         self.dataProvider = dataProvider
         self.keystore = keystore
-        self.extrinsicPool = extrinsicPool
+        self.safroleTicketPool = safroleTicketPool
 
         super.init(id: "BlockAuthor", config: config, eventBus: eventBus, scheduler: scheduler)
 
@@ -57,7 +57,7 @@ public final class BlockAuthor: ServiceBase2, @unchecked Sendable {
         let stateRoot = await state.value.stateRoot
         let epoch = timeslot.timeslotToEpochIndex(config: config)
 
-        let pendingTickets = await extrinsicPool.getPendingTickets(epoch: epoch)
+        let pendingTickets = await safroleTicketPool.getPendingTickets(epoch: epoch)
         let existingTickets = SortedArray(sortedUnchecked: state.value.safroleState.ticketsAccumulator.array.map(\.id))
         let tickets = pendingTickets.array
             .lazy

…ain/Validator/ExtrinsicPoolService.swift …nsicPools/SafroleTicketPoolService.swiftBlockchain/Sources/Blockchain/Validator/ExtrinsicPoolService.swift renamed to Blockchain/Sources/Blockchain/Validator/ExtrinsicPools/SafroleTicketPoolService.swift Blockchain/Sources/Blockchain/Validator/ExtrinsicPoolService.swift renamed to Blockchain/Sources/Blockchain/Validator/ExtrinsicPools/SafroleTicketPoolService.swift

@@ -69,7 +69,7 @@ private actor ServiceStorage {
     }
 }
 
-public final class ExtrinsicPoolService: ServiceBase, @unchecked Sendable {
+public final class SafroleTicketPoolService: ServiceBase, @unchecked Sendable {
     private var storage: ServiceStorage
     private let dataProvider: BlockchainDataProvider
 
@@ -83,7 +83,7 @@ public final class ExtrinsicPoolService: ServiceBase, @unchecked Sendable {
         let ringContext = try! Bandersnatch.RingContext(size: UInt(config.value.totalNumberOfValidators))
         storage = ServiceStorage(ringContext: ringContext)
 
-        super.init(id: "ExtrinsicPoolService", config: config, eventBus: eventBus)
+        super.init(id: "SafroleTicketPoolService", config: config, eventBus: eventBus)
 
         await storage.setLogger(logger)
 

…n/Validator/WorkPackagePoolService.swift …rinsicPools/WorkPackagePoolService.swiftBlockchain/Sources/Blockchain/Validator/WorkPackagePoolService.swift renamed to Blockchain/Sources/Blockchain/Validator/ExtrinsicPools/WorkPackagePoolService.swift Blockchain/Sources/Blockchain/Validator/WorkPackagePoolService.swift renamed to Blockchain/Sources/Blockchain/Validator/ExtrinsicPools/WorkPackagePoolService.swift

@@ -18,7 +18,7 @@ public final class GuaranteeingService: ServiceBase2, @unchecked Sendable {
     private let dataProvider: BlockchainDataProvider
     private let keystore: KeyStore
     private let runtime: Runtime
-    private let extrinsicPool: ExtrinsicPoolService
+    private let safroleTicketPool: SafroleTicketPoolService
     private let workPackagePool: WorkPackagePoolService
     private let guarantees: ThreadSafeContainer<[RuntimeEvents.GuaranteeGenerated]> = .init([])
     private let authorizationFunction: GuaranteeingAuthorizationFunction
@@ -32,13 +32,13 @@ public final class GuaranteeingService: ServiceBase2, @unchecked Sendable {
         dataProvider: BlockchainDataProvider,
         keystore: KeyStore,
         runtime: Runtime,
-        extrinsicPool: ExtrinsicPoolService,
+        safroleTicketPool: SafroleTicketPoolService,
         dataStore: DataStore
     ) async {
         self.dataProvider = dataProvider
         self.keystore = keystore
         self.runtime = runtime
-        self.extrinsicPool = extrinsicPool
+        self.safroleTicketPool = safroleTicketPool
         authorizationFunction = GuaranteeingAuthorizationFunction()
         refineInvocation = GuaranteeingRefineInvocation()
         workPackagePool = await WorkPackagePoolService(config: config, dataProvider: dataProvider, eventBus: eventBus)

Blockchain/Sources/Blockchain/Validator/GuaranteeingService.swift

@@ -5,7 +5,7 @@ public final class ValidatorService: Sendable {
     private let blockchain: Blockchain
     private let keystore: KeyStore
     private let safrole: SafroleService
-    private let extrinsicPool: ExtrinsicPoolService
+    private let safroleTicketPool: SafroleTicketPoolService
     private let blockAuthor: BlockAuthor
     private let dataAvailability: DataAvailability
 
@@ -26,7 +26,7 @@ public final class ValidatorService: Sendable {
             keystore: keystore
         )
 
-        extrinsicPool = await ExtrinsicPoolService(
+        safroleTicketPool = await SafroleTicketPoolService(
             config: blockchain.config,
             dataProvider: dataProvider,
             eventBus: eventBus
@@ -38,7 +38,7 @@ public final class ValidatorService: Sendable {
             eventBus: eventBus,
             keystore: keystore,
             scheduler: scheduler,
-            extrinsicPool: extrinsicPool
+            safroleTicketPool: safroleTicketPool
         )
 
         dataAvailability = await DataAvailability(

Blockchain/Sources/Blockchain/Validator/ValidatorService.swift

@@ -17,7 +17,7 @@ struct GuaranteeingServiceTests {
             keysCount: keysCount
         )
 
-        let extrinsicPoolService = await ExtrinsicPoolService(
+        let SafroleTicketPoolService = await SafroleTicketPoolService(
             config: config,
             dataProvider: services.dataProvider,
             eventBus: services.eventBus
@@ -32,7 +32,7 @@ struct GuaranteeingServiceTests {
             dataProvider: services.dataProvider,
             keystore: services.keystore,
             runtime: runtime,
-            extrinsicPool: extrinsicPoolService,
+            safroleTicketPool: SafroleTicketPoolService,
             dataStore: services.dataStore
         )
         return (services, guaranteeingService)

Blockchain/Tests/BlockchainTests/GuaranteeingServiceTests.swift

@@ -5,14 +5,14 @@ import Utils
 
 @testable import Blockchain
 
-struct ExtrinsicPoolServiceTests {
+struct SafroleTicketPoolServiceTests {
     let config: ProtocolConfigRef
     let timeProvider: MockTimeProvider
     let dataProvider: BlockchainDataProvider
     let eventBus: EventBus
     let keystore: KeyStore
     let storeMiddleware: StoreMiddleware
-    let extrinsicPoolService: ExtrinsicPoolService
+    let poolService: SafroleTicketPoolService
     let ringContext: Bandersnatch.RingContext
 
     init() async throws {
@@ -29,7 +29,7 @@ struct ExtrinsicPoolServiceTests {
 
         keystore = try await DevKeyStore(devKeysCount: config.value.totalNumberOfValidators)
 
-        extrinsicPoolService = await ExtrinsicPoolService(config: config, dataProvider: dataProvider, eventBus: eventBus)
+        poolService = await SafroleTicketPoolService(config: config, dataProvider: dataProvider, eventBus: eventBus)
 
         ringContext = try Bandersnatch.RingContext(size: UInt(config.value.totalNumberOfValidators))
 
@@ -66,7 +66,7 @@ struct ExtrinsicPoolServiceTests {
             // Wait for the event to be processed
             await storeMiddleware.wait()
 
-            let pendingTickets = await extrinsicPoolService
+            let pendingTickets = await poolService
                 .getPendingTickets(epoch: state.value.timeslot.timeslotToEpochIndex(config: config))
             #expect(pendingTickets == allTickets)
         }
@@ -110,7 +110,7 @@ struct ExtrinsicPoolServiceTests {
         // Wait for the event to be processed
         await storeMiddleware.wait()
 
-        let pendingTickets = await extrinsicPoolService.getPendingTickets(epoch: state.value.timeslot.timeslotToEpochIndex(config: config))
+        let pendingTickets = await poolService.getPendingTickets(epoch: state.value.timeslot.timeslotToEpochIndex(config: config))
         #expect(pendingTickets == allTickets)
     }
 
@@ -164,7 +164,7 @@ struct ExtrinsicPoolServiceTests {
         await storeMiddleware.wait()
 
         // Check that the tickets in the block have been removed from the pool
-        let pendingTickets = await extrinsicPoolService.getPendingTickets(epoch: state.value.timeslot.timeslotToEpochIndex(config: config))
+        let pendingTickets = await poolService.getPendingTickets(epoch: state.value.timeslot.timeslotToEpochIndex(config: config))
         #expect(pendingTickets.array == Array(tickets[2 ..< 4]).sorted())
     }
 
@@ -194,8 +194,8 @@ struct ExtrinsicPoolServiceTests {
 
         let epoch = state.value.timeslot.timeslotToEpochIndex(config: config)
 
-        #expect(await extrinsicPoolService.getPendingTickets(epoch: epoch).count == 4)
-        #expect(await extrinsicPoolService.getPendingTickets(epoch: epoch + 1).count == 0)
+        #expect(await poolService.getPendingTickets(epoch: epoch).count == 4)
+        #expect(await poolService.getPendingTickets(epoch: epoch + 1).count == 0)
 
         // Simulate an epoch change with new entropy
         let nextTimeslot = state.value.timeslot + TimeslotIndex(config.value.epochLength)
@@ -240,10 +240,10 @@ struct ExtrinsicPoolServiceTests {
         await eventBus.publish(newAddEvent)
         await storeMiddleware.wait()
 
-        let finalPendingTickets = await extrinsicPoolService.getPendingTickets(epoch: epoch + 1)
+        let finalPendingTickets = await poolService.getPendingTickets(epoch: epoch + 1)
         #expect(finalPendingTickets.array == newTickets.sorted())
 
-        #expect(await extrinsicPoolService.getPendingTickets(epoch: epoch).count == 0)
-        #expect(await extrinsicPoolService.getPendingTickets(epoch: epoch + 2).count == 0)
+        #expect(await poolService.getPendingTickets(epoch: epoch).count == 0)
+        #expect(await poolService.getPendingTickets(epoch: epoch + 2).count == 0)
     }
 }