[services] Tunnelbroker - Refactor handler names in Amqp `connectInternal()`
ClosedPublic
Actions

Authored by • max on Aug 4 2022, 11:18 AM.

Details

Reviewers

• karol
tomek

Commits

rCOMM31bec4fa28ef: [services] Tunnelbroker - Refactor handler names in Amqp `connectInternal()`

Summary

This diff is a part of the stack.

Introducing refactoring to the handler variable names in AmqpManager -> connectInternal() method to reflect its purposes instead of using the shorthand.

Related linear task: ENG-1495

Test Plan

Successfully built using yarn run-tunnelbroker-service-in-sandbox command.
Passing all AMQP unit tests in the last diff D4749 in a stack.

Diff Detail

Repository

rCOMM Comm

Branch

refactor-handlers-in-amqp-connect

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

• max created this revision.Aug 4 2022, 11:18 AM

• max held this revision as a draft.

Herald added subscribers: • abosh, • karol, atul and 3 others. · View Herald TranscriptAug 4 2022, 11:18 AM

• max added parent revisions: D4742: [services] Tunnelbroker - Fix `amqpReady` assignment, D4741: [services] Tunnelbroker - Add `waitUntilReady` function in AmqpManager, D4740: [services] Tunnelbroker - Wrap `connect()` into `init()` in AmqpManager.Aug 4 2022, 11:19 AM

• max edited the summary of this revision. (Show Details)Aug 4 2022, 11:22 AM

• max edited the test plan for this revision. (Show Details)

• max added reviewers: • karol, tomek.

Harbormaster completed remote builds in B11131: Diff 15328.Aug 4 2022, 11:30 AM

• max added a child revision: D4744: [services] Tunnelbroker - Fix AMQP client reconnection algorithm.Aug 4 2022, 12:18 PM

• max published this revision for review.Aug 4 2022, 4:52 PM

• max edited the test plan for this revision. (Show Details)

Rebase on parent changes.

• max added a parent revision: D4767: [services] Tunnelbroker - Add AMQP shared channel locking.Aug 6 2022, 11:50 AM

Harbormaster failed remote builds in B11193: Diff 15401!Aug 6 2022, 11:51 AM

Rebase on master changes.

Harbormaster completed remote builds in B11198: Diff 15407.Aug 6 2022, 12:55 PM

• max added a child revision: D4768: [services] Tunnelbroker - Amqp Manager in parallel threads messages throughput test.Aug 6 2022, 1:06 PM

• karol accepted this revision.Aug 8 2022, 6:58 AM

tomek accepted this revision.Aug 9 2022, 9:29 AM

This revision is now accepted and ready to land.Aug 9 2022, 9:29 AM

Rebase/merge on master changes.

This revision was landed with ongoing or failed builds.Aug 22 2022, 7:12 AM

Closed by commit rCOMM31bec4fa28ef: [services] Tunnelbroker - Refactor handler names in Amqp `connectInternal()` (authored by • max). · Explain Why

This revision was automatically updated to reflect the committed changes.

• max added a commit: rCOMM31bec4fa28ef: [services] Tunnelbroker - Refactor handler names in Amqp `connectInternal()`.

Harbormaster completed remote builds in B11504: Diff 15822.Aug 22 2022, 7:16 AM

• max removed a child revision: D4768: [services] Tunnelbroker - Amqp Manager in parallel threads messages throughput test.Aug 24 2022, 5:35 AM

Revision Contents
Changeset List

Path

Size

services/

tunnelbroker/

src/

Amqp/

AmqpManager.cpp

12 lines

Diff 15328

View Options

services/tunnelbroker/src/Amqp/AmqpManager.cpp

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Lines	import type {
EventSubscription,		EventSubscription,
KeyboardEvent,		KeyboardEvent,
} from '../types/react-native.js';		} from '../types/react-native.js';
import type { ImageStyle } from '../types/styles.js';		import type { ImageStyle } from '../types/styles.js';
import {		import {
runTiming,		runTiming,
ratchetAlongWithKeyboardHeight,		ratchetAlongWithKeyboardHeight,
} from '../utils/animation-utils.js';		} from '../utils/animation-utils.js';
		import { useInitialNotificationsEncryptedMessage } from '../utils/crypto-utils.js';
import {		import {
type StateContainer,		type StateContainer,
type StateChange,		type StateChange,
setStateForContainer,		setStateForContainer,
} from '../utils/state-container.js';		} from '../utils/state-container.js';
import EthereumLogo from '../vectors/ethereum-logo.react.js';		import EthereumLogo from '../vectors/ethereum-logo.react.js';

