Polish

internal/encryption/event.go

@@ -60,10 +60,10 @@ func NewRequestKeysMessage(
 // NewKeysRetrievedMessage creates a new event message for a key that was retrieved
 func NewKeysRetrievedMessage(
 	schemaRoot string,
-	data map[core.EncStoreDocKey][]byte,
+	keys map[core.EncStoreDocKey][]byte,
 ) event.Message {
 	return event.NewMessage(KeysRetrievedEventName, KeyRetrievedEvent{
 		SchemaRoot: schemaRoot,
-		Keys:       data,
+		Keys:       keys,
 	})
 }

net/pb/Makefile

@@ -25,4 +25,4 @@ clean:
 	rm -f *.pb.go
 	rm -f *pb_test.go
 
-.PHONY: clean deps debug
+.PHONY: clean deps 

net/server_encryption_key.go

@@ -36,14 +36,14 @@ import (
 
 const encryptionTopic = "encryption"
 
-// Server is the request/response instance for all P2P RPC communication.
-// Implements gRPC server. See net/pb/net.proto for corresponding service definitions.
+// getEncryptionKeys retrieves the encryption keys for the given targets.
+// It returns the encryption keys and the targets for which the keys were found.
 func (s *server) getEncryptionKeys(
 	ctx context.Context,
 	req *pb.FetchEncryptionKeyRequest,
 ) ([]byte, []*pb.EncryptionKeyTarget, error) {
 	encryptionKeys := make([]byte, 0)
-	targets := make([]*pb.EncryptionKeyTarget, 0)
+	targets := make([]*pb.EncryptionKeyTarget, 0, len(req.Targets))
 	for _, target := range req.Targets {
 		docID, err := client.NewDocIDFromString(string(target.DocID))
 		if err != nil {

tests/integration/encryption/peer_test.go

@@ -18,43 +18,6 @@ import (
 	testUtils "github.com/sourcenetwork/defradb/tests/integration"
 )
 
-/*func TestDocEncryptionPeer_IfPeerHasNoKey_ShouldNotFetch(t *testing.T) {
-	test := testUtils.TestCase{
-		Actions: []any{
-			testUtils.RandomNetworkingConfig(),
-			testUtils.RandomNetworkingConfig(),
-			updateUserCollectionSchema(),
-			testUtils.ConnectPeers{
-				SourceNodeID: 1,
-				TargetNodeID: 0,
-			},
-			testUtils.SubscribeToCollection{
-				NodeID:        1,
-				CollectionIDs: []int{0},
-			},
-			testUtils.CreateDoc{
-				NodeID:         immutable.Some(0),
-				Doc:            john21Doc,
-				IsDocEncrypted: true,
-			},
-			testUtils.WaitForSync{},
-			testUtils.Request{
-				NodeID: immutable.Some(1),
-				Request: `query {
-					Users {
-						age
-					}
-				}`,
-				Results: map[string]any{
-					"Users": []map[string]any{},
-				},
-			},
-		},
-	}
-
-	testUtils.ExecuteTestCase(t, test)
-}*/
-
 func TestDocEncryptionPeer_UponSync_ShouldSyncEncryptedDAG(t *testing.T) {
 	test := testUtils.TestCase{
 		Actions: []any{