Rename variables

Author: wvanlint

src/headers/lnurl_auth_jwt.rs

@@ -57,7 +57,7 @@ pub struct LnurlAuthJwt {
 	url: String,
 	default_headers: HashMap<String, String>,
 	client: reqwest::Client,
-	jwt_token: RwLock<Option<JwtToken>>,
+	cached_jwt_token: RwLock<Option<JwtToken>>,
 }
 
 impl LnurlAuthJwt {
@@ -85,7 +85,7 @@ impl LnurlAuthJwt {
 			.build()
 			.map_err(VssHeaderProviderError::from)?;
 
-		Ok(LnurlAuthJwt { engine, parent_key, url, default_headers, client, jwt_token: RwLock::new(None) })
+		Ok(LnurlAuthJwt { engine, parent_key, url, default_headers, client, cached_jwt_token: RwLock::new(None) })
 	}
 
 	async fn fetch_jwt_token(&self) -> Result<JwtToken, VssHeaderProviderError> {
@@ -132,14 +132,14 @@ impl LnurlAuthJwt {
 		let cached_token_str = if force_refresh {
 			None
 		} else {
-			let jwt_token = self.jwt_token.read().unwrap();
+			let jwt_token = self.cached_jwt_token.read().unwrap();
 			jwt_token.as_ref().filter(|t| !t.is_expired()).map(|t| t.token_str.clone())
 		};
 		if let Some(token_str) = cached_token_str {
 			Ok(token_str)
 		} else {
 			let jwt_token = self.fetch_jwt_token().await?;
-			*self.jwt_token.write().unwrap() = Some(jwt_token.clone());
+			*self.cached_jwt_token.write().unwrap() = Some(jwt_token.clone());
 			Ok(jwt_token.token_str)
 		}
 	}
@@ -190,23 +190,23 @@ fn sign_lnurl(
 		.to_string();
 	let k1: [u8; 32] = FromHex::from_hex(&k1_str).map_err(|_| invalid_lnurl())?;
 
-	// Sign k1 parameter with linking key.
-	let hashing_key = hashing_key(engine, parent_key)?;
-	let linking_key_path = linking_key_path(&hashing_key, domain)?;
-	let private_key = parent_key
+	// Sign k1 parameter with linking private key.
+	let hashing_private_key = hashing_key(engine, parent_key)?;
+	let linking_key_path = linking_key_path(&hashing_private_key, domain)?;
+	let linking_private_key = parent_key
 		.derive_priv(engine, &linking_key_path)
 		.map_err(VssHeaderProviderError::from)?
 		.to_priv();
-	let public_key = private_key.public_key(engine);
+	let linking_public_key = linking_private_key.public_key(engine);
 	let message = Message::from_slice(&k1)
 		.map_err(|_| VssHeaderProviderError::InvalidData { error: format!("invalid k1: {:?}", k1) })?;
-	let sig = engine.sign_ecdsa(&message, &private_key.inner);
+	let sig = engine.sign_ecdsa(&message, &linking_private_key.inner);
 
-	// Compose LNURL with signature and linking key.
+	// Compose LNURL with signature and linking public key.
 	lnurl
 		.query_pairs_mut()
 		.append_pair(SIG_QUERY_PARAM, &sig.serialize_der().to_string())
-		.append_pair(KEY_QUERY_PARAM, &public_key.to_string());
+		.append_pair(KEY_QUERY_PARAM, &linking_public_key.to_string());
 	Ok(lnurl.to_string())
 }