Merge pull request #1706 from smartcontractkit/ks-align-prefix-pattern

Keystore small rename

Author: connorwstein

keystore/ocr2offchain/ocr2_offchain_keyring.go

@@ -13,12 +13,12 @@ import (
 const (
 	OCR2OffchainSigning    = "ocr2_offchain_signing"
 	OCR2OffchainEncryption = "ocr2_offchain_encryption"
-	OCR2OffchainPrefix     = "ocr2_offchain"
+	PrefixOCR2Offchain     = "ocr2_offchain"
 )
 
 func CreateOCR2OffchainKeyring(ctx context.Context, ks keystore.Keystore, keyringName string) (ocrtypes.OffchainKeyring, error) {
-	signingKeyPath := keystore.NewKeyPath(OCR2OffchainPrefix, keyringName, OCR2OffchainSigning)
-	encryptionKeyPath := keystore.NewKeyPath(OCR2OffchainPrefix, keyringName, OCR2OffchainEncryption)
+	signingKeyPath := keystore.NewKeyPath(PrefixOCR2Offchain, keyringName, OCR2OffchainSigning)
+	encryptionKeyPath := keystore.NewKeyPath(PrefixOCR2Offchain, keyringName, OCR2OffchainEncryption)
 	createReq := keystore.CreateKeysRequest{
 		Keys: []keystore.CreateKeyRequest{
 			{
@@ -52,8 +52,8 @@ func GetOCR2OffchainKeyrings(ctx context.Context, ks keystore.Keystore, keyRingN
 	var names []string
 	if len(keyRingNames) > 0 {
 		for _, keyRingName := range keyRingNames {
-			names = append(names, keystore.NewKeyPath(OCR2OffchainPrefix, keyRingName, OCR2OffchainSigning).String())
-			names = append(names, keystore.NewKeyPath(OCR2OffchainPrefix, keyRingName, OCR2OffchainEncryption).String())
+			names = append(names, keystore.NewKeyPath(PrefixOCR2Offchain, keyRingName, OCR2OffchainSigning).String())
+			names = append(names, keystore.NewKeyPath(PrefixOCR2Offchain, keyRingName, OCR2OffchainEncryption).String())
 		}
 	}
 
@@ -66,7 +66,7 @@ func GetOCR2OffchainKeyrings(ctx context.Context, ks keystore.Keystore, keyRingN
 	// Group by keyrings.
 	keyRingMap := make(map[string][]keystore.KeyInfo)
 	for _, key := range resp.Keys {
-		if !strings.HasPrefix(key.KeyInfo.Name, keystore.NewKeyPath(OCR2OffchainPrefix).String()) {
+		if !strings.HasPrefix(key.KeyInfo.Name, keystore.NewKeyPath(PrefixOCR2Offchain).String()) {
 			continue
 		}
 		keyPath := keystore.NewKeyPathFromString(key.KeyInfo.Name)

keystore/ragep2p/peer.go

@@ -12,7 +12,7 @@ import (
 var _ ragetypes.PeerKeyring = (*PeerKeyring)(nil)
 
 const (
-	PeerKeyringPrefix = "ragep2p_peer"
+	PrefixPeerKeyring = "ragep2p_peer"
 )
 
 type PeerKeyring struct {
@@ -57,7 +57,7 @@ func (k *PeerKeyring) Sign(msg []byte) ([]byte, error) {
 }
 
 func CreatePeerKeyring(ctx context.Context, ks commonks.Keystore, name string) (*PeerKeyring, error) {
-	keyPath := commonks.NewKeyPath(PeerKeyringPrefix, name)
+	keyPath := commonks.NewKeyPath(PrefixPeerKeyring, name)
 	createReq := commonks.CreateKeysRequest{
 		Keys: []commonks.CreateKeyRequest{
 			{KeyName: keyPath.String(), KeyType: commonks.Ed25519},
@@ -79,7 +79,7 @@ func GetPeerKeyrings(ctx context.Context, ks commonks.Keystore, keyRingNames []s
 	var keyNames []string
 	if len(keyRingNames) > 0 {
 		for _, name := range keyRingNames {
-			keyNames = append(keyNames, commonks.NewKeyPath(PeerKeyringPrefix, name).String())
+			keyNames = append(keyNames, commonks.NewKeyPath(PrefixPeerKeyring, name).String())
 		}
 	}
 	keys, err := ks.GetKeys(ctx, commonks.GetKeysRequest{