From 1c4ead1ea4330f0770e91fb74bed304eb8e95164 Mon Sep 17 00:00:00 2001
From: Alexey Padalko <korhaliv@protonmail.com>
Date: Wed, 7 Aug 2019 11:08:07 +0300
Subject: [PATCH] refactor: extract sign/verify grpc interactions into actions

---
 .../ProfilePaneSignMessage.js                 | 12 +++++-----
 .../ProfilePaneVerifyMessage.js               | 18 ++++++--------
 .../Profile/ProfilePaneSignMessage.js         |  2 ++
 .../Profile/ProfilePaneVerifyMessage.js       |  2 ++
 renderer/reducers/lnd.js                      | 24 +++++++++++++++++++
 5 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/renderer/components/Profile/ProfilePaneSignMessage/ProfilePaneSignMessage.js b/renderer/components/Profile/ProfilePaneSignMessage/ProfilePaneSignMessage.js
index a0f4161d2d5..187c3b79909 100644
--- a/renderer/components/Profile/ProfilePaneSignMessage/ProfilePaneSignMessage.js
+++ b/renderer/components/Profile/ProfilePaneSignMessage/ProfilePaneSignMessage.js
@@ -2,11 +2,10 @@ import React, { useState, useRef } from 'react'
 import PropTypes from 'prop-types'
 import { FormattedMessage, injectIntl, intlShape } from 'react-intl'
 import { Box, Flex } from 'rebass'
-import { grpc } from 'workers'
 import { Bar, CopyBox, TextArea, Text, Form, Button } from 'components/UI'
 import messages from './messages'
 
