Added toProtoKeyList

hiero-ledger · Oct 7, 2020 · c64c73d · c64c73d
1 parent 2630d39
commit c64c73d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/account_create_transaction.go b/account_create_transaction.go
@@ -43,7 +43,7 @@ func NewAccountCreateTransaction() *AccountCreateTransaction {
 // SetKey sets the key that must sign each transfer out of the account. If RecieverSignatureRequired is true, then it
 // must also sign any transfer into the account.
 func (transaction *AccountCreateTransaction) SetKey(publicKey PublicKey) *AccountCreateTransaction {
-	transaction.pb.Key = publicKey.toProtobuf()
+	transaction.pb.Key = publicKey.toProtoKey()
 	return transaction
 }
 

diff --git a/crypto.go b/crypto.go
@@ -24,7 +24,7 @@ const ed25519PrivateKeyPrefix = "302e020100300506032b657004220420"
 const ed25519PubKeyPrefix = "302a300506032b6570032100"
 
 type Key interface {
-	toProtobuf() *proto.Key
+	toProtoKey() *proto.Key
 }
 
 func publicKeyFromProto(pbKey *proto.Key) (Key, error) {
@@ -346,7 +346,7 @@ func (pk PublicKey) Bytes() []byte {
 	return pk.keyData
 }
 
-func (pk PublicKey) toProtobuf() *proto.Key {
+func (pk PublicKey) toProtoKey() *proto.Key {
 	return &proto.Key{Key: &proto.Key_Ed25519{Ed25519: pk.keyData}}
 }
 

diff --git a/key_list.go b/key_list.go
@@ -24,7 +24,7 @@ func NewKeyList() *KeyList {
 }
 
 func (kl *KeyList) Add(key Key) *KeyList {
-	kl.keys = append(kl.keys, key.toProtobuf())
+	kl.keys = append(kl.keys, key.toProtoKey())
 	return kl
 }
 
@@ -36,7 +36,7 @@ func (kl *KeyList) AddAll(keys []Key) *KeyList {
 	return kl
 }
 
-func (kl *KeyList) toProtobuf() *proto.Key {
+func (kl *KeyList) toProtoKey() *proto.Key {
 	if kl.threshold >= 0 {
 		return &proto.Key{
 			Key: &proto.Key_ThresholdKey{
@@ -58,3 +58,15 @@ func (kl *KeyList) toProtobuf() *proto.Key {
 		}
 	}
 }
+
+func (kl *KeyList) toProtoKeyList() *proto.KeyList {
+	return &proto.KeyList{
+		Keys: kl.keys,
+	}
+}
+
+func keyListFromProto(pb *proto.KeyList) KeyList {
+	return KeyList{
+		keys: pb.Keys,
+	}
+}