From 4db1e0979836fddc0a2e72f001b9651332ec1c9c Mon Sep 17 00:00:00 2001
From: Asim Aslam <asim@aslam.me>
Date: Wed, 23 Oct 2019 23:12:45 +0100
Subject: [PATCH] change options to be trimmed down

---
 api/server/acme/certmagic/certmagic_test.go | 8 ++++----
 store/cloudflare/cloudflare_test.go         | 4 ++--
 store/cloudflare/options.go                 | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/api/server/acme/certmagic/certmagic_test.go b/api/server/acme/certmagic/certmagic_test.go
index 2ff44b83..1739f5f2 100644
--- a/api/server/acme/certmagic/certmagic_test.go
+++ b/api/server/acme/certmagic/certmagic_test.go
@@ -56,8 +56,8 @@ func TestStorageImplementation(t *testing.T) {
 
 	var s certmagic.Storage
 	st := cfstore.NewStore(
-		cfstore.ApiToken(apiToken),
-		cfstore.AccountID(accountID),
+		cfstore.Token(apiToken),
+		cfstore.Account(accountID),
 		cfstore.Namespace(kvID),
 	)
 	s = &storage{
@@ -193,8 +193,8 @@ func TestE2e(t *testing.T) {
 
 	testLock := memory.NewLock()
 	testStore := cfstore.NewStore(
-		cfstore.ApiToken(apiToken),
-		cfstore.AccountID(accountID),
+		cfstore.Token(apiToken),
+		cfstore.Account(accountID),
 		cfstore.Namespace(kvID),
 	)
 	testStorage := NewStorage(testLock, testStore)
diff --git a/store/cloudflare/cloudflare_test.go b/store/cloudflare/cloudflare_test.go
index dd2b1909..525eeecd 100644
--- a/store/cloudflare/cloudflare_test.go
+++ b/store/cloudflare/cloudflare_test.go
@@ -21,8 +21,8 @@ func TestCloudflare(t *testing.T) {
 	randomV := strconv.Itoa(rand.Int())
 
 	wkv := NewStore(
-		ApiToken(apiToken),
-		AccountID(accountID),
+		Token(apiToken),
+		Account(accountID),
 		Namespace(kvID),
 	)
 
diff --git a/store/cloudflare/options.go b/store/cloudflare/options.go
index f09df9d6..36dc7c10 100644
--- a/store/cloudflare/options.go
+++ b/store/cloudflare/options.go
@@ -5,13 +5,13 @@ import (
 )
 
 // Token sets the cloudflare api token
-func ApiToken(t string) options.Option {
+func Token(t string) options.Option {
 	// TODO: change to store.cf.api_token
 	return options.WithValue("CF_API_TOKEN", t)
 }
 
-// AccountID sets the cloudflare account id
-func AccountID(id string) options.Option {
+// Account sets the cloudflare account id
+func Account(id string) options.Option {
 	// TODO: change to store.cf.account_id
 	return options.WithValue("CF_ACCOUNT_ID", id)
 }