-const ProfilePaneNodeInfo = ({ intl, showNotification, ...rest }) => {
+const ProfilePaneNodeInfo = ({ intl, signMessage, showNotification, ...rest }) => {
   const [sig, setSig] = useState(null)
 
   const formApiRef = useRef(null)
@@ -17,7 +16,7 @@ const ProfilePaneNodeInfo = ({ intl, showNotification, ...rest }) => {
     try {
       const { current: formApi } = formApiRef
       const message = formApi.getValue('message')
-      const { signature } = await grpc.services.Lightning.signMessage({ msg: Buffer.from(message) })
+      const { signature } = await signMessage(message)
       setSig(signature)
     } catch (e) {
       setSig(intl.formatMessage({ ...messages.sign_error }))
@@ -45,10 +44,10 @@ const ProfilePaneNodeInfo = ({ intl, showNotification, ...rest }) => {
               word-break: break-all;
             `}
             description={intl.formatMessage({ ...messages.sign_message_desc })}
+            field="message"
             isRequired
             label={intl.formatMessage({ ...messages.sign_message_label })}
-            {...rest}
-            field="message"
+            onChange={() => setSig(null)}
             spellCheck="false"
           />
           <Button alignSelf="flex-end" mt={3} type="submit" variant="normal">
@@ -62,7 +61,7 @@ const ProfilePaneNodeInfo = ({ intl, showNotification, ...rest }) => {
               <Bar />
 
               <CopyBox
-                hint={intl.formatMessage({ ...messages.sign_message_action })}
+                hint={intl.formatMessage({ ...messages.copy_signature })}
                 my={3}
                 onCopy={notifyOfCopy}
                 value={sig}
@@ -78,6 +77,7 @@ const ProfilePaneNodeInfo = ({ intl, showNotification, ...rest }) => {
 ProfilePaneNodeInfo.propTypes = {
   intl: intlShape.isRequired,
   showNotification: PropTypes.func.isRequired,
+  signMessage: PropTypes.func.isRequired,
 }
 
 export default injectIntl(ProfilePaneNodeInfo)
diff --git a/renderer/components/Profile/ProfilePaneVerifyMessage/ProfilePaneVerifyMessage.js b/renderer/components/Profile/ProfilePaneVerifyMessage/ProfilePaneVerifyMessage.js
index a58020fb806..c901785b1a8 100644
--- a/renderer/components/Profile/ProfilePaneVerifyMessage/ProfilePaneVerifyMessage.js
+++ b/renderer/components/Profile/ProfilePaneVerifyMessage/ProfilePaneVerifyMessage.js
@@ -2,7 +2,6 @@ import React, { useState, useRef } from 'react'
 import PropTypes from 'prop-types'
 import { FormattedMessage, injectIntl, intlShape } from 'react-intl'
 import { Box, Flex } from 'rebass'
-import { grpc } from 'workers'
 import { Bar, CopyBox, TextArea, Text, Form, Button, Input, Message } from 'components/UI'
 import messages from './messages'
 
@@ -18,7 +17,7 @@ VerificationStatus.propTypes = {
   isValid: PropTypes.bool,
 }
 
-const ProfilePaneNodeInfo = ({ intl, showNotification, ...rest }) => {
+const ProfilePaneNodeInfo = ({ intl, verifyMessage, showNotification, ...rest }) => {
   const [info, setInfo] = useState(null)
   const formApiRef = useRef(null)
 
@@ -32,10 +31,7 @@ const ProfilePaneNodeInfo = ({ intl, showNotification, ...rest }) => {
       const { current: formApi } = formApiRef
       const message = formApi.getValue('message')
       const signature = formApi.getValue('signature')
-      const { valid, pubkey } = await grpc.services.Lightning.verifyMessage({
-        msg: Buffer.from(message),
-        signature: signature,
-      })
+      const { valid, pubkey } = await verifyMessage(message, signature)
       setInfo({ valid, pubkey })
     } catch (e) {
       setInfo({ valid: false })
@@ -62,15 +58,14 @@ const ProfilePaneNodeInfo = ({ intl, showNotification, ...rest }) => {
           <TextArea
             css={`
               word-break: break-all;
+              height: 90px;
             `}
             description={intl.formatMessage({ ...messages.verify_message_desc })}
+            field="message"
             isRequired
             label={intl.formatMessage({ ...messages.verify_message_label })}
-            onChange={reset}
-            {...rest}
-            field="message"
             mb={3}
-            mt={2}
+            onChange={reset}
             spellCheck="false"
           />
           <Input
@@ -87,7 +82,7 @@ const ProfilePaneNodeInfo = ({ intl, showNotification, ...rest }) => {
 
           {info && (
             <>
-              <Text fontWeight="normal" mt={5}>
+              <Text fontWeight="normal" mt={4}>
                 <FormattedMessage {...messages.verification} />
               </Text>
               <Bar />
@@ -111,6 +106,7 @@ const ProfilePaneNodeInfo = ({ intl, showNotification, ...rest }) => {
 ProfilePaneNodeInfo.propTypes = {
   intl: intlShape.isRequired,
   showNotification: PropTypes.func.isRequired,
+  verifyMessage: PropTypes.func.isRequired,
 }
 
 export default injectIntl(ProfilePaneNodeInfo)
diff --git a/renderer/containers/Profile/ProfilePaneSignMessage.js b/renderer/containers/Profile/ProfilePaneSignMessage.js
index fabd771a2ed..467ddbf833c 100644
--- a/renderer/containers/Profile/ProfilePaneSignMessage.js
+++ b/renderer/containers/Profile/ProfilePaneSignMessage.js
@@ -1,9 +1,11 @@
 import { connect } from 'react-redux'
 import { showNotification } from 'reducers/notification'
+import { signMessage } from 'reducers/lnd'
 import ProfilePaneSignMessage from 'components/Profile/ProfilePaneSignMessage'
 
 const mapDispatchToProps = {
   showNotification,
+  signMessage,
 }
 
 export default connect(
diff --git a/renderer/containers/Profile/ProfilePaneVerifyMessage.js b/renderer/containers/Profile/ProfilePaneVerifyMessage.js
index d722ca41933..6256f02ae92 100644
--- a/renderer/containers/Profile/ProfilePaneVerifyMessage.js
+++ b/renderer/containers/Profile/ProfilePaneVerifyMessage.js
@@ -1,9 +1,11 @@
 import { connect } from 'react-redux'
 import { showNotification } from 'reducers/notification'
+import { verifyMessage } from 'reducers/lnd'
 import ProfilePaneVerifyMessage from 'components/Profile/ProfilePaneVerifyMessage'
 
 const mapDispatchToProps = {
   showNotification,
+  verifyMessage,
 }
 
 export default connect(
diff --git a/renderer/reducers/lnd.js b/renderer/reducers/lnd.js
index 54759526b33..bd77132924b 100644
--- a/renderer/reducers/lnd.js
+++ b/renderer/reducers/lnd.js
@@ -423,6 +423,30 @@ export const fetchSeedSuccess = cipher_seed_mnemonic => dispatch => {
   dispatch(stopLnd())
 }
 
+/**
+ * signMessage - Sign a message with a node's private key.
+ *
+ * @param {string} message Message to sign
+ * @returns {Function} Thunk
+ */
+export const signMessage = message => () => {
+  return grpc.services.Lightning.signMessage({ msg: Buffer.from(message) })
+}
+
+/**
+ * verifyMessage - Verify `signature` over the given `message`.
+ *
+ * @param {string} message Message to verify
+ * @param {string} signature Signature
+ * @returns {Function} Thunk
+ */
+export const verifyMessage = (message, signature) => () => {
+  return grpc.services.Lightning.verifyMessage({
+    msg: Buffer.from(message),
+    signature: signature,
+  })
+}
+
 /**
  * fetchSeedError - Fetch seed error callback.
  *