on master help sign in
fix: remove unecessary Maybe for deriveNetworkSeed fns
commita3d5a700655ea4fc2db66340999b613ce76fd488 authorMatt Condon (shrugs) <mattgcondon@gmail.com> dateTue 9 Jul 2019, 15:44 (7 years ago) parentca6ebb8
2 files changed+8−11
src/lib/invite.js+1−1 src/lib/keys.js+7−10
src/lib/invite.js+1−1
@@ -122,7 +122,7 @@ export async function reticketPointBetweenWallets({
122122
123123 // configure networking public keys
124124 const seed = await deriveNetworkSeedFromUrbitWallet(
125− Just(toWallet),
125+ toWallet,
126126 INITIAL_NETWORK_KEY_REVISION
127127 );
128128
src/lib/keys.js+7−10
@@ -77,7 +77,7 @@ export const compileNetworkingKey = (pair, point, revision) => {
7777};
7878
7979/**
80− * @param {Maybe<any>} urbitWallet
80+ * @param {object} urbitWallet
8181 * @param {number} revision
8282 * @return {Promise<Maybe<string>>}
8383 */
@@ -85,8 +85,7 @@ export const deriveNetworkSeedFromUrbitWallet = async (
8585 urbitWallet,
8686 revision = 1
8787) => {
88− const _urbitWallet = need.wallet(urbitWallet);
89− return deriveNetworkSeedFromSeed(_urbitWallet.management.seed, revision);
88+ return deriveNetworkSeedFromSeed(urbitWallet.management.seed, revision);
9089};
9190
9291/**
@@ -102,12 +101,10 @@ export const deriveNetworkSeedFromMnemonic = async (
102101 details,
103102 revision = 1
104103) => {
105− const _wallet = need.wallet(wallet);
106− const _mnemonic = need.authMnemonic(authMnemonic);
107− const isManagementProxy = eqAddr(_wallet.address, details.managementProxy);
104+ const isManagementProxy = eqAddr(wallet.address, details.managementProxy);
108105
109106 if (isManagementProxy) {
110− return await deriveNetworkSeedFromSeed(_mnemonic, revision);
107+ return await deriveNetworkSeedFromSeed(authMnemonic, revision);
111108 }
112109
113110 return Nothing();
@@ -136,13 +133,13 @@ export const attemptNetworkSeedDerivation = async ({
136133 revision,
137134}) => {
138135 if (Just.hasInstance(urbitWallet)) {
139− return await deriveNetworkSeedFromUrbitWallet(urbitWallet, revision);
136+ return await deriveNetworkSeedFromUrbitWallet(urbitWallet.value, revision);
140137 }
141138
142139 if (Just.hasInstance(wallet) && Just.hasInstance(authMnemonic)) {
143140 return await deriveNetworkSeedFromMnemonic(
144− wallet,
145− authMnemonic,
141+ wallet.value,
142+ authMnemonic.value,
146143 details,
147144 revision
148145 );