sq: Rename --signer-cert, etc. to --signer-file

  - Rename `--recipient-cert` to `--recipient-file`, `--signer-cert`
    to `--signer-file`, and `--certificate` to `--certificate-file`.

  - This rename makes it clearer that the argument is a file
    containing a certificate.

  - See #933.

2 files changed, 24 insertions, 24 deletions

diff --git a/sq/tests/sq-revoke.rs b/sq/tests/sq-revoke.rs
index 7ea5c7c4..55d255a0 100644
--- a/sq/tests/sq-revoke.rs
+++ b/sq/tests/sq-revoke.rs
@@ -162,7 +162,7 @@ mod integration {
                 Some(dir)
             },
             (true, false) => { // third_party && ! stdin
-                // sq revoke --certificate cert --revocation-file third-party
+                // sq revoke --cert-file cert --revocation-file third-party
                 let dir = TempDir::new()?;
 
                 let cert_pgp = dir.path().join("cert.pgp");
@@ -170,7 +170,7 @@ mod integration {
                 file.write_all(&cert)?;
 
                 cmd.args([
-                    "--certificate",
+                    "--cert-file",
                     &*cert_pgp.to_string_lossy()
                 ]);
 
@@ -192,7 +192,7 @@ mod integration {
                 None
             },
             (false, false) => { // ! third_party && ! stdin
-                // sq revoke --certificate key
+                // sq revoke --cert-file key
                 let dir = TempDir::new()?;
 
                 let key_pgp = dir.path().join("key.pgp");
@@ -200,7 +200,7 @@ mod integration {
                 file.write_all(&revoker)?;
 
                 cmd.args([
-                    "--certificate",
+                    "--cert-file",
                     &*key_pgp.to_string_lossy()
                 ]);
 
diff --git a/sq/tests/sq-sign.rs b/sq/tests/sq-sign.rs
index 0d61e341..a6f08291 100644
--- a/sq/tests/sq-sign.rs
+++ b/sq/tests/sq-sign.rs
@@ -69,7 +69,7 @@ fn sq_sign() {
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/dennis-simon-anton.pgp")])
+        .args(["--signer-file", &artifact("keys/dennis-simon-anton.pgp")])
         .arg(&*sig.to_string_lossy())
         .assert()
         .success();
@@ -147,7 +147,7 @@ fn sq_sign_with_notations() {
         .unwrap()
         .args(["--known-notation", "foo"])
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/dennis-simon-anton.pgp")])
+        .args(["--signer-file", &artifact("keys/dennis-simon-anton.pgp")])
         .arg(&*sig.to_string_lossy())
         .assert()
         .success();
@@ -196,7 +196,7 @@ fn sq_sign_append() {
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/dennis-simon-anton.pgp")])
+        .args(["--signer-file", &artifact("keys/dennis-simon-anton.pgp")])
         .arg(&*sig0.to_string_lossy())
         .assert()
         .success();
@@ -255,14 +255,14 @@ fn sq_sign_append() {
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/dennis-simon-anton.pgp")])
+        .args(["--signer-file", &artifact("keys/dennis-simon-anton.pgp")])
         .arg(&*sig1.to_string_lossy())
         .assert()
         .success();
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/erika-corinna-daniela-simone-antonia-nistp256.pgp")])
+        .args(["--signer-file", &artifact("keys/erika-corinna-daniela-simone-antonia-nistp256.pgp")])
         .arg(&*sig1.to_string_lossy())
         .assert()
         .success();
@@ -323,7 +323,7 @@ fn sq_sign_append_on_compress_then_sign() {
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/dennis-simon-anton.pgp")])
+        .args(["--signer-file", &artifact("keys/dennis-simon-anton.pgp")])
         .arg(&*sig0.to_string_lossy())
         .assert()
         .success();
@@ -385,7 +385,7 @@ fn sq_sign_append_on_compress_then_sign() {
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/dennis-simon-anton.pgp")])
+        .args(["--signer-file", &artifact("keys/dennis-simon-anton.pgp")])
         .arg(&*sig0.to_string_lossy())
         .assert()
         .success();
@@ -393,7 +393,7 @@ fn sq_sign_append_on_compress_then_sign() {
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/erika-corinna-daniela-simone-antonia-nistp256.pgp")])
+        .args(["--signer-file", &artifact("keys/erika-corinna-daniela-simone-antonia-nistp256.pgp")])
         .arg(&*sig0.to_string_lossy())
         .assert()
         .success();
@@ -432,7 +432,7 @@ fn sq_sign_detached() {
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/dennis-simon-anton.pgp")])
+        .args(["--signer-file", &artifact("keys/dennis-simon-anton.pgp")])
         .args(["--detached", &sig.to_string_lossy()])
         .arg(&artifact("messages/a-cypherpunks-manifesto.txt"))
         .assert()
@@ -472,7 +472,7 @@ fn sq_sign_detached_append() {
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/dennis-simon-anton.pgp")])
+        .args(["--signer-file", &artifact("keys/dennis-simon-anton.pgp")])
         .args(["--detached", &sig.to_string_lossy()])
         .arg(&artifact("messages/a-cypherpunks-manifesto.txt"))
         .assert()
@@ -523,7 +523,7 @@ fn sq_sign_detached_append() {
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/dennis-simon-anton.pgp")])
+        .args(["--signer-file", &artifact("keys/dennis-simon-anton.pgp")])
         .args(["--detached", &sig.to_string_lossy()])
         .arg(&artifact("messages/a-cypherpunks-manifesto.txt"))
         .assert()
@@ -532,7 +532,7 @@ fn sq_sign_detached_append() {
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/erika-corinna-daniela-simone-antonia-nistp256.pgp")])
+        .args(["--signer-file", &artifact("keys/erika-corinna-daniela-simone-antonia-nistp256.pgp")])
         .args(["--detached", &sig.to_string_lossy()])
         .arg(&artifact("messages/a-cypherpunks-manifesto.txt"))
         .assert()
@@ -639,21 +639,21 @@ fn sq_sign_append_a_notarization() {
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/neal.pgp")])
+        .args(["--signer-file", &artifact("keys/neal.pgp")])
         .arg(&*sig0.to_string_lossy())
         .assert()
         .success();
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/emmelie-dorothea-dina-samantha-awina-ed25519.pgp")])
+        .args(["--signer-file", &artifact("keys/emmelie-dorothea-dina-samantha-awina-ed25519.pgp")])
         .arg(&*sig0.to_string_lossy())
         .assert()
         .success();
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/erika-corinna-daniela-simone-antonia-nistp256.pgp")])
+        .args(["--signer-file", &artifact("keys/erika-corinna-daniela-simone-antonia-nistp256.pgp")])
         .arg(&*sig0.to_string_lossy())
         .assert()
         .success();
@@ -716,14 +716,14 @@ fn sq_sign_notarize() {
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/neal.pgp")])
+        .args(["--signer-file", &artifact("keys/neal.pgp")])
         .arg(&*sig0.to_string_lossy())
         .assert()
         .success();
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/erika-corinna-daniela-simone-antonia-nistp256.pgp")])
+        .args(["--signer-file", &artifact("keys/erika-corinna-daniela-simone-antonia-nistp256.pgp")])
         .arg(&*sig0.to_string_lossy())
         .assert()
         .success();
@@ -798,21 +798,21 @@ fn sq_sign_notarize_a_notarization() {
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/neal.pgp")])
+        .args(["--signer-file", &artifact("keys/neal.pgp")])
         .arg(&*sig0.to_string_lossy())
         .assert()
         .success();
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/emmelie-dorothea-dina-samantha-awina-ed25519.pgp")])
+        .args(["--signer-file", &artifact("keys/emmelie-dorothea-dina-samantha-awina-ed25519.pgp")])
         .arg(&*sig0.to_string_lossy())
         .assert()
         .success();
     Command::cargo_bin("sq")
         .unwrap()
         .arg("verify")
-        .args(["--signer-cert", &artifact("keys/erika-corinna-daniela-simone-antonia-nistp256.pgp")])
+        .args(["--signer-file", &artifact("keys/erika-corinna-daniela-simone-antonia-nistp256.pgp")])
         .arg(&*sig0.to_string_lossy())
         .assert()
         .success();