let initialAppLoad = true;		let initialAppLoad = true;
▲ Show 20 Lines • Show All 58 Lines • ▼ Show 20 Lines	type Props = {
+cookie: ?string,		+cookie: ?string,
+urlPrefix: string,		+urlPrefix: string,
+loggedIn: boolean,		+loggedIn: boolean,
+dimensions: DerivedDimensionsInfo,		+dimensions: DerivedDimensionsInfo,
+splashStyle: ImageStyle,		+splashStyle: ImageStyle,
+styles: typeof unboundStyles,		+styles: typeof unboundStyles,
// Redux dispatch functions		// Redux dispatch functions
+dispatch: Dispatch,		+dispatch: Dispatch,
		// Keyserver olm sessions functions
		+initialNotificationsEncryptedMessage: () => Promise<string>,
};		};
type State = {		type State = {
+mode: LoggedOutMode,		+mode: LoggedOutMode,
+nextMode: LoggedOutMode,		+nextMode: LoggedOutMode,
+logInState: StateContainer<LogInState>,		+logInState: StateContainer<LogInState>,
+registerState: StateContainer<RegisterState>,		+registerState: StateContainer<RegisterState>,
};		};
class LoggedOutModal extends React.PureComponent<Props, State> {		class LoggedOutModal extends React.PureComponent<Props, State> {
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines	if (!__DEV__) {
const actionSource = loggedIn		const actionSource = loggedIn
? logInActionSources.appStartReduxLoggedInButInvalidCookie		? logInActionSources.appStartReduxLoggedInButInvalidCookie
: logInActionSources.appStartCookieLoggedInButInvalidRedux;		: logInActionSources.appStartCookieLoggedInButInvalidRedux;
const sessionChange = await fetchNewCookieFromNativeCredentials(		const sessionChange = await fetchNewCookieFromNativeCredentials(
dispatch,		dispatch,
cookie,		cookie,
urlPrefix,		urlPrefix,
actionSource,		actionSource,
		this.props.initialNotificationsEncryptedMessage,
);		);
if (		if (
sessionChange &&		sessionChange &&
sessionChange.cookie &&		sessionChange.cookie &&
sessionChange.cookie.startsWith('user=')		sessionChange.cookie.startsWith('user=')
) {		) {
// success! we can expect subsequent actions to fix up the state		// success! we can expect subsequent actions to fix up the state
return;		return;
▲ Show 20 Lines • Show All 447 Lines • ▼ Show 20 Lines	React.memo<BaseProps>(function ConnectedLoggedOutModal(props: BaseProps) {
const cookie = useSelector(state => state.cookie);		const cookie = useSelector(state => state.cookie);
const urlPrefix = useSelector(state => state.urlPrefix);		const urlPrefix = useSelector(state => state.urlPrefix);
const loggedIn = useSelector(isLoggedIn);		const loggedIn = useSelector(isLoggedIn);
const dimensions = useSelector(derivedDimensionsInfoSelector);		const dimensions = useSelector(derivedDimensionsInfoSelector);
const splashStyle = useSelector(splashStyleSelector);		const splashStyle = useSelector(splashStyleSelector);
const styles = useStyles(unboundStyles);		const styles = useStyles(unboundStyles);

const dispatch = useDispatch();		const dispatch = useDispatch();
		const callInitialNotificationsEncryptedMessage =
		useInitialNotificationsEncryptedMessage();
return (		return (
<LoggedOutModal		<LoggedOutModal
{...props}		{...props}
isForeground={isForeground}		isForeground={isForeground}
persistedStateLoaded={persistedStateLoaded}		persistedStateLoaded={persistedStateLoaded}
rehydrateConcluded={rehydrateConcluded}		rehydrateConcluded={rehydrateConcluded}
cookie={cookie}		cookie={cookie}
urlPrefix={urlPrefix}		urlPrefix={urlPrefix}
loggedIn={loggedIn}		loggedIn={loggedIn}
dimensions={dimensions}		dimensions={dimensions}
splashStyle={splashStyle}		splashStyle={splashStyle}
styles={styles}		styles={styles}
dispatch={dispatch}		dispatch={dispatch}
		initialNotificationsEncryptedMessage={
		callInitialNotificationsEncryptedMessage
		}
/>		/>
);		);
});		});

export default ConnectedLoggedOutModal;		export default ConnectedLoggedOutModal;

[services] Tunnelbroker - Refactor handler names in Amqp `connectInternal()`ClosedPublicActions