status-im/dappconnect-voting-sdk
2
0
Fork 0
mirror of https://github.com/status-im/dappconnect-voting-sdk.git synced 2025-02-03 06:23:43 +00:00
Code Issues Projects Releases Wiki Activity

Refactor core functions (#14)

Browse Source
This commit is contained in:
Szymon Szlachtowicz 2021-08-16 16:11:22 +02:00 committed by GitHub
parent 54e1ca8ca2
commit 25b6e744ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/core/src/index.ts
View File

@ -8,16 +8,13 @@ import { WakuMessage } from 'js-waku'
import { TimedPollVoteMsg } from './models/TimedPollVoteMsg'
import TimedPollVote from './utils/proto/TimedPollVote'
import { DetailedTimedPoll } from './models/DetailedTimedPoll'
import { isTruthy } from './utils'
function decodeWakuMessages<T>(
messages: WakuMessage[] | null | undefined,
decoder: { decode: (payload: Uint8Array | undefined, timestamp: Date | undefined) => T | undefined }
decode: (payload: Uint8Array | undefined, timestamp: Date | undefined) => T | undefined
) {
return (
messages
?.map((msg) => decoder.decode(msg.payload, msg.timestamp))
.filter((poll: T | undefined): poll is T => !!poll) ?? []
)
return messages?.map((msg) => decode(msg.payload, msg.timestamp)).filter(isTruthy) ?? []
}
async function receiveNewWakuMessages(lastTimestamp: number, topic: string, waku: Waku | undefined) {
@ -94,7 +91,7 @@ class WakuVoting {
const lastTimestamp = this.timedPollInitMessages?.[0]?.timestamp ?? 0
const newMessages = await receiveNewWakuMessages(lastTimestamp, this.pollInitTopic, this.waku)
const newPollInitMessages = decodeWakuMessages(newMessages, PollInit)
const newPollInitMessages = decodeWakuMessages(newMessages, PollInit.decode)
if (newPollInitMessages.length > 0) {
this.timedPollInitMessages = [...newPollInitMessages, ...this.timedPollInitMessages]
}
@ -123,7 +120,7 @@ class WakuVoting {
const lastTimestamp = this.timedPollVotesMessages?.[0]?.timestamp ?? 0
const newMessages = await receiveNewWakuMessages(lastTimestamp, this.timedPollVoteTopic, this.waku)
const newVoteMessages = decodeWakuMessages(newMessages, TimedPollVote)
const newVoteMessages = decodeWakuMessages(newMessages, TimedPollVote.decode)
if (newVoteMessages.length > 0) {
this.timedPollVotesMessages = [...newVoteMessages, ...this.timedPollVotesMessages]
}

3
packages/core/src/utils/index.ts Normal file
View File

@ -0,0 +1,3 @@
export function isTruthy<T>(e: T | undefined | null): e is T {
return !!e
}

2
packages/core/test/models/PollInitMsg.test.ts
View File

@ -1,5 +1,5 @@
import { expect } from 'chai'
import { createSignMsgParams, PollInitMsg } from '../../src/models/PollInitMsg'
import { PollInitMsg } from '../../src/models/PollInitMsg'
import { MockProvider } from 'ethereum-waffle'
import { PollType } from '../../src/types/PollType'
import { BigNumber } from 'ethers'