Decouple Context and Scheme

Benchmarks/RlweBenchmark/RlweBenchmark.swift

@@ -43,7 +43,7 @@ func getRandomPlaintextData<T: ScalarType>(count: Int, in range: Range<T>) -> [T
 
 struct RlweBenchmarkContext<Scheme: HeScheme>: Sendable {
     var encryptionParameters: EncryptionParameters<Scheme.Scalar>
-    var context: Context<Scheme>
+    var context: Context<Scheme.Scalar>
 
     let data: [Scheme.Scalar]
     let signedData: [Scheme.SignedScalar]
@@ -163,7 +163,7 @@ func contextInitBenchmark<Scheme: HeScheme>(_: Scheme.Type, config: EncryptionPa
             let encryptionParameters = try EncryptionParameters<Scheme.Scalar>(config: config)
             benchmark.startMeasurement()
             for _ in benchmark.scaledIterations {
-                try blackHole(_ = Context<Scheme>(encryptionParameters: encryptionParameters))
+                try blackHole(_ = Context<Scheme.Scalar>(encryptionParameters: encryptionParameters))
             }
         }
     }
@@ -279,8 +279,7 @@ func decodeSignedSimdBenchmark<Scheme: HeScheme>(_: Scheme.Type) -> () -> Void {
             let benchmarkContext: RlweBenchmarkContext<Scheme> = try StaticRlweBenchmarkContext.getBenchmarkContext()
             benchmark.startMeasurement()
             for _ in benchmark.scaledIterations {
-                try blackHole(
-                    benchmarkContext.coeffPlaintext.decode(format: .simd) as [Scheme.SignedScalar])
+                try blackHole(benchmarkContext.coeffPlaintext.decode(format: .simd) as [Scheme.SignedScalar])
             }
         }
     }
@@ -292,7 +291,7 @@ func generateSecretKeyBenchmark<Scheme: HeScheme>(_: Scheme.Type) -> () -> Void
             let benchmarkContext: RlweBenchmarkContext<Scheme> = try StaticRlweBenchmarkContext.getBenchmarkContext()
             benchmark.startMeasurement()
             for _ in benchmark.scaledIterations {
-                try blackHole(benchmarkContext.context.generateSecretKey())
+                try blackHole(benchmarkContext.context.generateSecretKey() as SecretKey<Scheme>)
             }
         }
     }
@@ -320,8 +319,7 @@ func encryptBenchmark<Scheme: HeScheme>(_: Scheme.Type) -> () -> Void {
             let benchmarkContext: RlweBenchmarkContext<Scheme> = try StaticRlweBenchmarkContext.getBenchmarkContext()
             benchmark.startMeasurement()
             for _ in benchmark.scaledIterations {
-                try blackHole(
-                    benchmarkContext.coeffPlaintext.encrypt(using: benchmarkContext.secretKey))
+                try blackHole(benchmarkContext.coeffPlaintext.encrypt(using: benchmarkContext.secretKey))
             }
         }
     }
@@ -333,9 +331,7 @@ func decryptBenchmark<Scheme: HeScheme>(_: Scheme.Type) -> () -> Void {
             let benchmarkContext: RlweBenchmarkContext<Scheme> = try StaticRlweBenchmarkContext.getBenchmarkContext()
             benchmark.startMeasurement()
             for _ in benchmark.scaledIterations {
-                try blackHole(
-                    benchmarkContext.evalCiphertext.decrypt(
-                        using: benchmarkContext.secretKey))
+                try blackHole(benchmarkContext.evalCiphertext.decrypt(using: benchmarkContext.secretKey))
             }
         }
     }

Snippets/HomomorphicEncryption/BasicsSnippet.swift

@@ -24,7 +24,7 @@ import HomomorphicEncryption
 let encryptParams =
     try EncryptionParameters<UInt64>(from: .insecure_n_8_logq_5x18_logt_5)
 // Perform pre-computation for HE computation with these parameters.
-let context = try Context<Bfv<UInt64>>(encryptionParameters: encryptParams)
+let context = try Context<UInt64>(encryptionParameters: encryptParams)
 
 // We encode N values using coefficient encoding.
 let values: [UInt64] = [8, 5, 12, 12, 15, 0, 8, 5]
