Use --private for reader-privacy (#143)

Author: gammazero

pkg/find/find.go

@@ -46,15 +46,15 @@ var findFlags = []cli.Flag{
 	},
 	&cli.StringFlag{
 		Name:    "dhstore",
-		Usage:   "URL of double-hashed (reader-private) store, if different from indexer - assumes --priv.",
+		Usage:   "URL of double-hashed (reader-private) store, if different from indexer - assumes --private.",
 		Aliases: []string{"dhs"},
 	},
 	&cli.BoolFlag{
 		Name:  "id-only",
 		Usage: "Only show provider's peer ID from each result",
 	},
 	&cli.BoolFlag{
-		Name:  "priv",
+		Name:  "private",
 		Usage: "Use reader-privacy for queries",
 	},
 	&cli.BoolFlag{
@@ -65,15 +65,15 @@ var findFlags = []cli.Flag{
 
 func beforeFind(ctx context.Context, cmd *cli.Command) (context.Context, error) {
 	if len(cmd.StringSlice("indexer")) == 0 {
-		if !cmd.Bool("priv") {
+		if !cmd.Bool("private") {
 			return ctx, cli.Exit("missing value for --indexer", 1)
 		}
 		if cmd.String("dhstore") == "" {
 			return ctx, cli.Exit("missing value for --dhstore and --indexer", 1)
 		}
 	}
 	if cmd.String("dhstore") != "" {
-		cmd.Set("priv", "true")
+		cmd.Set("private", "true")
 	}
 
 	return ctx, nil
@@ -102,7 +102,7 @@ func findAction(ctx context.Context, cmd *cli.Command) error {
 		mhs = append(mhs, c.Hash())
 	}
 
-	if cmd.Bool("priv") {
+	if cmd.Bool("private") {
 		return dhFind(ctx, cmd, mhs)
 	}
 	return clearFind(ctx, cmd, mhs)

pkg/verify/ingest.go

@@ -190,14 +190,14 @@ var verifyIngestFlags = []cli.Flag{
 		Destination: &printUnindexedMhs,
 	},
 	&cli.BoolFlag{
-		Name:  "no-priv",
-		Usage: "Do no use reader-privacy for queries. If --dhstore also specified, use in place of --indexer",
+		Name:  "private",
+		Usage: "Use reader-privacy for queries.",
 	},
 }
 
 func beforeVerifyIngest(ctx context.Context, cmd *cli.Command) (context.Context, error) {
 	if len(cmd.StringSlice("indexer")) == 0 {
-		if cmd.Bool("no-priv") {
+		if !cmd.Bool("private") {
 			return ctx, cli.Exit("missing value for --indexer", 1)
 		}
 		if cmd.String("dhstore") == "" {
@@ -284,7 +284,18 @@ func verifyIngestFromProvider(ctx context.Context, cmd *cli.Command, provID peer
 	var clearFind *client.Client
 	var provCache *pcache.ProviderCache
 	var err error
-	if cmd.Bool("no-priv") {
+
+	if cmd.Bool("private") {
+		dhFind, err = client.NewDHashClient(
+			client.WithProvidersURL(cmd.StringSlice("indexer")...),
+			client.WithDHStoreURL(cmd.String("dhstore")),
+			client.WithPcacheTTL(0),
+		)
+		if err != nil {
+			return err
+		}
+		provCache = dhFind.PCache()
+	} else {
 		idxr := cmd.String("dhstore")
 		if idxr == "" {
 			idxr = cmd.StringSlice("indexer")[0]
@@ -298,16 +309,6 @@ func verifyIngestFromProvider(ctx context.Context, cmd *cli.Command, provID peer
 		if err != nil {
 			return err
 		}
-	} else {
-		dhFind, err = client.NewDHashClient(
-			client.WithProvidersURL(cmd.StringSlice("indexer")...),
-			client.WithDHStoreURL(cmd.String("dhstore")),
-			client.WithPcacheTTL(0),
-		)
-		if err != nil {
-			return err
-		}
-		provCache = dhFind.PCache()
 	}
 
 	// Get publisher address, for specified provider, from indexer.
@@ -430,16 +431,7 @@ func verifyIngestFromCar(ctx context.Context, cmd *cli.Command, provID peer.ID,
 
 	var dhFind *client.DHashClient
 	var clearFind *client.Client
-	if cmd.Bool("no-priv") {
-		idxr := cmd.String("dhstore")
-		if idxr == "" {
-			idxr = cmd.StringSlice("indexer")[0]
-		}
-		clearFind, err = client.New(idxr)
-		if err != nil {
-			return err
-		}
-	} else {
+	if cmd.Bool("private") {
 		dhFind, err = client.NewDHashClient(
 			client.WithProvidersURL(cmd.StringSlice("indexer")...),
 			client.WithDHStoreURL(cmd.String("dhstore")),
@@ -448,6 +440,15 @@ func verifyIngestFromCar(ctx context.Context, cmd *cli.Command, provID peer.ID,
 		if err != nil {
 			return err
 		}
+	} else {
+		idxr := cmd.String("dhstore")
+		if idxr == "" {
+			idxr = cmd.StringSlice("indexer")[0]
+		}
+		clearFind, err = client.New(idxr)
+		if err != nil {
+			return err
+		}
 	}
 
 	result, err := verifyIngestFromCarIterableIndex(ctx, cmd, clearFind, dhFind, provID, idx)
@@ -515,16 +516,7 @@ func verifyIngestFromCarIndex(ctx context.Context, cmd *cli.Command, provID peer
 
 	var dhFind *client.DHashClient
 	var clearFind *client.Client
-	if cmd.Bool("no-priv") {
-		idxr := cmd.String("dhstore")
-		if idxr == "" {
-			idxr = cmd.StringSlice("indexer")[0]
-		}
-		clearFind, err = client.New(idxr)
-		if err != nil {
-			return err
-		}
-	} else {
+	if cmd.Bool("private") {
 		dhFind, err = client.NewDHashClient(
 			client.WithProvidersURL(cmd.StringSlice("indexer")...),
 			client.WithDHStoreURL(cmd.String("dhstore")),
@@ -533,6 +525,15 @@ func verifyIngestFromCarIndex(ctx context.Context, cmd *cli.Command, provID peer
 		if err != nil {
 			return err
 		}
+	} else {
+		idxr := cmd.String("dhstore")
+		if idxr == "" {
+			idxr = cmd.StringSlice("indexer")[0]
+		}
+		clearFind, err = client.New(idxr)
+		if err != nil {
+			return err
+		}
 	}
 
 	result, err := verifyIngestFromCarIterableIndex(ctx, cmd, clearFind, dhFind, provID, iterIdx)