firewalldb: thread context to RealToPseudo

Update the RealToPseudo method of the PrivacyMapTx interface to take a
context.

Author: ellemouton

firewall/privacy_mapper_test.go

@@ -1140,7 +1140,9 @@ func (m *mockPrivacyMapDB) PseudoToReal(_ context.Context, pseudo string) (
 	return r, nil
 }
 
-func (m *mockPrivacyMapDB) RealToPseudo(real string) (string, error) {
+func (m *mockPrivacyMapDB) RealToPseudo(_ context.Context, real string) (string,
+	error) {
+
 	p, ok := m.r2p[real]
 	if !ok {
 		return "", firewalldb.ErrNoSuchKeyFound

firewalldb/privacy_mapper.go

@@ -79,7 +79,7 @@ type PrivacyMapTx interface {
 
 	// RealToPseudo returns the pseudo value associated with the given real
 	// value. If no such pair is found, then ErrNoSuchKeyFound is returned.
-	RealToPseudo(real string) (string, error)
+	RealToPseudo(ctx context.Context, real string) (string, error)
 
 	// FetchAllPairs loads and returns the real-to-pseudo pairs in the form
 	// of a PrivacyMapPairs struct.
@@ -258,7 +258,9 @@ func (p *privacyMapTx) PseudoToReal(_ context.Context, pseudo string) (string,
 // it does then the pseudo value is returned, else an error is returned.
 //
 // NOTE: this is part of the PrivacyMapTx interface.
-func (p *privacyMapTx) RealToPseudo(real string) (string, error) {
+func (p *privacyMapTx) RealToPseudo(_ context.Context, real string) (string,
+	error) {
+
 	privacyBucket, err := getBucket(p.boltTx, privacyBucketKey)
 	if err != nil {
 		return "", err
@@ -319,7 +321,7 @@ func (p *privacyMapTx) FetchAllPairs() (*PrivacyMapPairs, error) {
 func HideString(ctx context.Context, tx PrivacyMapTx, real string) (string,
 	error) {
 
-	pseudo, err := tx.RealToPseudo(real)
+	pseudo, err := tx.RealToPseudo(ctx, real)
 	if err != nil && err != ErrNoSuchKeyFound {
 		return "", err
 	}
@@ -370,7 +372,7 @@ func HideUint64(ctx context.Context, tx PrivacyMapTx, real uint64) (uint64,
 	error) {
 
 	str := Uint64ToStr(real)
-	pseudo, err := tx.RealToPseudo(str)
+	pseudo, err := tx.RealToPseudo(ctx, str)
 	if err != nil && err != ErrNoSuchKeyFound {
 		return 0, err
 	}
@@ -405,7 +407,7 @@ func HideChanPoint(ctx context.Context, tx PrivacyMapTx, txid string,
 	index uint32) (string, uint32, error) {
 
 	cp := fmt.Sprintf("%s:%d", txid, index)
-	pseudo, err := tx.RealToPseudo(cp)
+	pseudo, err := tx.RealToPseudo(ctx, cp)
 	if err != nil && err != ErrNoSuchKeyFound {
 		return "", 0, err
 	}

firewalldb/privacy_mapper_test.go

@@ -23,7 +23,7 @@ func TestPrivacyMapStorage(t *testing.T) {
 	pdb1 := db.PrivacyDB([4]byte{1, 1, 1, 1})
 
 	_ = pdb1.Update(ctx, func(ctx context.Context, tx PrivacyMapTx) error {
-		_, err = tx.RealToPseudo("real")
+		_, err = tx.RealToPseudo(ctx, "real")
 		require.ErrorIs(t, err, ErrNoSuchKeyFound)
 
 		_, err = tx.PseudoToReal(ctx, "pseudo")
@@ -32,7 +32,7 @@ func TestPrivacyMapStorage(t *testing.T) {
 		err = tx.NewPair(ctx, "real", "pseudo")
 		require.NoError(t, err)
 
-		pseudo, err := tx.RealToPseudo("real")
+		pseudo, err := tx.RealToPseudo(ctx, "real")
 		require.NoError(t, err)
 		require.Equal(t, "pseudo", pseudo)
 
@@ -53,7 +53,7 @@ func TestPrivacyMapStorage(t *testing.T) {
 	pdb2 := db.PrivacyDB([4]byte{2, 2, 2, 2})
 
 	_ = pdb2.Update(ctx, func(ctx context.Context, tx PrivacyMapTx) error {
-		_, err = tx.RealToPseudo("real")
+		_, err = tx.RealToPseudo(ctx, "real")
 		require.ErrorIs(t, err, ErrNoSuchKeyFound)
 
 		_, err = tx.PseudoToReal(ctx, "pseudo")
@@ -62,7 +62,7 @@ func TestPrivacyMapStorage(t *testing.T) {
 		err = tx.NewPair(ctx, "real 2", "pseudo 2")
 		require.NoError(t, err)
 
-		pseudo, err := tx.RealToPseudo("real 2")
+		pseudo, err := tx.RealToPseudo(ctx, "real 2")
 		require.NoError(t, err)
 		require.Equal(t, "pseudo 2", pseudo)
 
@@ -206,7 +206,7 @@ func TestPrivacyMapTxs(t *testing.T) {
 			return err
 		}
 
-		p, err := tx.RealToPseudo("real")
+		p, err := tx.RealToPseudo(ctx, "real")
 		if err != nil {
 			return err
 		}
@@ -218,7 +218,7 @@ func TestPrivacyMapTxs(t *testing.T) {
 	require.Error(t, err)
 
 	err = pdb1.View(ctx, func(ctx context.Context, tx PrivacyMapTx) error {
-		_, err := tx.RealToPseudo("real")
+		_, err := tx.RealToPseudo(ctx, "real")
 		return err
 	})
 	require.ErrorIs(t, err, ErrNoSuchKeyFound)

session_rpcserver.go

@@ -634,7 +634,7 @@ func (s *sessionRpcServer) PrivacyMapConversion(ctx context.Context,
 
 		var err error
 		if req.RealToPseudo {
-			res, err = tx.RealToPseudo(req.Input)
+			res, err = tx.RealToPseudo(ctx, req.Input)
 			return err
 		}