Skip to content

Commit

Permalink
Merge pull request #2731 from oasislabs/spellcheck
Browse files Browse the repository at this point in the history
  • Loading branch information
nhynes authored Feb 26, 2020
2 parents b946fcc + e28d6ed commit 470bbd3
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions .changelog/2731.trivial.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
`s/manger/manager/g`
2 changes: 1 addition & 1 deletion go/consensus/tendermint/apps/keymanager/transactions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions go/keymanager/api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion go/oasis-test-runner/oasis/args.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions go/oasis-test-runner/oasis/keymanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 470bbd3

Please sign in to comment.