Minor code improvements

reconhub · Sep 28, 2018 · 70f296c · 70f296c
1 parent 7436834
commit 70f296c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/R/hash_names.R b/R/hash_names.R
@@ -60,7 +60,7 @@ hash_names <- function(..., size = 6, full = TRUE, salt = NULL) {
 
 
   ## hash it all
-  hash <- vapply(lab, hmac(salt), NA_character_)
+  hash <- vapply(lab, hash(salt), NA_character_)
   hash_short <- substr(hash, 1, size)
 
   if (full) {
@@ -76,12 +76,12 @@ hash_names <- function(..., size = 6, full = TRUE, salt = NULL) {
   return(out)
 }
 
-hmac <- function(salt = NULL) {
+hash <- function(salt = NULL) {
   stopifnot(is.null(salt) || length(salt) == 1L)
-  if (!is.null(salt)) {
-    salt <- sodium::hash(charToRaw(as.character(salt)))
-  } else {
+  if (is.null(salt)) {
     salt <- raw(32L)
+  } else {
+    salt <- sodium::hash(charToRaw(as.character(salt)))
   }
   function(x) {
     stopifnot(is.character(x))