From 9060ba67ca9542778e4d3256ad071a065537a7fd Mon Sep 17 00:00:00 2001 From: Jonathan Zernik Date: Mon, 19 Oct 2020 13:08:51 -0400 Subject: [PATCH] Rename rpc request functions (#307) * Renamed some of the rpc request functions to include request in name * Update more rpc function names * Rename more rpc methods * Rename all rpc request functions * Remove old comments * Remove console logs and alerts from rpc methods * Remove console logs from rpc request functions * Remove console log line * Handle buy error more gracefully * Handle errors in open/close channel * Handle alert errors for makesqueak dialog * Handle error with alert in create signing/contact profile --- .../BuyOfferDialog/BuyOfferDialog.js | 14 +- .../CloseChannelDialog/CloseChannelDialog.js | 13 +- .../CreateContactProfileDialog.js | 18 +- .../CreatePeerDialog/CreatePeerDialog.js | 8 +- .../CreateSigningProfileDialog.js | 18 +- .../DeletePeerDialog/DeletePeerDialog.js | 8 +- .../DeleteProfileDialog.js | 8 +- .../DeleteSqueakDialog/DeleteSqueakDialog.js | 8 +- .../MakeSqueakDialog/MakeSqueakDialog.js | 18 +- .../OpenChannelDialog/OpenChannelDialog.js | 13 +- .../ReceiveBitcoinDialog.js | 21 +- .../squeak-node-frontend/src/pages/buy/Buy.js | 4 +- .../src/pages/channel/Channel.js | 10 +- .../src/pages/lightningnode/LightningNode.js | 20 +- .../src/pages/offer/Offer.js | 4 +- .../src/pages/peer/Peer.js | 12 +- .../src/pages/peers/Peers.js | 4 +- .../src/pages/profile/Profile.js | 26 +- .../src/pages/profiles/Profiles.js | 8 +- .../src/pages/squeak/Squeak.js | 8 +- .../src/pages/squeakaddress/SqueakAddress.js | 8 +- .../src/pages/timeline/Timeline.js | 4 +- .../src/pages/wallet/Wallet.js | 24 +- .../src/squeakclient/requests.js | 457 ++++++------------ 24 files changed, 302 insertions(+), 434 deletions(-) diff --git a/frontend/squeak-node-frontend/src/components/BuyOfferDialog/BuyOfferDialog.js b/frontend/squeak-node-frontend/src/components/BuyOfferDialog/BuyOfferDialog.js index 0e1a2333..85b7c47f 100644 --- a/frontend/squeak-node-frontend/src/components/BuyOfferDialog/BuyOfferDialog.js +++ b/frontend/squeak-node-frontend/src/components/BuyOfferDialog/BuyOfferDialog.js @@ -31,7 +31,7 @@ import SqueakThreadItem from "../../components/SqueakThreadItem"; import { - payOffer, + payOfferRequest, } from "../../squeakclient/requests" @@ -44,10 +44,16 @@ export default function BuyOfferDialog({ var classes = useStyles(); const history = useHistory(); + const handleResponse = (response) => { + goToSqueakPage(offer.getSqueakHash()); + }; + + const handleErr = (err) => { + alert('Error paying offer: ' + err.message); + }; + const pay = (offerId) => { - payOffer(offerId, () => { - goToSqueakPage(offer.getSqueakHash()); - }); + payOfferRequest(offerId, handleResponse, handleErr); }; const goToSqueakPage = (squeakHash) => { diff --git a/frontend/squeak-node-frontend/src/components/CloseChannelDialog/CloseChannelDialog.js b/frontend/squeak-node-frontend/src/components/CloseChannelDialog/CloseChannelDialog.js index 38eb6596..51ece785 100644 --- a/frontend/squeak-node-frontend/src/components/CloseChannelDialog/CloseChannelDialog.js +++ b/frontend/squeak-node-frontend/src/components/CloseChannelDialog/CloseChannelDialog.js @@ -30,7 +30,7 @@ import Widget from "../../components/Widget"; import SqueakThreadItem from "../../components/SqueakThreadItem"; import { - lndCloseChannel, + lndCloseChannelRequest, } from "../../squeakclient/requests" @@ -54,8 +54,17 @@ export default function CloseChannelDialog({ setAmount(event.target.value); }; + const handleResponse = (response) => { + // TODO: go to channel page instead of showing alert. + alert('Close channel pending.'); + }; + + const handleErr = (err) => { + alert('Error closing channel: ' + err.message); + }; + const closeChannel = (txId, outputIndex) => { - lndCloseChannel(txId, outputIndex, () => {}); + lndCloseChannelRequest(txId, outputIndex, handleResponse, handleErr); }; function handleSubmit(event) { diff --git a/frontend/squeak-node-frontend/src/components/CreateContactProfileDialog/CreateContactProfileDialog.js b/frontend/squeak-node-frontend/src/components/CreateContactProfileDialog/CreateContactProfileDialog.js index f283e730..b47cebd7 100644 --- a/frontend/squeak-node-frontend/src/components/CreateContactProfileDialog/CreateContactProfileDialog.js +++ b/frontend/squeak-node-frontend/src/components/CreateContactProfileDialog/CreateContactProfileDialog.js @@ -30,7 +30,7 @@ import Widget from "../../components/Widget"; import SqueakThreadItem from "../../components/SqueakThreadItem"; import { - createContactProfile, + createContactProfileRequest, } from "../../squeakclient/requests" @@ -59,10 +59,16 @@ export default function CreateContactProfileDialog({ setAddress(event.target.value); }; - const create = (profileName, squeakAddress) => { - createContactProfile(profileName, squeakAddress, (response) => { - goToProfilePage(response.getProfileId()); - }) + const handleResponse = (response) => { + goToProfilePage(response.getProfileId()); + }; + + const handleErr = (err) => { + alert('Error creating contact profile: ' + err.message); + }; + + const createContactProfile = (profileName, squeakAddress) => { + createContactProfileRequest(profileName, squeakAddress, handleResponse, handleErr); }; const goToProfilePage = (profileId) => { @@ -81,7 +87,7 @@ export default function CreateContactProfileDialog({ alert('Address Name cannot be empty.'); return; } - create(profileName, address); + createContactProfile(profileName, address); handleClose(); } diff --git a/frontend/squeak-node-frontend/src/components/CreatePeerDialog/CreatePeerDialog.js b/frontend/squeak-node-frontend/src/components/CreatePeerDialog/CreatePeerDialog.js index d5b2a6f8..766f6eed 100644 --- a/frontend/squeak-node-frontend/src/components/CreatePeerDialog/CreatePeerDialog.js +++ b/frontend/squeak-node-frontend/src/components/CreatePeerDialog/CreatePeerDialog.js @@ -30,7 +30,7 @@ import Widget from "../../components/Widget"; import SqueakThreadItem from "../../components/SqueakThreadItem"; import { - createPeer, + createPeerRequest, } from "../../squeakclient/requests" @@ -64,8 +64,8 @@ export default function CreatePeerDialog({ setPort(event.target.value); }; - const create = (peerName, host, port) => { - createPeer(peerName, host, port, (response) => { + const createPeer = (peerName, host, port) => { + createPeerRequest(peerName, host, port, (response) => { goToPeerPage(response.getPeerId()); }); }; @@ -87,7 +87,7 @@ export default function CreatePeerDialog({ alert('Port cannot be empty.'); return; } - create(peerName, host, port); + createPeer(peerName, host, port); handleClose(); } diff --git a/frontend/squeak-node-frontend/src/components/CreateSigningProfileDialog/CreateSigningProfileDialog.js b/frontend/squeak-node-frontend/src/components/CreateSigningProfileDialog/CreateSigningProfileDialog.js index 5ebfc3fa..adf82023 100644 --- a/frontend/squeak-node-frontend/src/components/CreateSigningProfileDialog/CreateSigningProfileDialog.js +++ b/frontend/squeak-node-frontend/src/components/CreateSigningProfileDialog/CreateSigningProfileDialog.js @@ -30,7 +30,7 @@ import Widget from "../../components/Widget"; import SqueakThreadItem from "../../components/SqueakThreadItem"; import { - createSigningProfile, + createSigningProfileRequest, } from "../../squeakclient/requests" @@ -52,10 +52,16 @@ export default function CreateSigningProfileDialog({ setProfileName(event.target.value); }; - const create = (profileName) => { - createSigningProfile(profileName, (response) => { - goToProfilePage(response.getProfileId()); - }) + const handleResponse = (response) => { + goToProfilePage(response.getProfileId()); + }; + + const handleErr = (err) => { + alert('Error creating contact profile: ' + err.message); + }; + + const createSigningProfile = (profileName) => { + createSigningProfileRequest(profileName, handleResponse, handleErr); }; const goToProfilePage = (profileId) => { @@ -69,7 +75,7 @@ export default function CreateSigningProfileDialog({ alert('Profile Name cannot be empty.'); return; } - create(profileName); + createSigningProfile(profileName); handleClose(); } diff --git a/frontend/squeak-node-frontend/src/components/DeletePeerDialog/DeletePeerDialog.js b/frontend/squeak-node-frontend/src/components/DeletePeerDialog/DeletePeerDialog.js index af43ee79..d1d51701 100644 --- a/frontend/squeak-node-frontend/src/components/DeletePeerDialog/DeletePeerDialog.js +++ b/frontend/squeak-node-frontend/src/components/DeletePeerDialog/DeletePeerDialog.js @@ -29,7 +29,7 @@ import useStyles from "./styles"; import Widget from "../../components/Widget"; import { - deletePeer, + deletePeerRequest, } from "../../squeakclient/requests" @@ -42,8 +42,8 @@ export default function DeletePeerDialog({ var classes = useStyles(); const history = useHistory(); - const deleteSqueakPeer = (peerId) => { - deletePeer(peerId, (response) => { + const deletePeer = (peerId) => { + deletePeerRequest(peerId, (response) => { reloadRoute(); }); }; @@ -57,7 +57,7 @@ export default function DeletePeerDialog({ console.log( 'peer:', peer); var peerId = peer.getPeerId(); console.log( 'peerId:', peerId); - deleteSqueakPeer(peerId); + deletePeer(peerId); handleClose(); } diff --git a/frontend/squeak-node-frontend/src/components/DeleteProfileDialog/DeleteProfileDialog.js b/frontend/squeak-node-frontend/src/components/DeleteProfileDialog/DeleteProfileDialog.js index 6120f7a5..aeee8c81 100644 --- a/frontend/squeak-node-frontend/src/components/DeleteProfileDialog/DeleteProfileDialog.js +++ b/frontend/squeak-node-frontend/src/components/DeleteProfileDialog/DeleteProfileDialog.js @@ -29,7 +29,7 @@ import useStyles from "./styles"; import Widget from "../../components/Widget"; import { - deleteProfile, + deleteProfileRequest, } from "../../squeakclient/requests" @@ -42,8 +42,8 @@ export default function DeleteProfileDialog({ var classes = useStyles(); const history = useHistory(); - const deleteSqueakProfile = (profileId) => { - deleteProfile(profileId, (response) => { + const deleteProfile = (profileId) => { + deleteProfileRequest(profileId, (response) => { reloadRoute(); }); }; @@ -57,7 +57,7 @@ export default function DeleteProfileDialog({ console.log( 'profile:', profile); var profileId = profile.getProfileId(); console.log( 'profileId:', profileId); - deleteSqueakProfile(profileId); + deleteProfile(profileId); handleClose(); } diff --git a/frontend/squeak-node-frontend/src/components/DeleteSqueakDialog/DeleteSqueakDialog.js b/frontend/squeak-node-frontend/src/components/DeleteSqueakDialog/DeleteSqueakDialog.js index b04dcb85..4fef7b2f 100644 --- a/frontend/squeak-node-frontend/src/components/DeleteSqueakDialog/DeleteSqueakDialog.js +++ b/frontend/squeak-node-frontend/src/components/DeleteSqueakDialog/DeleteSqueakDialog.js @@ -30,7 +30,7 @@ import Widget from "../../components/Widget"; import SqueakThreadItem from "../../components/SqueakThreadItem"; import { - deleteSqueak, + deleteSqueakRequest, } from "../../squeakclient/requests" @@ -43,8 +43,8 @@ export default function DeleteSqueakDialog({ var classes = useStyles(); const history = useHistory(); - const callDeleteSqueak = (squeakHash) => { - deleteSqueak(squeakHash, (response) => { + const deleteSqueak = (squeakHash) => { + deleteSqueakRequest(squeakHash, (response) => { reloadRoute(); }); }; @@ -62,7 +62,7 @@ export default function DeleteSqueakDialog({ console.log( 'squeakToDelete:', squeakToDelete); var squeakHash = squeakToDelete.getSqueakHash(); console.log( 'squeakHash:', squeakHash); - callDeleteSqueak(squeakHash); + deleteSqueak(squeakHash); handleClose(); } diff --git a/frontend/squeak-node-frontend/src/components/MakeSqueakDialog/MakeSqueakDialog.js b/frontend/squeak-node-frontend/src/components/MakeSqueakDialog/MakeSqueakDialog.js index 5b648f2c..2894893e 100644 --- a/frontend/squeak-node-frontend/src/components/MakeSqueakDialog/MakeSqueakDialog.js +++ b/frontend/squeak-node-frontend/src/components/MakeSqueakDialog/MakeSqueakDialog.js @@ -30,8 +30,8 @@ import Widget from "../../components/Widget"; import SqueakThreadItem from "../../components/SqueakThreadItem"; import { - makeSqueak, - getSigningProfiles, + makeSqueakRequest, + getSigningProfilesRequest, } from "../../squeakclient/requests" @@ -61,13 +61,19 @@ export default function MakeSqueakDialog({ setContent(event.target.value); }; + const handleResponse = (response) => { + goToSqueakPage(response.getSqueakHash()); + }; + + const handleErr = (err) => { + alert('Error making squeak: ' + err.message); + }; + const createSqueak = (profileId, content, replyto) => { - makeSqueak(profileId, content, replyto, (response) => { - goToSqueakPage(response.getSqueakHash()); - }); + makeSqueakRequest(profileId, content, replyto, handleResponse, handleErr); }; const loadSigningProfiles = () => { - getSigningProfiles(setSigningProfiles); + getSigningProfilesRequest(setSigningProfiles); }; useEffect(() => { diff --git a/frontend/squeak-node-frontend/src/components/OpenChannelDialog/OpenChannelDialog.js b/frontend/squeak-node-frontend/src/components/OpenChannelDialog/OpenChannelDialog.js index 9c3394ba..82304e15 100644 --- a/frontend/squeak-node-frontend/src/components/OpenChannelDialog/OpenChannelDialog.js +++ b/frontend/squeak-node-frontend/src/components/OpenChannelDialog/OpenChannelDialog.js @@ -30,7 +30,7 @@ import Widget from "../../components/Widget"; import SqueakThreadItem from "../../components/SqueakThreadItem"; import { - lndOpenChannelSync, + lndOpenChannelSyncRequest, } from "../../squeakclient/requests" @@ -53,8 +53,17 @@ export default function OpenChannelDialog({ setAmount(event.target.value); }; + const handleResponse = (response) => { + // TODO: go to channel page instead of showing alert. + alert('Open channel pending.'); + }; + + const handleErr = (err) => { + alert('Error opening channel: ' + err.message); + }; + const openChannel = (pubkey, amount) => { - lndOpenChannelSync(pubkey, amount, () => {}); + lndOpenChannelSyncRequest(pubkey, amount, handleResponse, handleErr); }; // const goToProfilePage = (profileId) => { diff --git a/frontend/squeak-node-frontend/src/components/ReceiveBitcoinDialog/ReceiveBitcoinDialog.js b/frontend/squeak-node-frontend/src/components/ReceiveBitcoinDialog/ReceiveBitcoinDialog.js index a83bc06b..78b00277 100644 --- a/frontend/squeak-node-frontend/src/components/ReceiveBitcoinDialog/ReceiveBitcoinDialog.js +++ b/frontend/squeak-node-frontend/src/components/ReceiveBitcoinDialog/ReceiveBitcoinDialog.js @@ -30,7 +30,7 @@ import Widget from "../../components/Widget"; import SqueakThreadItem from "../../components/SqueakThreadItem"; import { - lndNewAddress, + lndNewAddressRequest, } from "../../squeakclient/requests" @@ -54,24 +54,7 @@ export default function ReceiveBitcoinDialog({ }; const getNewAddress = () => { - // console.log("called newAddress"); - // - // var newAddressRequest = new NewAddressRequest() - // console.log(newAddressRequest); - // - // client.lndNewAddress(newAddressRequest, {}, (err, response) => { - // if (err) { - // console.log(err.message); - // alert('Error getting new address: ' + err.message); - // return; - // } - // console.log(response); - // console.log(response.getAddress()); - // // goToProfilePage(response.getProfileId()); - // - // setAddress(response.getAddress()); - // }); - lndNewAddress((response) => { + lndNewAddressRequest((response) => { setAddress(response.getAddress()); }); }; diff --git a/frontend/squeak-node-frontend/src/pages/buy/Buy.js b/frontend/squeak-node-frontend/src/pages/buy/Buy.js index 1475f5f3..cafe9d13 100644 --- a/frontend/squeak-node-frontend/src/pages/buy/Buy.js +++ b/frontend/squeak-node-frontend/src/pages/buy/Buy.js @@ -21,7 +21,7 @@ import MakeSqueakDialog from "../../components/MakeSqueakDialog"; import DeleteSqueakDialog from "../../components/DeleteSqueakDialog"; import { - getBuyOffers, + getBuyOffersRequest, } from "../../squeakclient/requests" @@ -32,7 +32,7 @@ export default function BuyPage() { const [offers, setOffers] = useState([]); const getOffers = (hash) => { - getBuyOffers(hash, setOffers); + getBuyOffersRequest(hash, setOffers); }; const goToOfferPage = (offerId) => { diff --git a/frontend/squeak-node-frontend/src/pages/channel/Channel.js b/frontend/squeak-node-frontend/src/pages/channel/Channel.js index b20f614e..375a9b1b 100644 --- a/frontend/squeak-node-frontend/src/pages/channel/Channel.js +++ b/frontend/squeak-node-frontend/src/pages/channel/Channel.js @@ -35,9 +35,9 @@ import CloseChannelDialog from "../../components/CloseChannelDialog"; import ChannelItem from "../../components/ChannelItem"; import { - lndListPeers, - lndListChannels, - lndPendingChannels, + lndListPeersRequest, + lndListChannelsRequest, + lndPendingChannelsRequest, } from "../../squeakclient/requests" @@ -85,11 +85,11 @@ export default function LightningNodePage() { }; const listPeers = () => { - lndListPeers(setPeers); + lndListPeersRequest(setPeers); }; const listChannels = () => { - lndListChannels(setChannels); + lndListChannelsRequest(setChannels); }; const handleClickCloseChannel = () => { diff --git a/frontend/squeak-node-frontend/src/pages/lightningnode/LightningNode.js b/frontend/squeak-node-frontend/src/pages/lightningnode/LightningNode.js index f783734c..88030a36 100644 --- a/frontend/squeak-node-frontend/src/pages/lightningnode/LightningNode.js +++ b/frontend/squeak-node-frontend/src/pages/lightningnode/LightningNode.js @@ -39,11 +39,11 @@ import { lndGetInfo, lndWalletBalance, lndGetTransactions, - lndListPeers, - lndListChannels, - lndPendingChannels, - lndConnectPeer, - lndDisconnectPeer, + lndListPeersRequest, + lndListChannelsRequest, + lndPendingChannelsRequest, + lndConnectPeerRequest, + lndDisconnectPeerRequest, } from "../../squeakclient/requests" export default function LightningNodePage() { @@ -114,21 +114,21 @@ export default function LightningNodePage() { }; const listPeers = () => { - lndListPeers(setPeers); + lndListPeersRequest(setPeers); }; const listChannels = () => { - lndListChannels(setChannels); + lndListChannelsRequest(setChannels); }; const getPendingChannels = () => { - lndPendingChannels(setPendingChannels); + lndPendingChannelsRequest(setPendingChannels); }; const connectPeer = (pubkey, host) => { - lndConnectPeer(pubkey, host, () => { + lndConnectPeerRequest(pubkey, host, () => { reloadRoute(); }); }; const disconnectPeer = (pubkey) => { - lndDisconnectPeer(pubkey, () => { + lndDisconnectPeerRequest(pubkey, () => { reloadRoute(); }); }; diff --git a/frontend/squeak-node-frontend/src/pages/offer/Offer.js b/frontend/squeak-node-frontend/src/pages/offer/Offer.js index cc46042e..d2018e46 100644 --- a/frontend/squeak-node-frontend/src/pages/offer/Offer.js +++ b/frontend/squeak-node-frontend/src/pages/offer/Offer.js @@ -21,7 +21,7 @@ import MakeSqueakDialog from "../../components/MakeSqueakDialog"; import DeleteSqueakDialog from "../../components/DeleteSqueakDialog"; import { - getBuyOffer, + getBuyOfferRequest, } from "../../squeakclient/requests" @@ -32,7 +32,7 @@ export default function OfferPage() { const [offer, setOffer] = useState(null); const getOffer = (offerId) => { - getBuyOffer(offerId, setOffer); + getBuyOfferRequest(offerId, setOffer); }; useEffect(()=>{ diff --git a/frontend/squeak-node-frontend/src/pages/peer/Peer.js b/frontend/squeak-node-frontend/src/pages/peer/Peer.js index 85f8f02d..18c8b070 100644 --- a/frontend/squeak-node-frontend/src/pages/peer/Peer.js +++ b/frontend/squeak-node-frontend/src/pages/peer/Peer.js @@ -20,9 +20,9 @@ import Widget from "../../components/Widget"; import DeletePeerDialog from "../../components/DeletePeerDialog"; import { - getPeer, - setPeerDownloading, - setPeerUploading, + getPeerRequest, + setPeerDownloadingRequest, + setPeerUploadingRequest, } from "../../squeakclient/requests" @@ -34,15 +34,15 @@ export default function PeerPage() { const [deleteDialogOpen, setDeleteDialogOpen] = useState(false); const getSqueakPeer = (id) => { - getPeer(id, setPeer); + getPeerRequest(id, setPeer); }; const setDownloading = (id, downloading) => { - setPeerDownloading(id, downloading, () => { + setPeerDownloadingRequest(id, downloading, () => { getSqueakPeer(id); }); }; const setUploading = (id, uploading) => { - setPeerUploading(id, uploading, () => { + setPeerUploadingRequest(id, uploading, () => { getSqueakPeer(id); }); }; diff --git a/frontend/squeak-node-frontend/src/pages/peers/Peers.js b/frontend/squeak-node-frontend/src/pages/peers/Peers.js index 048a90c0..7d364d62 100644 --- a/frontend/squeak-node-frontend/src/pages/peers/Peers.js +++ b/frontend/squeak-node-frontend/src/pages/peers/Peers.js @@ -25,7 +25,7 @@ import CreatePeerDialog from "../../components/CreatePeerDialog"; import mock from "../dashboard/mock"; import { - getPeers, + getPeersRequest, } from "../../squeakclient/requests" @@ -51,7 +51,7 @@ export default function Peers() { } const getSqueakPeers = () => { - getPeers(setPeers); + getPeersRequest(setPeers); }; const goToPeerPage = (id) => { diff --git a/frontend/squeak-node-frontend/src/pages/profile/Profile.js b/frontend/squeak-node-frontend/src/pages/profile/Profile.js index f93820a7..f5159a78 100644 --- a/frontend/squeak-node-frontend/src/pages/profile/Profile.js +++ b/frontend/squeak-node-frontend/src/pages/profile/Profile.js @@ -20,10 +20,10 @@ import Widget from "../../components/Widget"; import DeleteProfileDialog from "../../components/DeleteProfileDialog"; import { - getSqueakProfile, - setSqueakProfileFollowing, - setSqueakProfileSharing, - setSqueakProfileWhitelisted, + getSqueakProfileRequest, + setSqueakProfileFollowingRequest, + setSqueakProfileSharingRequest, + setSqueakProfileWhitelistedRequest, } from "../../squeakclient/requests" @@ -34,28 +34,28 @@ export default function ProfilePage() { const [deleteDialogOpen, setDeleteDialogOpen] = useState(false); - const updateSqueakProfile = (id) => { - getSqueakProfile(id, setSqueakProfile); + const getSqueakProfile = (id) => { + getSqueakProfileRequest(id, setSqueakProfile); }; const setFollowing = (id, following) => { - setSqueakProfileFollowing(id, following, () => { - updateSqueakProfile(id); + setSqueakProfileFollowingRequest(id, following, () => { + getSqueakProfile(id); }) }; const setSharing = (id, sharing) => { - setSqueakProfileSharing(id, sharing, () => { - updateSqueakProfile(id); + setSqueakProfileSharingRequest(id, sharing, () => { + getSqueakProfile(id); }) }; const setWhitelisted = (id, whitelisted) => { - setSqueakProfileWhitelisted(id, whitelisted, () => { - updateSqueakProfile(id); + setSqueakProfileWhitelistedRequest(id, whitelisted, () => { + getSqueakProfile(id); }) }; useEffect(()=>{ - updateSqueakProfile(id) + getSqueakProfile(id) },[id]); const handleClickOpenDeleteDialog = () => { diff --git a/frontend/squeak-node-frontend/src/pages/profiles/Profiles.js b/frontend/squeak-node-frontend/src/pages/profiles/Profiles.js index b31404cd..db3d9e33 100644 --- a/frontend/squeak-node-frontend/src/pages/profiles/Profiles.js +++ b/frontend/squeak-node-frontend/src/pages/profiles/Profiles.js @@ -26,8 +26,8 @@ import CreateContactProfileDialog from "../../components/CreateContactProfileDia import mock from "../dashboard/mock"; import { - getSigningProfiles, - getContactProfiles, + getSigningProfilesRequest, + getContactProfilesRequest, } from "../../squeakclient/requests" @@ -60,10 +60,10 @@ export default function Profiles() { }; const loadSigningProfiles = () => { - getSigningProfiles(setSigningProfiles); + getSigningProfilesRequest(setSigningProfiles); }; const loadContactProfiles = () => { - getContactProfiles(setContactProfiles); + getContactProfilesRequest(setContactProfiles); }; const goToSqueakAddressPage = (squeakAddress) => { diff --git a/frontend/squeak-node-frontend/src/pages/squeak/Squeak.js b/frontend/squeak-node-frontend/src/pages/squeak/Squeak.js index d4c16729..1a692145 100644 --- a/frontend/squeak-node-frontend/src/pages/squeak/Squeak.js +++ b/frontend/squeak-node-frontend/src/pages/squeak/Squeak.js @@ -20,8 +20,8 @@ import MakeSqueakDialog from "../../components/MakeSqueakDialog"; import DeleteSqueakDialog from "../../components/DeleteSqueakDialog"; import { - getSqueakDisplay, - getAncestorSqueakDisplays, + getSqueakDisplayRequest, + getAncestorSqueakDisplaysRequest, } from "../../squeakclient/requests" @@ -35,10 +35,10 @@ export default function SqueakPage() { const [deleteDialogOpen, setDeleteDialogOpen] = useState(false); const getSqueak = (hash) => { - getSqueakDisplay(hash, setSqueak); + getSqueakDisplayRequest(hash, setSqueak); }; const getAncestorSqueaks = (hash) => { - getAncestorSqueakDisplays(hash, setAncestorSqueaks); + getAncestorSqueakDisplaysRequest(hash, setAncestorSqueaks); }; const handleClickOpen = () => { diff --git a/frontend/squeak-node-frontend/src/pages/squeakaddress/SqueakAddress.js b/frontend/squeak-node-frontend/src/pages/squeakaddress/SqueakAddress.js index 7b0a7ae5..1c49edf1 100644 --- a/frontend/squeak-node-frontend/src/pages/squeakaddress/SqueakAddress.js +++ b/frontend/squeak-node-frontend/src/pages/squeakaddress/SqueakAddress.js @@ -17,8 +17,8 @@ import SqueakThreadItem from "../../components/SqueakThreadItem"; import CreateContactProfileDialog from "../../components/CreateContactProfileDialog"; import { - getSqueakProfileByAddress, - getAddressSqueakDisplays, + getSqueakProfileByAddressRequest, + getAddressSqueakDisplaysRequest, } from "../../squeakclient/requests" @@ -31,10 +31,10 @@ export default function SqueakAddressPage() { const [createContactProfileDialogOpen, setCreateContactProfileDialogOpen] = useState(false); const getSqueakProfile = (address) => { - getSqueakProfileByAddress(address, setSqueakProfile); + getSqueakProfileByAddressRequest(address, setSqueakProfile); }; const getSqueaks = (address) => { - getAddressSqueakDisplays(address, setSqueaks); + getAddressSqueakDisplaysRequest(address, setSqueaks); }; const goToCreateProfilePage = (profileId) => { diff --git a/frontend/squeak-node-frontend/src/pages/timeline/Timeline.js b/frontend/squeak-node-frontend/src/pages/timeline/Timeline.js index 3b51b2ee..39510327 100644 --- a/frontend/squeak-node-frontend/src/pages/timeline/Timeline.js +++ b/frontend/squeak-node-frontend/src/pages/timeline/Timeline.js @@ -33,7 +33,7 @@ import SqueakThreadItem from "../../components/SqueakThreadItem"; import { Typography } from "../../components/Wrappers"; import MakeSqueakDialog from "../../components/MakeSqueakDialog"; -import { getFollowedSqueakDisplays } from "../../squeakclient/requests" +import { getFollowedSqueakDisplaysRequest } from "../../squeakclient/requests" export default function TimelinePage() { @@ -44,7 +44,7 @@ export default function TimelinePage() { const history = useHistory(); const getSqueaks = () => { - getFollowedSqueakDisplays(setSqueaks); + getFollowedSqueakDisplaysRequest(setSqueaks); }; const goToSqueakAddressPage = (squeakAddress) => { diff --git a/frontend/squeak-node-frontend/src/pages/wallet/Wallet.js b/frontend/squeak-node-frontend/src/pages/wallet/Wallet.js index 5d426ece..5fbd51c9 100644 --- a/frontend/squeak-node-frontend/src/pages/wallet/Wallet.js +++ b/frontend/squeak-node-frontend/src/pages/wallet/Wallet.js @@ -38,12 +38,12 @@ import ChannelItem from "../../components/ChannelItem"; import PendingOpenChannelItem from "../../components/PendingOpenChannelItem"; import { - lndGetInfo, - lndWalletBalance, - lndGetTransactions, - lndListPeers, - lndListChannels, - lndPendingChannels, + lndGetInfoRequest, + lndWalletBalanceRequest, + lndGetTransactionsRequest, + lndListPeersRequest, + lndListChannelsRequest, + lndPendingChannelsRequest, } from "../../squeakclient/requests" export default function WalletPage() { @@ -79,22 +79,22 @@ export default function WalletPage() { }; const getLndInfo = () => { - lndGetInfo(setLndInfo); + lndGetInfoRequest(setLndInfo); }; const getWalletBalance = () => { - lndWalletBalance(setWalletBalance); + lndWalletBalanceRequest(setWalletBalance); }; const getTransactions = () => { - lndGetTransactions(setTransactions) + lndGetTransactionsRequest(setTransactions) }; const listPeers = () => { - lndListPeers(setPeers); + lndListPeersRequest(setPeers); }; const listChannels = () => { - lndListChannels(setChannels); + lndListChannelsRequest(setChannels); }; const getPendingChannels = () => { - lndPendingChannels(setPendingChannels); + lndPendingChannelsRequest(setPendingChannels); }; useEffect(()=>{ diff --git a/frontend/squeak-node-frontend/src/squeakclient/requests.js b/frontend/squeak-node-frontend/src/squeakclient/requests.js index 2ffb6ec5..f4048d68 100644 --- a/frontend/squeak-node-frontend/src/squeakclient/requests.js +++ b/frontend/squeak-node-frontend/src/squeakclient/requests.js @@ -44,533 +44,376 @@ import { } from "../proto/squeak_admin_pb" -export function getFollowedSqueakDisplays(handleResponse) { - console.log("called getSqueaks with handleResponse"); - var getFollowedSqueakDisplaysRequest = new GetFollowedSqueakDisplaysRequest(); - client.getFollowedSqueakDisplays(getFollowedSqueakDisplaysRequest, {}, (err, response) => { - console.log(response); +export function getFollowedSqueakDisplaysRequest(handleResponse) { + var request = new GetFollowedSqueakDisplaysRequest(); + client.getFollowedSqueakDisplays(request, {}, (err, response) => { handleResponse(response.getSqueakDisplayEntriesList()) }); }; -export function lndGetInfo(handleResponse) { - console.log("called lndGetInfo"); - var getInfoRequest = new GetInfoRequest(); - console.log(getInfoRequest); - client.lndGetInfo(getInfoRequest, {}, (err, response) => { - console.log(response); +export function lndGetInfoRequest(handleResponse) { + var request = new GetInfoRequest(); + client.lndGetInfo(request, {}, (err, response) => { handleResponse(response); }); }; -export function lndWalletBalance(handleResponse) { - console.log("called lndWalletBalanceRequest"); - var walletBalanceRequest = new WalletBalanceRequest(); - console.log(walletBalanceRequest); - client.lndWalletBalance(walletBalanceRequest, {}, (err, response) => { - console.log(response); +export function lndWalletBalanceRequest(handleResponse) { + var request = new WalletBalanceRequest(); + client.lndWalletBalance(request, {}, (err, response) => { handleResponse(response); }); }; -export function lndGetTransactions(handleResponse) { - console.log("called lndGetTransactions"); - var getTransactionsRequest = new GetTransactionsRequest(); - console.log(getTransactionsRequest); - client.lndGetTransactions(getTransactionsRequest, {}, (err, response) => { - console.log(response); - console.log("response.getTransactionsList()"); - console.log(response.getTransactionsList()); +export function lndGetTransactionsRequest(handleResponse) { + var request = new GetTransactionsRequest(); + client.lndGetTransactions(request, {}, (err, response) => { handleResponse(response.getTransactionsList()); }); }; -export function lndListPeers(handleResponse) { - console.log("called listPeers"); - var listPeersRequest = new ListPeersRequest(); - console.log(listPeersRequest); - client.lndListPeers(listPeersRequest, {}, (err, response) => { - console.log(response); - console.log("response.getPeersList()"); - console.log(response.getPeersList()); +export function lndListPeersRequest(handleResponse) { + var request = new ListPeersRequest(); + client.lndListPeers(request, {}, (err, response) => { handleResponse(response.getPeersList()); }); }; -export function lndListChannels(handleResponse) { - console.log("called lndListChannels"); - var listChannelsRequest = new ListChannelsRequest(); - console.log(listChannelsRequest); - client.lndListChannels(listChannelsRequest, {}, (err, response) => { +export function lndListChannelsRequest(handleResponse) { + var request = new ListChannelsRequest(); + client.lndListChannels(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error getting channels: ' + err.message); return; } - console.log(response); - console.log("response.getChannelsList()"); - console.log(response.getChannelsList()); handleResponse(response.getChannelsList()); }); }; -export function lndPendingChannels(handleResponse) { - console.log("called lndPendingChannels"); - var pendingChannelsRequest = new PendingChannelsRequest(); - console.log(pendingChannelsRequest); - client.lndPendingChannels(pendingChannelsRequest, {}, (err, response) => { +export function lndPendingChannelsRequest(handleResponse) { + var request = new PendingChannelsRequest(); + client.lndPendingChannels(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error getting pending channels: ' + err.message); return; } - console.log(response); handleResponse(response); }); }; -export function getSqueakProfile(id, handleResponse) { - console.log("called getSqueakProfile with profileId: " + id); - var getSqueakProfileRequest = new GetSqueakProfileRequest(); - getSqueakProfileRequest.setProfileId(id); - console.log(getSqueakProfileRequest); - client.getSqueakProfile(getSqueakProfileRequest, {}, (err, response) => { +export function getSqueakProfileRequest(id, handleResponse) { + var request = new GetSqueakProfileRequest(); + request.setProfileId(id); + client.getSqueakProfile(request, {}, (err, response) => { if (err) { - console.log(err.message); return; } - console.log(response); handleResponse(response.getSqueakProfile()) }); }; -export function setSqueakProfileFollowing(id, following, handleResponse) { - console.log("called setFollowing with profileId: " + id + ", following: " + following); - var setSqueakProfileFollowingRequest = new SetSqueakProfileFollowingRequest(); - setSqueakProfileFollowingRequest.setProfileId(id); - setSqueakProfileFollowingRequest.setFollowing(following); - console.log(setSqueakProfileFollowingRequest); - client.setSqueakProfileFollowing(setSqueakProfileFollowingRequest, {}, (err, response) => { - console.log(response); +export function setSqueakProfileFollowingRequest(id, following, handleResponse) { + var request = new SetSqueakProfileFollowingRequest(); + request.setProfileId(id); + request.setFollowing(following); + client.setSqueakProfileFollowing(request, {}, (err, response) => { handleResponse(response); }); }; -export function setSqueakProfileSharing(id, sharing, handleResponse) { - console.log("called setSharing with profileId: " + id + ", sharing: " + sharing); - var setSqueakProfileSharingRequest = new SetSqueakProfileSharingRequest(); - setSqueakProfileSharingRequest.setProfileId(id); - setSqueakProfileSharingRequest.setSharing(sharing); - console.log(setSqueakProfileSharingRequest); - client.setSqueakProfileSharing(setSqueakProfileSharingRequest, {}, (err, response) => { - console.log(response); +export function setSqueakProfileSharingRequest(id, sharing, handleResponse) { + var request = new SetSqueakProfileSharingRequest(); + request.setProfileId(id); + request.setSharing(sharing); + client.setSqueakProfileSharing(request, {}, (err, response) => { handleResponse(response); }); }; -export function setSqueakProfileWhitelisted(id, whitelisted, handleResponse) { - console.log("called setWhitelisted with profileId: " + id + ", whitelisted: " + whitelisted); - var setSqueakProfileWhitelistedRequest = new SetSqueakProfileWhitelistedRequest() - setSqueakProfileWhitelistedRequest.setProfileId(id); - setSqueakProfileWhitelistedRequest.setWhitelisted(whitelisted); - console.log(setSqueakProfileWhitelistedRequest); - client.setSqueakProfileWhitelisted(setSqueakProfileWhitelistedRequest, {}, (err, response) => { - console.log(response); +export function setSqueakProfileWhitelistedRequest(id, whitelisted, handleResponse) { + var request = new SetSqueakProfileWhitelistedRequest() + request.setProfileId(id); + request.setWhitelisted(whitelisted); + client.setSqueakProfileWhitelisted(request, {}, (err, response) => { handleResponse(response); }); }; -export function lndConnectPeer(pubkey, host, handleResponse) { - console.log("called connectPeer"); - var connectPeerRequest = new ConnectPeerRequest() +export function lndConnectPeerRequest(pubkey, host, handleResponse) { + var request = new ConnectPeerRequest() var address = new LightningAddress(); address.setPubkey(pubkey); address.setHost(host); - connectPeerRequest.setAddr(address); - console.log(connectPeerRequest); - client.lndConnectPeer(connectPeerRequest, {}, (err, response) => { + request.setAddr(address); + client.lndConnectPeer(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error connecting peer: ' + err.message); return; } - console.log(response); handleResponse(response); }); }; -export function lndDisconnectPeer(pubkey, handleResponse) { - console.log("called disconnectPeer"); - var disconnectPeerRequest = new DisconnectPeerRequest() - disconnectPeerRequest.setPubKey(pubkey); - console.log(disconnectPeerRequest); - client.lndDisconnectPeer(disconnectPeerRequest, {}, (err, response) => { +export function lndDisconnectPeerRequest(pubkey, handleResponse) { + var request = new DisconnectPeerRequest() + request.setPubKey(pubkey); + client.lndDisconnectPeer(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error disconnecting peer: ' + err.message); return; } - console.log(response); handleResponse(response); }); }; -export function getPeers(handleResponse) { - console.log("called getPeers"); - var getPeersRequest = new GetPeersRequest(); - client.getPeers(getPeersRequest, {}, (err, response) => { +export function getPeersRequest(handleResponse) { + var request = new GetPeersRequest(); + client.getPeers(request, {}, (err, response) => { if (err) { - console.log(err.message); return; } - console.log(response); handleResponse(response.getSqueakPeersList()); }); }; -export function payOffer(offerId, handleResponse) { - console.log("called payOffer"); - var payOfferRequest = new PayOfferRequest(); - payOfferRequest.setOfferId(offerId); - console.log(payOfferRequest); - client.payOffer(payOfferRequest, {}, (err, response) => { +export function payOfferRequest(offerId, handleResponse, handleErr) { + var request = new PayOfferRequest(); + request.setOfferId(offerId); + client.payOffer(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error paying offer: ' + err.message); + handleErr(err); return; } - console.log(response); - //goToSqueakPage(offer.getSqueakHash()); handleResponse(response); }); }; -export function lndOpenChannelSync(pubkey, amount, handleResponse) { - console.log("called lndOpenChannelSync"); - var openChannelRequest = new OpenChannelRequest() - openChannelRequest.setNodePubkeyString(pubkey); - openChannelRequest.setLocalFundingAmount(amount); - console.log(openChannelRequest); - client.lndOpenChannelSync(openChannelRequest, {}, (err, response) => { +export function lndOpenChannelSyncRequest(pubkey, amount, handleResponse, handleErr) { + var request = new OpenChannelRequest() + request.setNodePubkeyString(pubkey); + request.setLocalFundingAmount(amount); + client.lndOpenChannelSync(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error opening channel: ' + err.message); + handleErr(err); return; } - console.log(response); - console.log(response.getFundingTxidStr()); - console.log(response.getOutputIndex()); - // goToProfilePage(response.getProfileId()); handleResponse(response); }); }; -export function lndCloseChannel(txId, outputIndex, handleResponse) { - console.log("called closeChannel"); - var closeChannelRequest = new CloseChannelRequest(); +export function lndCloseChannelRequest(txId, outputIndex, handleResponse, handleErr) { + var request = new CloseChannelRequest(); var channelPoint = new ChannelPoint(); channelPoint.setFundingTxidStr(txId); channelPoint.setOutputIndex(outputIndex); - closeChannelRequest.setChannelPoint(channelPoint); - console.log(closeChannelRequest); - client.lndCloseChannel(closeChannelRequest, {}, (err, response) => { + request.setChannelPoint(channelPoint); + client.lndCloseChannel(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error closing channel: ' + err.message); + handleErr(err); return; } - console.log(response); - // goToProfilePage(response.getProfileId()); handleResponse(response); }); }; -export function getBuyOffers(hash, handleResponse) { - var getBuyOffersRequest = new GetBuyOffersRequest(); - getBuyOffersRequest.setSqueakHash(hash); - console.log(getBuyOffersRequest); - client.getBuyOffers(getBuyOffersRequest, {}, (err, response) => { +export function getBuyOffersRequest(hash, handleResponse) { + var request = new GetBuyOffersRequest(); + request.setSqueakHash(hash); + client.getBuyOffers(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error getting offers: ' + err.message); return; } - console.log(response); - console.log(response.getOffersList()); handleResponse(response.getOffersList()); }); }; -export function getBuyOffer(offerId, handleResponse) { - console.log("Getting offer with offerId: " + offerId); - var getBuyOfferRequest = new GetBuyOfferRequest(); - getBuyOfferRequest.setOfferId(offerId); - console.log(getBuyOfferRequest); - client.getBuyOffer(getBuyOfferRequest, {}, (err, response) => { +export function getBuyOfferRequest(offerId, handleResponse) { + var request = new GetBuyOfferRequest(); + request.setOfferId(offerId); + client.getBuyOffer(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error getting offer: ' + err.message); return; } - console.log(response); - console.log(response.getOffer()); handleResponse(response.getOffer()) }); }; -export function getPeer(id, handleResponse) { - console.log("called getPeer with peerId: " + id); - var getPeerRequest = new GetPeerRequest(); - getPeerRequest.setPeerId(id); - console.log(getPeerRequest); - client.getPeer(getPeerRequest, {}, (err, response) => { +export function getPeerRequest(id, handleResponse) { + var request = new GetPeerRequest(); + request.setPeerId(id); + client.getPeer(request, {}, (err, response) => { if (err) { - console.log(err.message); return; } - console.log(response); handleResponse(response.getSqueakPeer()) }); }; -export function setPeerDownloading(id, downloading, handleResponse) { - console.log("called setDownloading with peerId: " + id + ", downloading: " + downloading); - var setPeerDownloadingRequest = new SetPeerDownloadingRequest(); - setPeerDownloadingRequest.setPeerId(id); - setPeerDownloadingRequest.setDownloading(downloading); - console.log(setPeerDownloadingRequest); - client.setPeerDownloading(setPeerDownloadingRequest, {}, (err, response) => { - console.log(response); +export function setPeerDownloadingRequest(id, downloading, handleResponse) { + var request = new SetPeerDownloadingRequest(); + request.setPeerId(id); + request.setDownloading(downloading); + client.setPeerDownloading(request, {}, (err, response) => { handleResponse(response); }); }; -export function setPeerUploading(id, uploading, handleResponse) { - console.log("called setUploading with peerId: " + id + ", uploading: " + uploading); - var setPeerUploadingRequest = new SetPeerUploadingRequest(); - setPeerUploadingRequest.setPeerId(id); - setPeerUploadingRequest.setUploading(uploading); - console.log(setPeerUploadingRequest); - client.setPeerUploading(setPeerUploadingRequest, {}, (err, response) => { - console.log(response); +export function setPeerUploadingRequest(id, uploading, handleResponse) { + var request = new SetPeerUploadingRequest(); + request.setPeerId(id); + request.setUploading(uploading); + client.setPeerUploading(request, {}, (err, response) => { handleResponse(response); }); }; -export function getSigningProfiles(handleResponse) { - console.log("called getSigningProfiles"); - var getSigningProfilesRequest = new GetSigningProfilesRequest(); - client.getSigningProfiles(getSigningProfilesRequest, {}, (err, response) => { +export function getSigningProfilesRequest(handleResponse) { + var request = new GetSigningProfilesRequest(); + client.getSigningProfiles(request, {}, (err, response) => { if (err) { - console.log(err.message); return; } - console.log(response); handleResponse(response.getSqueakProfilesList()); }); }; -export function getContactProfiles(handleResponse) { - console.log("called getContactProfiles"); - var getContactProfilesRequest = new GetContactProfilesRequest(); - client.getContactProfiles(getContactProfilesRequest, {}, (err, response) => { +export function getContactProfilesRequest(handleResponse) { + var request = new GetContactProfilesRequest(); + client.getContactProfiles(request, {}, (err, response) => { if (err) { - console.log(err.message); return; } - console.log(response); handleResponse(response.getSqueakProfilesList()); }); }; -export function makeSqueak(profileId, content, replyto, handleResponse) { - console.log("called makeSqueak"); - var makeSqueakRequest = new MakeSqueakRequest(); - makeSqueakRequest.setProfileId(profileId); - makeSqueakRequest.setContent(content); - makeSqueakRequest.setReplyto(replyto); - console.log(makeSqueakRequest); - client.makeSqueak(makeSqueakRequest, {}, (err, response) => { +export function makeSqueakRequest(profileId, content, replyto, handleResponse, handleErr) { + var request = new MakeSqueakRequest(); + request.setProfileId(profileId); + request.setContent(content); + request.setReplyto(replyto); + client.makeSqueak(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error making squeak: ' + err.message); + handleErr(err); return; } - console.log(response); handleResponse(response); }); }; -export function getSqueakDisplay(hash, handleResponse) { - var getSqueakDisplayRequest = new GetSqueakDisplayRequest(); - getSqueakDisplayRequest.setSqueakHash(hash); - console.log(getSqueakDisplayRequest); - client.getSqueakDisplay(getSqueakDisplayRequest, {}, (err, response) => { +export function getSqueakDisplayRequest(hash, handleResponse) { + var request = new GetSqueakDisplayRequest(); + request.setSqueakHash(hash); + client.getSqueakDisplay(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error getting squeak with hash: ' + err.message); return; } - console.log(response); - console.log(response.getSqueakDisplayEntry()); handleResponse(response.getSqueakDisplayEntry()) }); }; -export function getAncestorSqueakDisplays(hash, handleResponse) { - var getAncestorSqueakDisplaysRequest = new GetAncestorSqueakDisplaysRequest(); - getAncestorSqueakDisplaysRequest.setSqueakHash(hash); - console.log(getAncestorSqueakDisplaysRequest); - client.getAncestorSqueakDisplays(getAncestorSqueakDisplaysRequest, {}, (err, response) => { +export function getAncestorSqueakDisplaysRequest(hash, handleResponse) { + var request = new GetAncestorSqueakDisplaysRequest(); + request.setSqueakHash(hash); + client.getAncestorSqueakDisplays(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error getting ancestor squeaks for hash: ' + err.message); return; } - console.log(response); - console.log(response.getSqueakDisplayEntriesList()); handleResponse(response.getSqueakDisplayEntriesList()); }); }; -export function getSqueakProfileByAddress(address, handleResponse) { - var getSqueakProfileByAddressRequest = new GetSqueakProfileByAddressRequest(); - getSqueakProfileByAddressRequest.setAddress(address); - console.log(getSqueakProfileByAddressRequest); - client.getSqueakProfileByAddress(getSqueakProfileByAddressRequest, {}, (err, response) => { - console.log(response); +export function getSqueakProfileByAddressRequest(address, handleResponse) { + var request = new GetSqueakProfileByAddressRequest(); + request.setAddress(address); + client.getSqueakProfileByAddress(request, {}, (err, response) => { handleResponse(response.getSqueakProfile()); }); }; -export function getAddressSqueakDisplays(address, handleResponse) { - var getAddressSqueakDisplaysRequest = new GetAddressSqueakDisplaysRequest(); - getAddressSqueakDisplaysRequest.setAddress(address); - console.log(getAddressSqueakDisplaysRequest); - client.getAddressSqueakDisplays(getAddressSqueakDisplaysRequest, {}, (err, response) => { - console.log(response); - console.log(response.getSqueakDisplayEntriesList()); +export function getAddressSqueakDisplaysRequest(address, handleResponse) { + var request = new GetAddressSqueakDisplaysRequest(); + request.setAddress(address); + client.getAddressSqueakDisplays(request, {}, (err, response) => { handleResponse(response.getSqueakDisplayEntriesList()); }); }; -export function createContactProfile(profileName, squeakAddress, handleResponse) { - console.log("called createContactProfile"); - var createContactProfileRequest = new CreateContactProfileRequest(); - createContactProfileRequest.setProfileName(profileName); - createContactProfileRequest.setAddress(squeakAddress); - console.log(createContactProfileRequest); - client.createContactProfile(createContactProfileRequest, {}, (err, response) => { +export function createContactProfileRequest(profileName, squeakAddress, handleResponse, handleErr) { + var request = new CreateContactProfileRequest(); + request.setProfileName(profileName); + request.setAddress(squeakAddress); + client.createContactProfile(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error creating contact profile: ' + err.message); + handleErr(err); return; } - console.log(response); - console.log(response.getProfileId()); handleResponse(response); }); }; -export function createSigningProfile(profileName, handleResponse) { - console.log("called createSigningProfile"); - var createSigningProfileRequest = new CreateSigningProfileRequest(); - createSigningProfileRequest.setProfileName(profileName); - console.log(createSigningProfileRequest); - client.createSigningProfile(createSigningProfileRequest, {}, (err, response) => { +export function createSigningProfileRequest(profileName, handleResponse, handleErr) { + var request = new CreateSigningProfileRequest(); + request.setProfileName(profileName); + client.createSigningProfile(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error creating signing profile: ' + err.message); + handleErr(err); return; } - console.log(response); - console.log(response.getProfileId()); handleResponse(response); }); }; -export function createPeer(peerName, host, port, handleResponse) { - console.log("called createPeer"); - var createPeerRequest = new CreatePeerRequest(); - createPeerRequest.setPeerName(peerName); - createPeerRequest.setHost(host); - createPeerRequest.setPort(port); - console.log(createPeerRequest); - client.createPeer(createPeerRequest, {}, (err, response) => { +export function createPeerRequest(peerName, host, port, handleResponse) { + var request = new CreatePeerRequest(); + request.setPeerName(peerName); + request.setHost(host); + request.setPort(port); + client.createPeer(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error creating peer: ' + err.message); return; } - console.log(response); - console.log(response.getPeerId()); handleResponse(response); }); }; -export function deletePeer(peerId, handleResponse) { - console.log("called deletePeer"); - var deletePeerRequest = new DeletePeerRequest(); - deletePeerRequest.setPeerId(peerId); - console.log(deletePeerRequest); - client.deletePeer(deletePeerRequest, {}, (err, response) => { +export function deletePeerRequest(peerId, handleResponse) { + var request = new DeletePeerRequest(); + request.setPeerId(peerId); + client.deletePeer(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error deleting peer: ' + err.message); return; } - console.log(response); handleResponse(response); }); }; -export function deleteProfile(profileId, handleResponse) { - console.log("called deleteSqueak"); - var deleteSqueakProfileRequest = new DeleteSqueakProfileRequest(); - deleteSqueakProfileRequest.setProfileId(profileId); - console.log(deleteSqueakProfileRequest); - client.deleteSqueakProfile(deleteSqueakProfileRequest, {}, (err, response) => { +export function deleteProfileRequest(profileId, handleResponse) { + var request = new DeleteSqueakProfileRequest(); + request.setProfileId(profileId); + client.deleteSqueakProfile(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error deleting profile: ' + err.message); return; } - console.log(response); handleResponse(response); }); }; -export function deleteSqueak(squeakHash, handleResponse) { - console.log("called deleteSqueak"); - var deleteSqueakRequest = new DeleteSqueakRequest(); - deleteSqueakRequest.setSqueakHash(squeakHash); - console.log(deleteSqueakRequest); - client.deleteSqueak(deleteSqueakRequest, {}, (err, response) => { +export function deleteSqueakRequest(squeakHash, handleResponse) { + var request = new DeleteSqueakRequest(); + request.setSqueakHash(squeakHash); + client.deleteSqueak(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error deleting squeak: ' + err.message); return; } - console.log(response); handleResponse(response); }); }; -export function lndNewAddress(handleResponse) { - console.log("called newAddress"); - var newAddressRequest = new NewAddressRequest(); - console.log(newAddressRequest); - client.lndNewAddress(newAddressRequest, {}, (err, response) => { +export function lndNewAddressRequest(handleResponse) { + var request = new NewAddressRequest(); + client.lndNewAddress(request, {}, (err, response) => { if (err) { - console.log(err.message); - alert('Error getting new address: ' + err.message); return; } - console.log(response); - console.log(response.getAddress()); - // goToProfilePage(response.getProfileId()); handleResponse(response); }); };