Paths

Table of Contentst

-
services/identity/src/
-
identity/
-
src/
-
device_list.rs
-
grpc_services/
-
authenticated.rs

[identity] Update SignedDeviceList::from_str to return tonic::Status
ClosedPublic
Actions

Authored by bartek on Sep 2 2024, 11:27 PM.

Details

Reviewers

varun
will
kamil

Commits

rCOMM8e7230210185: [identity] Update SignedDeviceList::from_str to return tonic::Status

Summary

Noticed that we're using type Error = serde_json::Error in FromStr, but we map it everywhere to tonic::Status.
Refactored this to map it only in one place and avoid adding another mapping in the next diff

Depends on D13222

Test Plan

cargo build -p identity

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

bartek created this revision.Sep 2 2024, 11:27 PM

bartek held this revision as a draft.

Herald added subscribers: tomek, ashoat. · View Herald TranscriptSep 2 2024, 11:27 PM

bartek added a child revision: D13224: [identity] Allow register_primary_device() to overwrite device list.Sep 2 2024, 11:33 PM

Harbormaster completed remote builds in B31399: Diff 43845.Sep 2 2024, 11:43 PM

bartek published this revision for review.Sep 3 2024, 12:05 AM

will accepted this revision.Sep 3 2024, 7:17 AM

This revision is now accepted and ready to land.Sep 3 2024, 7:17 AM

kamil accepted this revision.Sep 6 2024, 5:44 AM

Closed by commit rCOMM8e7230210185: [identity] Update SignedDeviceList::from_str to return tonic::Status (authored by bartek). · Explain WhySep 9 2024, 6:21 AM

This revision was automatically updated to reflect the committed changes.

bartek added a commit: rCOMM8e7230210185: [identity] Update SignedDeviceList::from_str to return tonic::Status.

Revision Contents
Changeset List

Path

Size

services/

identity/

src/

device_list.rs

16 lines

grpc_services/

authenticated.rs

7 lines

Diff 43985

View Options

services/identity/src/device_list.rs

Show First 20 Lines • Show All 417 Lines • ▼ Show 20 Lines	) {
const lateResponsesSet = new Set<number>(		const lateResponsesSet = new Set<number>(
state.keyserverInfos[keyserverID].connection.lateResponses,		state.keyserverInfos[keyserverID].connection.lateResponses,
);		);
if (isLate) {		if (isLate) {
lateResponsesSet.add(messageID);		lateResponsesSet.add(messageID);
} else {		} else {
lateResponsesSet.delete(messageID);		lateResponsesSet.delete(messageID);
}		}
return {		const operation: ReplaceKeyserverOperation = {
...state,		type: 'replace_keyserver',
keyserverInfos: {		payload: {
...state.keyserverInfos,		id: keyserverID,
[keyserverID]: {		keyserverInfo: {
...state.keyserverInfos[keyserverID],		...state.keyserverInfos[keyserverID],
connection: {		connection: {
...state.keyserverInfos[keyserverID].connection,		...state.keyserverInfos[keyserverID].connection,
lateResponses: [...lateResponsesSet],		lateResponses: [...lateResponsesSet],
},		},
},		},
},		},
};		};
} else if (action.type === updateDisconnectedBarActionType) {
const { keyserverID } = action.payload;
return {		return {
...state,		...state,
keyserverInfos: {		keyserverInfos: processStoreOps(state.keyserverInfos, [operation]),
...state.keyserverInfos,		};
[keyserverID]: {		} else if (action.type === updateDisconnectedBarActionType) {
		const { keyserverID } = action.payload;
		const operation: ReplaceKeyserverOperation = {
		type: 'replace_keyserver',
		payload: {
		id: keyserverID,
		keyserverInfo: {
...state.keyserverInfos[keyserverID],		...state.keyserverInfos[keyserverID],
connection: {		connection: {
...state.keyserverInfos[keyserverID].connection,		...state.keyserverInfos[keyserverID].connection,
showDisconnectedBar: action.payload.visible,		showDisconnectedBar: action.payload.visible,
},		},
},		},
},		},
};		};
		return {
		...state,
		keyserverInfos: processStoreOps(state.keyserverInfos, [operation]),
		};
} else if (action.type === setDeviceTokenActionTypes.success) {		} else if (action.type === setDeviceTokenActionTypes.success) {
const { deviceTokens } = action.payload;		const { deviceTokens } = action.payload;
const keyserverInfos: { ...KeyserverInfos } = { ...state.keyserverInfos };		const keyserverInfos: { ...KeyserverInfos } = { ...state.keyserverInfos };
for (const keyserverID in deviceTokens) {		for (const keyserverID in deviceTokens) {
keyserverInfos[keyserverID] = {		keyserverInfos[keyserverID] = {
...keyserverInfos[keyserverID],		...keyserverInfos[keyserverID],
deviceToken: deviceTokens[keyserverID],		deviceToken: deviceTokens[keyserverID],
};		};
}		}
return {		return {
...state,		...state,
keyserverInfos,		keyserverInfos,
};		};
} else if (action.type === setConnectionIssueActionType) {		} else if (action.type === setConnectionIssueActionType) {
const { connectionIssue, keyserverID } = action.payload;		const { connectionIssue, keyserverID } = action.payload;
return {		const operation: ReplaceKeyserverOperation = {
...state,		type: 'replace_keyserver',
keyserverInfos: {		payload: {
...state.keyserverInfos,		id: keyserverID,
[keyserverID]: {		keyserverInfo: {
...state.keyserverInfos[keyserverID],		...state.keyserverInfos[keyserverID],
connection: {		connection: {
...state.keyserverInfos[keyserverID].connection,		...state.keyserverInfos[keyserverID].connection,
connectionIssue,		connectionIssue,
},		},
},		},
},		},
};		};
		return {
		...state,
		keyserverInfos: processStoreOps(state.keyserverInfos, [operation]),
		};
}		}

return state;		return state;
}		}