From e28d6edc0edae7e743c322372a1c92ffe1bc4b79 Mon Sep 17 00:00:00 2001
From: Nick Hynes <nhynes@oasislabs.com>
Date: Wed, 26 Feb 2020 18:29:03 +0000
Subject: [PATCH] Rename manger to manager

---
 .changelog/2731.trivial.md                              | 1 +
 go/consensus/tendermint/apps/keymanager/transactions.go | 2 +-
 go/keymanager/api/api.go                                | 6 +++---
 go/oasis-test-runner/oasis/args.go                      | 2 +-
 go/oasis-test-runner/oasis/keymanager.go                | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 .changelog/2731.trivial.md

diff --git a/.changelog/2731.trivial.md b/.changelog/2731.trivial.md
new file mode 100644
index 00000000000..4726bd3eed7
--- /dev/null
+++ b/.changelog/2731.trivial.md
@@ -0,0 +1 @@
+`s/manger/manager/g`
diff --git a/go/consensus/tendermint/apps/keymanager/transactions.go b/go/consensus/tendermint/apps/keymanager/transactions.go
index 548174bc0dc..8e3e39a01dd 100644
--- a/go/consensus/tendermint/apps/keymanager/transactions.go
+++ b/go/consensus/tendermint/apps/keymanager/transactions.go
@@ -24,7 +24,7 @@ func (app *keymanagerApplication) updatePolicy(
 		return err
 	}
 	if rt.Kind != registry.KindKeyManager {
-		return fmt.Errorf("keymanger: runtime is not a key manager: %s", sigPol.Policy.ID)
+		return fmt.Errorf("keymanager: runtime is not a key manager: %s", sigPol.Policy.ID)
 	}
 
 	// Ensure that the tx signer is the key manager owner.
diff --git a/go/keymanager/api/api.go b/go/keymanager/api/api.go
index e215f170955..e49fbd308ca 100644
--- a/go/keymanager/api/api.go
+++ b/go/keymanager/api/api.go
@@ -61,7 +61,7 @@ type Status struct {
 	// IsInitialized is true iff the key manager is done initializing.
 	IsInitialized bool `json:"is_initialized"`
 
-	// IsSecure is true iff the key manger is secure.
+	// IsSecure is true iff the key manager is secure.
 	IsSecure bool `json:"is_secure"`
 
 	// Checksum is the key manager master secret verification checksum.
@@ -135,7 +135,7 @@ func VerifyExtraInfo(logger *logging.Logger, rt *registry.Runtime, nodeRt *node.
 		rak = nodeRt.Capabilities.TEE.RAK
 	}
 	if hw != rt.TEEHardware {
-		return nil, fmt.Errorf("keymanger: TEEHardware mismatch")
+		return nil, fmt.Errorf("keymanager: TEEHardware mismatch")
 	} else if err := registry.VerifyNodeRuntimeEnclaveIDs(logger, nodeRt, rt, ts); err != nil {
 		return nil, err
 	}
@@ -196,7 +196,7 @@ func init() {
 	_ = oldTestKey.UnmarshalHex("9d41a874b80e39a40c9644e964f0e4f967100c91654bfd7666435fe906af060f")
 	signature.RegisterTestPublicKey(oldTestKey)
 
-	// Register all the seed derived SGX key manger test keys.
+	// Register all the seed derived SGX key manager test keys.
 	for idx, v := range []string{
 		"ekiden test key manager RAK seed", // DO NOT REORDER.
 		"ekiden key manager test multisig key 0",
diff --git a/go/oasis-test-runner/oasis/args.go b/go/oasis-test-runner/oasis/args.go
index 90b2d51249a..c806a416900 100644
--- a/go/oasis-test-runner/oasis/args.go
+++ b/go/oasis-test-runner/oasis/args.go
@@ -241,7 +241,7 @@ func (args *argBuilder) workerComputeEnabled() *argBuilder {
 	return args
 }
 
-func (args *argBuilder) workerKeymangerEnabled() *argBuilder {
+func (args *argBuilder) workerKeymanagerEnabled() *argBuilder {
 	args.vec = append(args.vec, "--"+keymanager.CfgEnabled)
 	return args
 }
diff --git a/go/oasis-test-runner/oasis/keymanager.go b/go/oasis-test-runner/oasis/keymanager.go
index 3109685309f..7082fa0dc1f 100644
--- a/go/oasis-test-runner/oasis/keymanager.go
+++ b/go/oasis-test-runner/oasis/keymanager.go
@@ -193,7 +193,7 @@ func (km *Keymanager) startNode() error {
 		tendermintCoreListenAddress(km.consensusPort).
 		tendermintSubmissionGasPrice(km.submissionGasPrice).
 		workerClientPort(km.workerClientPort).
-		workerKeymangerEnabled().
+		workerKeymanagerEnabled().
 		workerKeymanagerRuntimeBinary(km.runtime.binary).
 		workerKeymanagerRuntimeLoader(km.net.cfg.RuntimeLoaderBinary).
 		workerKeymanagerRuntimeID(km.runtime.id).
@@ -221,7 +221,7 @@ func (km *Keymanager) startNode() error {
 	return nil
 }
 
-// NewKeymanger provisions a new keymanager and adds it to the network.
+// NewKeymanager provisions a new keymanager and adds it to the network.
 func (net *Network) NewKeymanager(cfg *KeymanagerCfg) (*Keymanager, error) {
 	// XXX: Technically there can be more than one keymanager.
 	if len(net.keymanagers) == 1 {