Avoid Scheme argument in processShard

Author: fboemer

Sources/PIRProcessDatabase/main.swift

@@ -405,7 +405,7 @@ struct ProcessDatabase: AsyncParsableCommand {
                             shard: shard,
                             config: config,
                             context: context,
-                            processArgs: processArgs, scheme: scheme.self)
+                            processArgs: processArgs)
                     }
                 }
 
@@ -419,7 +419,7 @@ struct ProcessDatabase: AsyncParsableCommand {
                     shardID: shardID,
                     shard: shard, config:
                     config, context: context,
-                    processArgs: processArgs, scheme: scheme.self)
+                    processArgs: processArgs)
                 evaluationKeyConfig = [evaluationKeyConfig, processedEvaluationKeyConfig].union()
             }
         }
@@ -433,15 +433,16 @@ struct ProcessDatabase: AsyncParsableCommand {
         }
     }
 
-    // swiftlint:disable:next function_parameter_count
-    private func processShard<Scheme: HeScheme>(
+    private func processShard<Context: HeContext>(
         shardID: String,
         shard: KeywordDatabaseShard,
         config: ResolvedArguments,
-        context: Scheme.Context,
-        processArgs: ProcessKeywordDatabase.Arguments<Scheme.Scalar>,
-        scheme _: Scheme.Type) async throws -> EvaluationKeyConfig
+        context: Context,
+        processArgs: ProcessKeywordDatabase.Arguments<Context.Scalar>) async throws -> EvaluationKeyConfig
+        where Context.Scheme.Context == Context
     {
+        typealias Scheme = Context.Scheme
+
         var logger = ProcessDatabase.logger
         logger[metadataKey: "shardID"] = .string(shardID)
 

Sources/TestUtilities/HeApiTestUtils.swift

@@ -127,28 +127,6 @@ public enum HeAPITestHelpers {
             securityLevel: SecurityLevel.unchecked))
     }
 
-    /// test the evaluation key configuration
-    public static func schemeEvaluationKeyTest(scheme _: (some HeScheme).Type) throws {
-        do {
-            let config = EvaluationKeyConfig()
-            #expect(!config.hasRelinearizationKey)
-            #expect(config.galoisElements.isEmpty)
-            #expect(config.keyCount == 0)
-        }
-        do {
-            let config = EvaluationKeyConfig(hasRelinearizationKey: true)
-            #expect(config.hasRelinearizationKey)
-            #expect(config.galoisElements.isEmpty)
-            #expect(config.keyCount == 1)
-        }
-        do {
-            let config = EvaluationKeyConfig(galoisElements: [1, 3], hasRelinearizationKey: true)
-            #expect(config.hasRelinearizationKey)
-            #expect(config.galoisElements == [1, 3])
-            #expect(config.keyCount == 3)
-        }
-    }
-
     @inlinable
     static func encodingTest<Context: HeContext>(
         context: Context,

Sources/TestUtilities/PirUtilities/ExpansionTests.swift

@@ -84,7 +84,7 @@ extension PirTestUtils {
             for inputCount in 1...degree {
                 let data: [Scheme.Scalar] = (0..<inputCount).map { _ in Scheme.Scalar(Int.random(in: 0...1)) }
                 let nonZeroInputs = data.enumerated().compactMap { $0.element == 0 ? nil : $0.offset }
-                let plaintext: Plaintext<Scheme, Coeff> = try PirUtil.compressInputsForOneCiphertext(
+                let plaintext = try PirUtil<Scheme>.compressInputsForOneCiphertext(
                     totalInputCount: inputCount,
                     nonZeroInputs: nonZeroInputs,
                     context: context)

Sources/TestUtilities/PirUtilities/KeywordPirTests.swift

@@ -61,7 +61,7 @@ extension PirTestUtils {
                                                                     with: testContext)
             #expect(processed.pirParameter.dimensions.product() > 1, "trivial PIR")
 
-            let server = try KeywordPirServer<PirServer>( context: testContext, processed: processed)
+            let server = try KeywordPirServer<PirServer>(context: testContext, processed: processed)
             let client = KeywordPirClient<PirClient>(
                 keywordParameter: keywordConfig.parameter, pirParameter: processed.pirParameter,
                 context: testContext)

Sources/TestUtilities/PnnsUtilities/PlaintextMatrixTests.swift

@@ -43,7 +43,7 @@ extension PrivateNearestNeighborSearchUtil {
                 let values = TestUtils.getRandomPlaintextData(
                     count: encryptionParameters.polyDegree,
                     in: 0..<encryptionParameters.plaintextModulus)
-                let plaintext = try context.encode( values: values, format: EncodeFormat.coefficient)
+                let plaintext = try context.encode(values: values, format: EncodeFormat.coefficient)
                 #expect(throws: Never.self) { try PlaintextMatrix<Scheme, Coeff>(
                     dimensions: dims,
                     packing: packing,

Tests/HomomorphicEncryptionTests/HeAPITests.swift

@@ -105,7 +105,6 @@ struct HeAPITests {
         try await HeAPITestHelpers.schemeCiphertextNegateTest(context: context)
         try await HeAPITestHelpers.schemeCiphertextPlaintextInnerProductTest(context: context)
         try await HeAPITestHelpers.schemeCiphertextCiphertextInnerProductTest(context: context)
-        try HeAPITestHelpers.schemeEvaluationKeyTest(scheme: NoOpScheme.self)
         try await HeAPITestHelpers.schemeRotationTest(context: context)
         try await HeAPITestHelpers.schemeApplyGaloisTest(context: context)
         try await HeAPITestHelpers.repeatedAdditionTest(context: context)
@@ -184,7 +183,6 @@ struct HeAPITests {
             try await HeAPITestHelpers.schemeCiphertextNegateTest(context: context)
             try await HeAPITestHelpers.schemeCiphertextPlaintextInnerProductTest(context: context)
             try await HeAPITestHelpers.schemeCiphertextCiphertextInnerProductTest(context: context)
-            try HeAPITestHelpers.schemeEvaluationKeyTest(scheme: Bfv<T>.self)
             try await HeAPITestHelpers.schemeRotationTest(context: context)
             try await HeAPITestHelpers.schemeApplyGaloisTest(context: context)
             try bfvTestKeySwitching(context: context)
@@ -203,6 +201,28 @@ struct HeAPITests {
     func testBfvUInt64() async throws {
         try await runBfvTests(UInt64.self)
     }
+
+    @Test
+    func schemeEvaluationKeyTest() throws {
+        do {
+            let config = EvaluationKeyConfig()
+            #expect(!config.hasRelinearizationKey)
+            #expect(config.galoisElements.isEmpty)
+            #expect(config.keyCount == 0)
+        }
+        do {
+            let config = EvaluationKeyConfig(hasRelinearizationKey: true)
+            #expect(config.hasRelinearizationKey)
+            #expect(config.galoisElements.isEmpty)
+            #expect(config.keyCount == 1)
+        }
+        do {
+            let config = EvaluationKeyConfig(galoisElements: [1, 3], hasRelinearizationKey: true)
+            #expect(config.hasRelinearizationKey)
+            #expect(config.galoisElements == [1, 3])
+            #expect(config.keyCount == 3)
+        }
+    }
 }
 
 /// This will compile if `Plaintext/decode` is generic across PolyFormat.