refactor: Changed Keys to be type KeyList instead of []Key

hiero-ledger · Jan 22, 2021 · 096a68d · 096a68d
1 parent a20c709
commit 096a68d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/file_info.go b/file_info.go
@@ -10,10 +10,10 @@ type FileInfo struct {
 	Size           int64
 	ExpirationTime time.Time
 	IsDeleted      bool
-	Keys           []Key
+	Keys           KeyList
 }
 
-func newFileInfo(fileID FileID, size int64, expirationTime time.Time, isDeleted bool, keys []Key) FileInfo {
+func newFileInfo(fileID FileID, size int64, expirationTime time.Time, isDeleted bool, keys KeyList) FileInfo {
 	return FileInfo{
 		FileID:         fileID,
 		Size:           size,
@@ -24,14 +24,13 @@ func newFileInfo(fileID FileID, size int64, expirationTime time.Time, isDeleted
 }
 
 func fileInfoFromProtobuf(fileInfo *proto.FileGetInfoResponse_FileInfo) (FileInfo, error) {
-	var keys []Key
+	var keys KeyList
+	var err error
 	if fileInfo.Keys != nil {
-		keyList, err := keyListFromProtobuf(fileInfo.Keys)
+		keys, err = keyListFromProtobuf(fileInfo.Keys)
 		if err != nil {
 			return FileInfo{}, err
 		}
-
-		keys = keyList.keys
 	}
 
 	return FileInfo{
@@ -44,11 +43,6 @@ func fileInfoFromProtobuf(fileInfo *proto.FileGetInfoResponse_FileInfo) (FileInf
 }
 
 func (fileInfo *FileInfo) toProtobuf() *proto.FileGetInfoResponse_FileInfo {
-	var keys = make([]*proto.Key, 0)
-	for _, key := range fileInfo.Keys {
-		keys = append(keys, key.toProtoKey())
-	}
-
 	return &proto.FileGetInfoResponse_FileInfo{
 		FileID: fileInfo.FileID.toProtobuf(),
 		Size:   fileInfo.Size,
@@ -57,8 +51,6 @@ func (fileInfo *FileInfo) toProtobuf() *proto.FileGetInfoResponse_FileInfo {
 			Nanos:   int32(fileInfo.ExpirationTime.Nanosecond()),
 		},
 		Deleted: fileInfo.IsDeleted,
-		Keys: &proto.KeyList{
-			Keys: keys,
-		},
+		Keys:    fileInfo.Keys.toProtoKeyList(),
 	}
 }
diff --git a/file_info_query_test.go b/file_info_query_test.go
@@ -42,6 +42,7 @@ func Test_FileInfo_Transaction(t *testing.T) {
 	assert.Equal(t, *fileID, info.FileID)
 	assert.Equal(t, info.Size, int64(12))
 	assert.False(t, info.IsDeleted)
+	assert.NotNil(t, info.Keys)
 
 	resp, err = NewFileDeleteTransaction().
 		SetFileID(*fileID).