@@ -33,7 +33,7 @@ let plaintext: Bfv<UInt64>.CoeffPlaintext = try context.encode(
     format: .coefficient)
 
 // We generate a secret key and use it to encrypt the plaintext.
-let secretKey = try context.generateSecretKey()
+let secretKey: SecretKey<Bfv<UInt64>> = try context.generateSecretKey()
 var ciphertext = try plaintext.encrypt(using: secretKey)
 
 // Decrypting the plaintext yields the original values.

Snippets/HomomorphicEncryption/EncryptionParametersSnippet.swift

@@ -85,11 +85,11 @@ func summarize<Scheme: HeScheme>(
     parameters: EncryptionParameters<Scheme.Scalar>, _: Scheme.Type) throws
 {
     let values = (0..<8).map { Scheme.Scalar($0) }
-    let context = try Context<Scheme>(encryptionParameters: parameters)
+    let context = try Context<Scheme.Scalar>(encryptionParameters: parameters)
     let plaintext: Scheme.CoeffPlaintext = try context.encode(
         values: values,
         format: .coefficient)
-    let secretKey = try context.generateSecretKey()
+    let secretKey: SecretKey<Scheme> = try context.generateSecretKey()
     let ciphertext = try plaintext.encrypt(using: secretKey)
     let noiseBudget = try ciphertext.noiseBudget(
         using: secretKey,

Snippets/HomomorphicEncryption/EvaluationKeySnippet.swift

@@ -46,7 +46,7 @@ let encryptionParameters =
     try EncryptionParameters<UInt32>(from: .insecure_n_8_logq_5x18_logt_5)
 precondition(encryptionParameters.plaintextModulus == 17)
 // Perform pre-computation for HE computation with these parameters.
-let context = try Context<Bfv<UInt32>>(encryptionParameters: encryptionParameters)
+let context = try Context<UInt32>(encryptionParameters: encryptionParameters)
 
 // We encode N values using SIMD encoding.
 // Each value is a Bfv<UInt32>.Scalar, which is UInt32.
@@ -56,7 +56,7 @@ let plaintext: Bfv<UInt32>.CoeffPlaintext = try context.encode(
     format: .simd)
 
 // We generate a secret key and encrypt the plaintext.
-let secretKey = try context.generateSecretKey()
+let secretKey: SecretKey<Bfv<UInt32>> = try context.generateSecretKey()
 var ciphertext = try plaintext.encrypt(using: secretKey)
 
 // We generate an evaluation key. This is a key used in some HE operations.

Snippets/HomomorphicEncryption/MultiplicationSnippet.swift

@@ -34,7 +34,7 @@ let encryptParams =
     try EncryptionParameters<UInt32>(from: .insecure_n_8_logq_5x18_logt_5)
 precondition(encryptParams.plaintextModulus == 17)
 // Perform pre-computation for HE computation with these parameters.
-let context = try Context<Bfv<UInt32>>(encryptionParameters: encryptParams)
+let context = try Context<UInt32>(encryptionParameters: encryptParams)
 
 // We don't need to use all the slots in the encoding.
 // However, performing HE operations on ciphertexts with fewer slots doesn't give
@@ -46,7 +46,7 @@ let plaintext: Bfv<UInt32>.CoeffPlaintext = try context.encode(
     format: .simd)
 
 // We generate a secret key and encrypt the plaintext.
-let secretKey = try context.generateSecretKey()
+let secretKey: SecretKey<Bfv<UInt32>> = try context.generateSecretKey()
 let ciphertext = try plaintext.encrypt(using: secretKey)
 
 // Multiplication requires the ciphertext and plaintext to be in Evaluation

Snippets/HomomorphicEncryption/NoiseBudgetSnippet.swift

@@ -45,7 +45,7 @@ func checkDecryptsDecodes<Scheme: HeScheme>(
 let encryptionParameters =
     try EncryptionParameters<UInt32>(from: .insecure_n_8_logq_5x18_logt_5)
 // Perform pre-computation for HE computation with these parameters.
-let context = try Context<Bfv<UInt32>>(encryptionParameters: encryptionParameters)
+let context = try Context<UInt32>(encryptionParameters: encryptionParameters)
 
 // We encode N values in coefficient format and SIMD encoding.
 let values = (0..<8).map { UInt32($0) }
@@ -54,7 +54,7 @@ let plaintext: Bfv<UInt32>.CoeffPlaintext = try context.encode(
     format: .simd)
 
 // We generate a secret key and encrypt the plaintext.
-let secretKey = try context.generateSecretKey()
+let secretKey: SecretKey<Bfv<UInt32>> = try context.generateSecretKey()
 var ciphertext = try plaintext.encrypt(using: secretKey)
 
 // The noiseBudget of a ciphertext is a measure of how many encrypted operations

Snippets/HomomorphicEncryption/SerializationSnippet.swift

@@ -36,7 +36,7 @@ extension SerializedCiphertext {
 let encryptionParameters =
     try EncryptionParameters<UInt32>(from: .n_4096_logq_27_28_28_logt_5)
 // Perform pre-computation for HE computation with these parameters.
-let context = try Context<Bfv<UInt32>>(encryptionParameters: encryptionParameters)
+let context = try Context<UInt32>(encryptionParameters: encryptionParameters)
 
 // We encode some values in coefficient format and coefficient encoding.
 let values = (0..<8).map { UInt32($0) }
@@ -45,7 +45,7 @@ let plaintext: Bfv<UInt32>.CoeffPlaintext = try context.encode(
     format: .coefficient)
 
 // We generate a secret key and encrypt the plaintext.
-let secretKey = try context.generateSecretKey()
+let secretKey: SecretKey<Bfv<UInt32>> = try context.generateSecretKey()
 var ciphertext: Bfv<UInt32>.CanonicalCiphertext = try plaintext
     .encrypt(using: secretKey)
 

Sources/BenchmarkUtilities/PirBenchmarkUtilities.swift

@@ -83,7 +83,7 @@ extension PrivateInformationRetrieval.Response {
 
 struct ProcessBenchmarkContext<Server: IndexPirServer> {
     let database: [[UInt8]]
-    let context: Context<Server.Scheme>
+    let context: Context<Server.Scheme.Scalar>
     let parameter: IndexPirParameter
     init(server _: Server.Type, pirConfig: IndexPirConfig,
          parameterConfig: PirEncryptionParametersConfig) throws
@@ -171,7 +171,7 @@ struct IndexPirBenchmarkContext<Server: IndexPirServer, Client: IndexPirClient>
     {
         let encryptParameter: EncryptionParameters<Server.Scheme.Scalar> =
             try EncryptionParameters(from: parameterConfig)
-        let context = try Context<Server.Scheme>(encryptionParameters: encryptParameter)
+        let context = try Context<Server.Scheme.Scalar>(encryptionParameters: encryptParameter)
         let indexPirParameters = Server.generateParameter(config: pirConfig, with: context)
         let database = getDatabaseForTesting(
             numberOfEntries: pirConfig.entryCount,
@@ -286,7 +286,7 @@ struct KeywordPirBenchmarkContext<IndexServer: IndexPirServer, IndexClient: Inde
     {
         let encryptParameter: EncryptionParameters<Server.Scheme.Scalar> =
             try EncryptionParameters(from: parameterConfig)
-        let context = try Context<Server.Scheme>(encryptionParameters: encryptParameter)
+        let context = try Context<Server.Scheme.Scalar>(encryptionParameters: encryptParameter)
         let rows = (0..<databaseCount).map { index in KeywordValuePair(
             keyword: [UInt8](String(index).utf8),
             value: (0..<payloadSize).map { _ in UInt8.random(in: 0..<UInt8.max) })

Sources/BenchmarkUtilities/PnnsBenchmarkUtilities.swift

@@ -188,7 +188,7 @@ extension PrivateNearestNeighborSearch.Response {
 
 struct PnnsProcessBenchmarkContext<Scheme: HeScheme> {
     let database: Database
-    let contexts: [Context<Scheme>]
+    let contexts: [Context<Scheme.Scalar>]
     let serverConfig: ServerConfig<Scheme>
 
     init(databaseConfig: DatabaseConfig,
@@ -305,7 +305,7 @@ struct PnnsBenchmarkContext<Scheme: HeScheme> {
 
         let database = getDatabaseForTesting(config: databaseConfig)
         let contexts = try clientConfig.encryptionParameters
-            .map { encryptionParameters in try Context<Scheme>(encryptionParameters: encryptionParameters) }
+            .map { encryptionParameters in try Context<Scheme.Scalar>(encryptionParameters: encryptionParameters) }
         self.processedDatabase = try database.process(config: serverConfig, contexts: contexts)
         self.client = try Client(config: clientConfig, contexts: contexts)
         self.server = try Server(database: processedDatabase)

Sources/HomomorphicEncryption/Bfv/Bfv+Encode.swift

@@ -24,23 +24,23 @@ extension Bfv {
 
     @inlinable
     // swiftlint:disable:next missing_docs attributes
-    public static func encode(context: Context<Bfv<T>>, values: some Collection<Scalar>,
+    public static func encode(context: Context<T>, values: some Collection<Scalar>,
                               format: EncodeFormat) throws -> CoeffPlaintext
     {
         try context.encode(values: values, format: format)
     }
 
     @inlinable
     // swiftlint:disable:next missing_docs attributes
-    public static func encode(context: Context<Bfv<T>>, signedValues: some Collection<SignedScalar>,
+    public static func encode(context: Context<T>, signedValues: some Collection<SignedScalar>,
                               format: EncodeFormat) throws -> CoeffPlaintext
     {
         try context.encode(signedValues: signedValues, format: format)
     }
 
     @inlinable
     // swiftlint:disable:next missing_docs attributes
-    public static func encode(context: Context<Bfv<T>>, values: some Collection<Scalar>, format: EncodeFormat,
+    public static func encode(context: Context<T>, values: some Collection<Scalar>, format: EncodeFormat,
                               moduliCount: Int?) throws -> EvalPlaintext
     {
         let coeffPlaintext = try Self.encode(context: context, values: values, format: format)
@@ -50,7 +50,7 @@ extension Bfv {
     @inlinable
     // swiftlint:disable:next missing_docs attributes
     public static func encode(
-        context: Context<Bfv<T>>,
+        context: Context<T>,
         signedValues: some Collection<SignedScalar>,
         format: EncodeFormat,
         moduliCount: Int?) throws -> EvalPlaintext

Sources/HomomorphicEncryption/Bfv/Bfv+Encrypt.swift

@@ -1,4 +1,4 @@
-// Copyright 2024 Apple Inc. and the Swift Homomorphic Encryption project authors
+// Copyright 2024-2025 Apple Inc. and the Swift Homomorphic Encryption project authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ extension Bfv {
 
     @inlinable
     // swiftlint:disable:next missing_docs attributes
-    public static func zeroCiphertextCoeff(context: Context<Self>, moduliCount: Int?) throws -> CoeffCiphertext {
+    public static func zeroCiphertextCoeff(context: Context<Scalar>, moduliCount: Int?) throws -> CoeffCiphertext {
         let moduliCount = moduliCount ?? context.ciphertextContext.moduli.count
         let zeroPoly = try PolyRq<Scalar, Coeff>.zero(
             context: context.ciphertextContext
@@ -34,7 +34,7 @@ extension Bfv {
 
     @inlinable
     // swiftlint:disable:next missing_docs attributes
-    public static func zeroCiphertextEval(context: Context<Self>, moduliCount: Int?) throws -> EvalCiphertext {
+    public static func zeroCiphertextEval(context: Context<Scalar>, moduliCount: Int?) throws -> EvalCiphertext {
         let moduliCount = moduliCount ?? context.ciphertextContext.moduli.count
         let zeroPoly = try PolyRq<Scalar, Eval>.zero(
             context: context.ciphertextContext
@@ -143,15 +143,15 @@ extension Bfv {
     }
 
     @inlinable
-    static func encryptZero(for context: Context<Bfv<T>>,
+    static func encryptZero(for context: Context<T>,
                             using secretKey: SecretKey<Bfv<T>>) throws -> CanonicalCiphertext
     {
         let ciphertextContext = context.ciphertextContext
         return try encryptZero(for: context, using: secretKey, with: ciphertextContext)
     }
 
     @inlinable
-    static func encryptZero(for context: Context<Bfv<T>>,
+    static func encryptZero(for context: Context<T>,
                             using secretKey: SecretKey<Bfv<T>>,
                             with ciphertextContext: PolyContext<T>) throws -> CanonicalCiphertext
     {

Sources/HomomorphicEncryption/Bfv/Bfv+Keys.swift

@@ -1,4 +1,4 @@
-// Copyright 2024 Apple Inc. and the Swift Homomorphic Encryption project authors
+// Copyright 2024-2025 Apple Inc. and the Swift Homomorphic Encryption project authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ import ModularArithmetic
 extension Bfv {
     @inlinable
     // swiftlint:disable:next missing_docs attributes
-    public static func generateSecretKey(context: Context<Self>) throws -> SecretKey<Bfv<T>> {
+    public static func generateSecretKey(context: Context<Scalar>) throws -> SecretKey<Bfv<T>> {
         var s = PolyRq<Scalar, Coeff>.zero(context: context.secretKeyContext)
         var rng = SystemRandomNumberGenerator()
         s.randomizeTernary(using: &rng)
@@ -28,7 +28,7 @@ extension Bfv {
     @inlinable
     // swiftlint:disable:next missing_docs attributes
     public static func generateEvaluationKey(
-        context: Context<Bfv<T>>,
+        context: Context<T>,
         config: EvaluationKeyConfig,
         using secretKey: borrowing SecretKey<Bfv<T>>) throws -> EvaluationKey<Bfv<T>>
     {
@@ -55,7 +55,7 @@ extension Bfv {
     }
 
     @inlinable
-    static func generateRelinearizationKey(context: Context<Self>,
+    static func generateRelinearizationKey(context: Context<Scalar>,
                                            secretKey: borrowing SecretKey<Self>) throws
         -> RelinearizationKey<Self>
     {
@@ -65,7 +65,7 @@ extension Bfv {
     }
 
     @inlinable
-    static func generateKeySwitchKey(context: Context<Bfv<T>>,
+    static func generateKeySwitchKey(context: Context<T>,
                                      currentKey: consuming PolyRq<T, Eval>,
                                      targetKey: borrowing SecretKey<Bfv<T>>) throws -> KeySwitchKey<Bfv<T>>
     {
@@ -120,7 +120,7 @@ extension Bfv {
     /// - seealso: ``Bfv/generateEvaluationKey(context:config:using:)``.
     @inlinable
     static func computeKeySwitchingUpdate(
-        context: Context<Bfv<T>>,
+        context: Context<T>,
         target: PolyRq<Scalar, CanonicalCiphertextFormat>,
         keySwitchingKey: KeySwitchKey<Self>) throws -> [PolyRq<Scalar, CanonicalCiphertextFormat>]
     {

Sources/HomomorphicEncryption/Ciphertext.swift

@@ -17,7 +17,7 @@ public struct Ciphertext<Scheme: HeScheme, Format: PolyFormat>: Equatable, Senda
     public typealias Scalar = Scheme.Scalar
 
     /// Context for HE computation.
-    public let context: Context<Scheme>
+    public let context: Context<Scheme.Scalar>
     @usableFromInline package var polys: [PolyRq<Scalar, Format>]
     @usableFromInline var correctionFactor: Scalar
     @usableFromInline var seed: [UInt8] = []
@@ -33,7 +33,7 @@ public struct Ciphertext<Scheme: HeScheme, Format: PolyFormat>: Equatable, Senda
 
     @inlinable
     init(
-        context: Context<Scheme>,
+        context: Context<Scheme.Scalar>,
         polys: [PolyRq<Scalar, Format>],
         correctionFactor: Scalar,
         seed: [UInt8] = [])
@@ -64,7 +64,9 @@ public struct Ciphertext<Scheme: HeScheme, Format: PolyFormat>: Equatable, Senda
     /// ```
     /// - seelaso: ``Ciphertext/isTransparent()``
     @inlinable
-    public static func zero(context: Context<Scheme>, moduliCount: Int? = nil) throws -> Ciphertext<Scheme, Format> {
+    public static func zero(context: Context<Scheme.Scalar>,
+                            moduliCount: Int? = nil) throws -> Ciphertext<Scheme, Format>
+    {
         try Scheme.zero(context: context, moduliCount: moduliCount)
     }