Skip to content

fix: Import declaration conflicts with local declaration #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2019
Merged

fix: Import declaration conflicts with local declaration #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions modules/material-management-browser/src/browser_cryptographic_materials_manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import {
WebCryptoMaterialsManager, EncryptionRequest, // eslint-disable-line no-unused-vars
DecryptionRequest, EncryptionContext, // eslint-disable-line no-unused-vars
EncryptionMaterial, DecryptionMaterial, // eslint-disable-line no-unused-vars
WebCryptoAlgorithmSuite, WebCryptoEncryptionMaterial,
WebCryptoDecryptionMaterial, SignatureKey, needs, readOnlyProperty,
VerificationKey, AlgorithmSuiteIdentifier, immutableBaseClass,
Expand All @@ -29,8 +28,6 @@ import { fromBase64, toBase64 } from '@aws-sdk/util-base64-browser'

export type WebCryptoEncryptionRequest = EncryptionRequest<WebCryptoAlgorithmSuite>
export type WebCryptoDecryptionRequest = DecryptionRequest<WebCryptoAlgorithmSuite>
export type WebCryptoEncryptionMaterial = EncryptionMaterial<WebCryptoAlgorithmSuite>
export type WebCryptoDecryptionMaterial = DecryptionMaterial<WebCryptoAlgorithmSuite>
export type WebCryptoGetEncryptionMaterials = GetEncryptionMaterials<WebCryptoAlgorithmSuite>
export type WebCryptoGetDecryptMaterials = GetDecryptMaterials<WebCryptoAlgorithmSuite>

Expand Down
3 changes: 0 additions & 3 deletions modules/material-management-node/src/node_cryptographic_materials_manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

import {
NodeMaterialsManager, EncryptionRequest, DecryptionRequest, EncryptionContext, // eslint-disable-line no-unused-vars
EncryptionMaterial, DecryptionMaterial, // eslint-disable-line no-unused-vars
NodeAlgorithmSuite, NodeEncryptionMaterial, NodeDecryptionMaterial, SignatureKey,
needs, VerificationKey, AlgorithmSuiteIdentifier,
immutableClass, readOnlyProperty, KeyringNode,
Expand All @@ -28,8 +27,6 @@ import { createECDH } from 'crypto'

export type NodeEncryptionRequest = EncryptionRequest<NodeAlgorithmSuite>
export type NodeDecryptionRequest = DecryptionRequest<NodeAlgorithmSuite>
export type NodeEncryptionMaterial = EncryptionMaterial<NodeAlgorithmSuite>
export type NodeDecryptionMaterial = DecryptionMaterial<NodeAlgorithmSuite>
export type NodeGetEncryptionMaterials = GetEncryptionMaterials<NodeAlgorithmSuite>
export type NodeGetDecryptMaterials = GetDecryptMaterials<NodeAlgorithmSuite>

Expand Down