fix: Rename ctKeySwitch

sp301415 · Sep 23, 2024 · 9257b27 · 9257b27
1 parent 7600bc6
commit 9257b27
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/mktfhe/bootstrap.go b/mktfhe/bootstrap.go
@@ -30,8 +30,8 @@ func (e *Evaluator[T]) BootstrapLUT(ct LWECiphertext[T], lut tfhe.LookUpTable[T]
 func (e *Evaluator[T]) BootstrapLUTAssign(ct LWECiphertext[T], lut tfhe.LookUpTable[T], ctOut LWECiphertext[T]) {
 	switch e.Parameters.BootstrapOrder() {
 	case tfhe.OrderKeySwitchBlindRotate:
-		e.KeySwitchForBootstrapAssign(ct, e.buffer.ctKeySwitch)
-		e.BlindRotateAssign(e.buffer.ctKeySwitch, lut, e.buffer.ctRotate)
+		e.KeySwitchForBootstrapAssign(ct, e.buffer.ctKeySwitchForBootstrap)
+		e.BlindRotateAssign(e.buffer.ctKeySwitchForBootstrap, lut, e.buffer.ctRotate)
 		e.buffer.ctRotate.ToLWECiphertextAssign(0, ctOut)
 	case tfhe.OrderBlindRotateKeySwitch:
 		e.BlindRotateAssign(ct, lut, e.buffer.ctRotate)
@@ -63,8 +63,8 @@ func (e *Evaluator[T]) BootstrapLUTParallel(ct LWECiphertext[T], lut tfhe.LookUp
 func (e *Evaluator[T]) BootstrapLUTParallelAssign(ct LWECiphertext[T], lut tfhe.LookUpTable[T], ctOut LWECiphertext[T]) {
 	switch e.Parameters.BootstrapOrder() {
 	case tfhe.OrderKeySwitchBlindRotate:
-		e.KeySwitchForBootstrapAssign(ct, e.buffer.ctKeySwitch)
-		e.BlindRotateParallelAssign(e.buffer.ctKeySwitch, lut, e.buffer.ctRotate)
+		e.KeySwitchForBootstrapAssign(ct, e.buffer.ctKeySwitchForBootstrap)
+		e.BlindRotateParallelAssign(e.buffer.ctKeySwitchForBootstrap, lut, e.buffer.ctRotate)
 		e.buffer.ctRotate.ToLWECiphertextAssign(0, ctOut)
 	case tfhe.OrderBlindRotateKeySwitch:
 		e.BlindRotateParallelAssign(ct, lut, e.buffer.ctRotate)

diff --git a/mktfhe/evaluator.go b/mktfhe/evaluator.go
@@ -71,8 +71,8 @@ type evaluationBuffer[T tfhe.TorusInt] struct {
 	ctRotate GLWECiphertext[T]
 	// ctExtract is the extracted LWE ciphertext after Blind Rotation.
 	ctExtract LWECiphertext[T]
-	// ctKeySwitch is the LWEDimension sized ciphertext from keyswitching.
-	ctKeySwitch LWECiphertext[T]
+	// ctKeySwitchForBootstrap is the LWEDimension sized ciphertext from keyswitching for bootstrapping.
+	ctKeySwitchForBootstrap LWECiphertext[T]
 
 	// lut is an empty lut, used for BlindRotateFunc.
 	lut tfhe.LookUpTable[T]
@@ -156,9 +156,9 @@ func newEvaluationBuffer[T tfhe.TorusInt](params Parameters[T]) evaluationBuffer
 		ctAccs:         ctAccs,
 		ctFourierAccs:  ctFourierAccs,
 
-		ctRotate:    NewGLWECiphertext(params),
-		ctExtract:   NewLWECiphertextCustom[T](params.GLWEDimension()),
-		ctKeySwitch: NewLWECiphertextCustom[T](params.LWEDimension()),
+		ctRotate:                NewGLWECiphertext(params),
+		ctExtract:               NewLWECiphertextCustom[T](params.GLWEDimension()),
+		ctKeySwitchForBootstrap: NewLWECiphertextCustom[T](params.LWEDimension()),
 
 		lut: tfhe.NewLookUpTable(params.Parameters),
 	}

diff --git a/tfhe/bootstrap.go b/tfhe/bootstrap.go
@@ -29,8 +29,8 @@ func (e *Evaluator[T]) BootstrapLUT(ct LWECiphertext[T], lut LookUpTable[T]) LWE
 func (e *Evaluator[T]) BootstrapLUTAssign(ct LWECiphertext[T], lut LookUpTable[T], ctOut LWECiphertext[T]) {
 	switch e.Parameters.bootstrapOrder {
 	case OrderKeySwitchBlindRotate:
-		e.KeySwitchForBootstrapAssign(ct, e.buffer.ctKeySwitchBootstrap)
-		e.BlindRotateAssign(e.buffer.ctKeySwitchBootstrap, lut, e.buffer.ctRotate)
+		e.KeySwitchForBootstrapAssign(ct, e.buffer.ctKeySwitchForBootstrap)
+		e.BlindRotateAssign(e.buffer.ctKeySwitchForBootstrap, lut, e.buffer.ctRotate)
 		e.buffer.ctRotate.ToLWECiphertextAssign(0, ctOut)
 	case OrderBlindRotateKeySwitch:
 		e.BlindRotateAssign(ct, lut, e.buffer.ctRotate)

diff --git a/tfhe/evaluator.go b/tfhe/evaluator.go
@@ -67,8 +67,8 @@ type evaluationBuffer[T TorusInt] struct {
 	ctRotate GLWECiphertext[T]
 	// ctExtract is the extracted LWE ciphertext after Blind Rotation.
 	ctExtract LWECiphertext[T]
-	// ctKeySwitchBootstrap is the LWEDimension sized ciphertext from keyswitching for bootstrapping.
-	ctKeySwitchBootstrap LWECiphertext[T]
+	// ctKeySwitchForBootstrap is the LWEDimension sized ciphertext from keyswitching for bootstrapping.
+	ctKeySwitchForBootstrap LWECiphertext[T]
 
 	// lut is an empty lut, used for BlindRotateFunc.
 	lut LookUpTable[T]
@@ -141,9 +141,9 @@ func newEvaluationBuffer[T TorusInt](params Parameters[T]) evaluationBuffer[T] {
 		ctAccFourierDecomposed: ctAccFourierDecomposed,
 		fMono:                  poly.NewFourierPoly(params.polyDegree),
 
-		ctRotate:             NewGLWECiphertext(params),
-		ctExtract:            NewLWECiphertextCustom[T](params.glweDimension),
-		ctKeySwitchBootstrap: NewLWECiphertextCustom[T](params.lweDimension),
+		ctRotate:                NewGLWECiphertext(params),
+		ctExtract:               NewLWECiphertextCustom[T](params.glweDimension),
+		ctKeySwitchForBootstrap: NewLWECiphertextCustom[T](params.lweDimension),
 
 		lut: NewLookUpTable(params),
 	}