Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PSL-1224] fix pastel-id passphrase update for multi-vol-recovery flow #901

Merged
merged 1 commit into from
Jul 12, 2024
Merged

[PSL-1224] fix pastel-id passphrase update for multi-vol-recovery flow #901

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions common/storage/ticketstore/files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (s *TicketStore) GetFileByID(fileID string) (*types.File, error) {
req_amount, is_concluded, cascade_metadata_ticket_id, uuid_key,
hash_of_original_big_file, name_of_original_big_file_with_ext,
size_of_original_big_file, data_type_of_original_big_file,
start_block, done_block
start_block, done_block, pastel_id, passphrase
FROM files
WHERE file_id = ?;`

Expand All @@ -85,7 +85,7 @@ func (s *TicketStore) GetFileByID(fileID string) (*types.File, error) {
&file.ReqAmount, &file.IsConcluded, &file.CascadeMetadataTicketID, &file.UUIDKey,
&file.HashOfOriginalBigFile, &file.NameOfOriginalBigFileWithExt,
&file.SizeOfOriginalBigFile, &file.DataTypeOfOriginalBigFile,
&file.StartBlock, &file.DoneBlock)
&file.StartBlock, &file.DoneBlock, &file.PastelID, &file.Passphrase)
if err != nil {
return nil, err
}
Expand All @@ -101,7 +101,7 @@ func (s *TicketStore) GetFileByTaskID(taskID string) (*types.File, error) {
req_amount, is_concluded, cascade_metadata_ticket_id, uuid_key,
hash_of_original_big_file, name_of_original_big_file_with_ext,
size_of_original_big_file, data_type_of_original_big_file,
start_block, done_block
start_block, done_block, pastel_id, passphrase
FROM files
WHERE task_id = ?;`

Expand All @@ -114,7 +114,7 @@ func (s *TicketStore) GetFileByTaskID(taskID string) (*types.File, error) {
&file.ReqAmount, &file.IsConcluded, &file.CascadeMetadataTicketID, &file.UUIDKey,
&file.HashOfOriginalBigFile, &file.NameOfOriginalBigFileWithExt,
&file.SizeOfOriginalBigFile, &file.DataTypeOfOriginalBigFile,
&file.StartBlock, &file.DoneBlock)
&file.StartBlock, &file.DoneBlock, &file.PastelID, &file.Passphrase)
if err != nil {
return nil, err
}
Expand All @@ -130,7 +130,7 @@ func (s *TicketStore) GetFilesByBaseFileID(baseFileID string) ([]*types.File, er
req_amount, is_concluded, cascade_metadata_ticket_id, uuid_key,
hash_of_original_big_file, name_of_original_big_file_with_ext,
size_of_original_big_file, data_type_of_original_big_file,
start_block, done_block
start_block, done_block, pastel_id, passphrase
FROM files
WHERE base_file_id = ?;`

Expand All @@ -149,7 +149,7 @@ func (s *TicketStore) GetFilesByBaseFileID(baseFileID string) ([]*types.File, er
&file.ReqAmount, &file.IsConcluded, &file.CascadeMetadataTicketID, &file.UUIDKey,
&file.HashOfOriginalBigFile, &file.NameOfOriginalBigFileWithExt,
&file.SizeOfOriginalBigFile, &file.DataTypeOfOriginalBigFile,
&file.StartBlock, &file.DoneBlock)
&file.StartBlock, &file.DoneBlock, &file.PastelID, &file.Passphrase)
if err != nil {
return nil, err
}
Expand All @@ -171,7 +171,7 @@ func (s *TicketStore) GetFilesByBaseFileIDAndConcludedCheck(baseFileID string, i
req_amount, is_concluded, cascade_metadata_ticket_id, uuid_key,
hash_of_original_big_file, name_of_original_big_file_with_ext,
size_of_original_big_file, data_type_of_original_big_file,
start_block, done_block
start_block, done_block, pastel_id, passphrase
FROM files
WHERE base_file_id = ? AND is_concluded = ?;`

Expand All @@ -190,7 +190,7 @@ func (s *TicketStore) GetFilesByBaseFileIDAndConcludedCheck(baseFileID string, i
&file.ReqAmount, &file.IsConcluded, &file.CascadeMetadataTicketID, &file.UUIDKey,
&file.HashOfOriginalBigFile, &file.NameOfOriginalBigFileWithExt,
&file.SizeOfOriginalBigFile, &file.DataTypeOfOriginalBigFile,
&file.StartBlock, &file.DoneBlock)
&file.StartBlock, &file.DoneBlock, &file.PastelID, &file.Passphrase)
if err != nil {
return nil, err
}
Expand Down
Loading