File tree Expand file tree Collapse file tree 7 files changed +14
-14
lines changed
nostr-mls-memory-storage/src Expand file tree Collapse file tree 7 files changed +14
-14
lines changed Original file line number Diff line number Diff line change @@ -463,7 +463,7 @@ mod tests {
463
463
welcome_event_id : Some ( event_id) ,
464
464
processed_at : Timestamp :: now ( ) ,
465
465
state : ProcessedWelcomeState :: Processed ,
466
- failure_reason : "" . to_string ( ) ,
466
+ failure_reason : None ,
467
467
} ;
468
468
469
469
// Save the processed welcome
@@ -571,7 +571,7 @@ mod tests {
571
571
message_event_id : Some ( event_id) ,
572
572
processed_at : Timestamp :: now ( ) ,
573
573
state : ProcessedMessageState :: Processed ,
574
- failure_reason : "" . to_string ( ) ,
574
+ failure_reason : None ,
575
575
} ;
576
576
577
577
// Save the processed message
Original file line number Diff line number Diff line change @@ -67,7 +67,7 @@ CREATE TABLE IF NOT EXISTS processed_messages (
67
67
message_event_id BLOB, -- Message event ID as byte array
68
68
processed_at INTEGER NOT NULL ,
69
69
state TEXT NOT NULL ,
70
- failure_reason TEXT NOT NULL
70
+ failure_reason TEXT
71
71
);
72
72
73
73
-- Create index on message_event_id for faster lookups
@@ -105,7 +105,7 @@ CREATE TABLE IF NOT EXISTS processed_welcomes (
105
105
welcome_event_id BLOB, -- Welcome event ID as byte array
106
106
processed_at INTEGER NOT NULL ,
107
107
state TEXT NOT NULL ,
108
- failure_reason TEXT NOT NULL
108
+ failure_reason TEXT
109
109
);
110
110
111
111
-- Create index on welcome_event_id for faster lookups
Original file line number Diff line number Diff line change @@ -162,7 +162,7 @@ pub fn row_to_processed_message(row: &Row) -> SqliteResult<ProcessedMessage> {
162
162
row. get_ref ( "message_event_id" ) ?. as_blob_or_null ( ) ?;
163
163
let processed_at_value: u64 = row. get ( "processed_at" ) ?;
164
164
let state_str: & str = row. get_ref ( "state" ) ?. as_str ( ) ?;
165
- let failure_reason: String = row. get ( "failure_reason" ) ?;
165
+ let failure_reason: Option < String > = row. get ( "failure_reason" ) ?;
166
166
167
167
// Parse values
168
168
let wrapper_event_id: EventId = EventId :: from_slice ( wrapper_event_id_blob)
@@ -249,7 +249,7 @@ pub fn row_to_processed_welcome(row: &Row) -> SqliteResult<ProcessedWelcome> {
249
249
row. get_ref ( "welcome_event_id" ) ?. as_blob_or_null ( ) ?;
250
250
let processed_at_value: u64 = row. get ( "processed_at" ) ?;
251
251
let state_str: & str = row. get_ref ( "state" ) ?. as_str ( ) ?;
252
- let failure_reason: String = row. get ( "failure_reason" ) ?;
252
+ let failure_reason: Option < String > = row. get ( "failure_reason" ) ?;
253
253
254
254
// Parse values
255
255
let wrapper_event_id: EventId = EventId :: from_slice ( wrapper_event_id_blob)
Original file line number Diff line number Diff line change @@ -201,7 +201,7 @@ mod tests {
201
201
message_event_id : Some ( message_event_id) ,
202
202
processed_at : Timestamp :: from ( 1_000_000_000u64 ) ,
203
203
state : ProcessedMessageState :: Processed ,
204
- failure_reason : "" . to_string ( ) ,
204
+ failure_reason : None ,
205
205
} ;
206
206
207
207
// Save the processed message
Original file line number Diff line number Diff line change @@ -241,7 +241,7 @@ mod tests {
241
241
welcome_event_id : Some ( welcome_event_id) ,
242
242
processed_at : Timestamp :: from ( 1_000_000_000u64 ) ,
243
243
state : ProcessedWelcomeState :: Processed ,
244
- failure_reason : "" . to_string ( ) ,
244
+ failure_reason : None ,
245
245
} ;
246
246
247
247
// Save the processed welcome
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ pub struct ProcessedMessage {
21
21
/// The state of the message
22
22
pub state : ProcessedMessageState ,
23
23
/// The reason the message failed to be processed
24
- pub failure_reason : String ,
24
+ pub failure_reason : Option < String > ,
25
25
}
26
26
27
27
/// This is the processed rumor message that represents a message in a group
@@ -163,11 +163,11 @@ mod tests {
163
163
fn test_processed_message_serialization ( ) {
164
164
// Create a processed message to test serialization
165
165
let processed_message = ProcessedMessage {
166
- wrapper_event_id : EventId :: all_zeros ( ) , // Using all_zeros for testing
166
+ wrapper_event_id : EventId :: all_zeros ( ) ,
167
167
message_event_id : None ,
168
168
processed_at : Timestamp :: now ( ) ,
169
169
state : ProcessedMessageState :: Processed ,
170
- failure_reason : String :: new ( ) ,
170
+ failure_reason : None ,
171
171
} ;
172
172
173
173
let serialized = serde_json:: to_value ( & processed_message) . unwrap ( ) ;
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ pub struct ProcessedWelcome {
21
21
/// The state of the welcome
22
22
pub state : ProcessedWelcomeState ,
23
23
/// The reason the welcome failed to be processed
24
- pub failure_reason : String ,
24
+ pub failure_reason : Option < String > ,
25
25
}
26
26
27
27
/// A welcome message
@@ -309,11 +309,11 @@ mod tests {
309
309
welcome_event_id : None ,
310
310
processed_at : Timestamp :: now ( ) ,
311
311
state : ProcessedWelcomeState :: Processed ,
312
- failure_reason : String :: new ( ) ,
312
+ failure_reason : None ,
313
313
} ;
314
314
315
315
let serialized = serde_json:: to_value ( & processed_welcome) . unwrap ( ) ;
316
316
assert_eq ! ( serialized[ "state" ] , json!( "processed" ) ) ;
317
- assert_eq ! ( serialized[ "failure_reason" ] , json!( "" ) ) ;
317
+ assert_eq ! ( serialized[ "failure_reason" ] , json!( null ) ) ;
318
318
}
319
319
}
You can’t perform that action at this time.
0 commit comments