Skip to content

Commit

Permalink
chore: resolve rebase issues
Browse files Browse the repository at this point in the history
  • Loading branch information
rygine committed Mar 13, 2024
1 parent 26f3a90 commit 5d76d3f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion test/conversations/Conversation.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { DecodedMessage, MessageV1, MessageV2 } from '@/Message'
import type { MessageV2 } from '@/Message'
import { DecodedMessage, MessageV1 } from '@/Message'
import { buildDirectMessageTopic } from '@/utils/topic'
import { SortDirection } from '@/ApiClient'
import { sleep } from '@/utils/async'
Expand Down
4 changes: 2 additions & 2 deletions test/crypto/encryption.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import {
hkdfHmacKey,
verifyHmacSignature,
generateHmacSignature,
} from '../../src/crypto/encryption'
import crypto from '../../src/crypto/crypto'
} from '@/crypto/encryption'
import crypto from '@/crypto/crypto'

describe('HMAC encryption', () => {
it('generates and validates HMAC', async () => {
Expand Down

0 comments on commit 5d76d3f

Please sign in to comment.