Rename keypair -> secret

sparkle-project · Nov 21, 2023 · 645f446 · 645f446
1 parent d10da5e
commit 645f446
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/generate_keys/main.swift b/generate_keys/main.swift
@@ -89,7 +89,7 @@ func findSecret(account: String) -> Data? {
     exit(1)
 }
 
-func generateKeyPair() -> (publicEdKey: Data, seed: Data) {
+func generatePublicKeyAndSeed() -> (publicEdKey: Data, seed: Data) {
     var seed = Array<UInt8>(repeating: 0, count: 32)
     var publicEdKey = Array<UInt8>(repeating: 0, count: 32)
     var privateEdKey = Array<UInt8>(repeating: 0, count: 64)
@@ -270,7 +270,7 @@ struct GenerateKeys: ParsableCommand {
             } else {
                 print("Generating a new signing key. This may take a moment, depending on your machine.")
 
-                let (pubKey, seed) = generateKeyPair()
+                let (pubKey, seed) = generatePublicKeyAndSeed()
                 // New keys that are generated only store the seed as the secret
                 // Old keys store private orlp/Ed25519 key + public key
                 storeSecret(account: account, publicEdKey: pubKey, secret: seed)

diff --git a/sign_update/main.swift b/sign_update/main.swift
@@ -51,19 +51,19 @@ func findKeysInKeychain(account: String) throws -> (Data, Data) {
     throw ExitCode.failure
 }
 
-func findKeys(inFile keyPairFile: String) throws -> (Data, Data) {
-    let keyPair: String
-    if keyPairFile == "-" && !FileManager.default.fileExists(atPath: keyPairFile) {
+func findKeys(inFile secretFile: String) throws -> (Data, Data) {
+    let secretString: String
+    if secretFile == "-" && !FileManager.default.fileExists(atPath: secretFile) {
         if let line = readLine(strippingNewline: true) {
-            keyPair = line
+            secretString = line
         } else {
             print("ERROR! Unable to read EdDSA private key from standard input")
             throw ExitCode(1)
         }
     } else {
-        keyPair = try String(contentsOfFile: keyPairFile)
+        secretString = try String(contentsOfFile: secretFile)
     }
-    return try findKeys(inString: keyPair, allowNewFormat: true)
+    return try findKeys(inString: secretString, allowNewFormat: true)
 }
 
 func findKeys(inString secretBase64String: String, allowNewFormat: Bool) throws -> (Data, Data) {