Remove unnecessary functions

Author: DaniRumpi

src/txFactory/publicKeyRegistryTransactionFactory.ts

@@ -156,42 +156,12 @@ export function getPublicKeyStatusHash(web3, did, publicKeyHash) {
   return transaction
 }
 
-/**
- * THIS METHOD WILL BE DEPREATED
- * @param web3
- * @param did
- * @param publicKey
- */
-export function getPublicKeyStatusDecodedAsJSON(
-  web3,
-  did,
-  publicKey
-): Promise<PublicKeyStatus> {
-  const publicKeyStatusTx = getPublicKeyStatus(web3, did, publicKey)
-
-  return new Promise((resolve) => {
-    web3.eth.call(publicKeyStatusTx).then((data) => {
-      const publicKeyStatusDecoded = web3.eth.abi.decodeParameters(
-        ['bool', 'uint8', 'uint', 'uint'],
-        data
-      )
-      const publicKeyStatusDecodedAsJSON = {
-        exists: publicKeyStatusDecoded['0'],
-        status: publicKeyStatusDecoded['1'],
-        startDate: parseInt(publicKeyStatusDecoded['2']),
-        endDate: parseInt(publicKeyStatusDecoded['3'])
-      }
-      resolve(publicKeyStatusDecodedAsJSON)
-    })
-  })
-}
-
 /**
  * @param web3
  * @param did
  * @param publicKeyHash
  */
-export function getPublicKeyStatusDecodedAsJSONHash(
+export function getPublicKeyStatusDecodedAsJSON(
   web3,
   did,
   publicKeyHash
@@ -215,45 +185,13 @@ export function getPublicKeyStatusDecodedAsJSONHash(
   })
 }
 
-/**
- * THIS METHOD WILL BE DEPREATED
- * @param web3
- * @param did
- * @param publicKey
- * @param date in milliseconds
- */
-export function isPublicKeyValidForDate(web3, did, publicKey, date) {
-  publicKey = AddressUtils.getAddressWithHexPrefix(publicKey)
-  return new Promise((resolve, reject) => {
-    transactionFactory.publicKeyRegistry
-      .getPublicKeyStatusDecodedAsJSON(web3, did, publicKey)
-      .then((publicKeyStatusAsJSON) => {
-        const existsPublicKey = publicKeyStatusAsJSON.exists
-
-        if (existsPublicKey) {
-          const isUserDateBetweenDates = _isUserDateBetweeenDates(
-            date,
-            publicKeyStatusAsJSON.startDate,
-            publicKeyStatusAsJSON.endDate
-          )
-          resolve(isUserDateBetweenDates)
-        } else {
-          reject(new Error('Public key does not exist'))
-        }
-      })
-      .catch(() => {
-        reject(new Error('Unresolved error'))
-      })
-  })
-}
-
 /**
  * @param web3
  * @param did
  * @param publicKeyHash
  * @param date in milliseconds
  */
-export function isPublicKeyValidForDateHash(web3, did, publicKeyHash, date) {
+export function isPublicKeyValidForDate(web3, did, publicKeyHash, date) {
   publicKeyHash = AddressUtils.getAddressWithHexPrefix(publicKeyHash)
   return new Promise((resolve, reject) => {
     transactionFactory.publicKeyRegistry

src/txFactory/transactionFactory.ts

@@ -54,9 +54,7 @@ import {
   getPublicKeyStatus,
   getPublicKeyStatusHash,
   getPublicKeyStatusDecodedAsJSON,
-  getPublicKeyStatusDecodedAsJSONHash,
   isPublicKeyValidForDate,
-  isPublicKeyValidForDateHash,
 } from './publicKeyRegistryTransactionFactory'
 
 export const transactionFactory = {
@@ -112,8 +110,6 @@ export const transactionFactory = {
     getPublicKeyStatus: getPublicKeyStatus,
     getPublicKeyStatusHash: getPublicKeyStatusHash,
     getPublicKeyStatusDecodedAsJSON: getPublicKeyStatusDecodedAsJSON,
-    getPublicKeyStatusDecodedAsJSONHash: getPublicKeyStatusDecodedAsJSONHash,
     isPublicKeyValidForDate: isPublicKeyValidForDate,
-    isPublicKeyValidForDateHash: isPublicKeyValidForDateHash
   }
 }