From 395080340bc97778fc04d038568bd6eae5d2c90e Mon Sep 17 00:00:00 2001
From: Spencer Ofwiti <maxspencer56@gmail.com>
Date: Thu, 15 Apr 2021 11:12:20 +0300
Subject: [PATCH] Fix depenndency import.

---
 .../scripts/cic_meta/import_meta.js                  | 10 +++++-----
 .../scripts/cic_meta/import_meta_phone.js            | 12 ++++++------
 apps/contract-migration/scripts/package-lock.json    |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/apps/contract-migration/scripts/cic_meta/import_meta.js b/apps/contract-migration/scripts/cic_meta/import_meta.js
index 2d3a741f..fef853f1 100644
--- a/apps/contract-migration/scripts/cic_meta/import_meta.js
+++ b/apps/contract-migration/scripts/cic_meta/import_meta.js
@@ -3,11 +3,11 @@ const path = require('path');
 const http = require('http');
 
 const cic = require('cic-client-meta');
-import { Config, PGPKeyStore, PGPSigner, Syncable } from 'crdt-meta';
+const crdt = require('crdt-meta');
 
 //const conf = JSON.parse(fs.readFileSync('./cic.conf'));
 
-const config = new Config('./config');
+const config = new crdt.Config('./config');
 config.process();
 console.log(config);
 
@@ -42,7 +42,7 @@ function sendit(uid, envelope) {
 }
 
 function doOne(keystore, filePath) {
-	const signer = new PGPSigner(keystore);
+	const signer = new crdt.PGPSigner(keystore);
 	const parts = path.basename(filePath).split('.');
 	const ethereum_address = path.basename(parts[0]);
 
@@ -52,7 +52,7 @@ function doOne(keystore, filePath) {
 		//console.log(o);
 		fs.unlinkSync(filePath);
 
-		const s = new Syncable(uid, o);
+		const s = new crdt.Syncable(uid, o);
 		s.setSigner(signer);
 		s.onwrap = (env) => {
 			sendit(uid, env);
@@ -66,7 +66,7 @@ const publicKeyPath = path.join(config.get('PGP_EXPORTS_DIR'), config.get('PGP_P
 pk = fs.readFileSync(privateKeyPath);
 pubk = fs.readFileSync(publicKeyPath);
 
-new PGPKeyStore(
+new crdt.PGPKeyStore(
 	config.get('PGP_PASSPHRASE'),
 	pk,
 	pubk,
diff --git a/apps/contract-migration/scripts/cic_meta/import_meta_phone.js b/apps/contract-migration/scripts/cic_meta/import_meta_phone.js
index c56fb8f3..cc9be0de 100644
--- a/apps/contract-migration/scripts/cic_meta/import_meta_phone.js
+++ b/apps/contract-migration/scripts/cic_meta/import_meta_phone.js
@@ -4,11 +4,11 @@ const http = require('http');
 
 const cic = require('cic-client-meta');
 const vcfp = require('vcard-parser');
-import { Config, PGPKeyStore, PGPSigner, Syncable } from 'crdt-meta';
+const crdt = require('crdt-meta');
 
 //const conf = JSON.parse(fs.readFileSync('./cic.conf'));
 
-const config = new Config('./config');
+const config = new crdt.Config('./config');
 config.process();
 console.log(config);
 
@@ -43,7 +43,7 @@ function sendit(uid, envelope) {
 }
 
 function doOne(keystore, filePath, address) {
-	const signer = new PGPSigner(keystore);
+	const signer = new crdt.PGPSigner(keystore);
 
 	const j = JSON.parse(fs.readFileSync(filePath).toString());
 	const b = Buffer.from(j['vcard'], 'base64');
@@ -54,7 +54,7 @@ function doOne(keystore, filePath, address) {
 	cic.Phone.toKey(phone).then((uid) => {
 		const o = fs.readFileSync(filePath, 'utf-8');
 
-		const s = new Syncable(uid, o);
+		const s = new crdt.Syncable(uid, o);
 		s.setSigner(signer);
 		s.onwrap = (env) => {
 			sendit(uid, env);
@@ -68,7 +68,7 @@ const publicKeyPath = path.join(config.get('PGP_EXPORTS_DIR'), config.get('PGP_P
 pk = fs.readFileSync(privateKeyPath);
 pubk = fs.readFileSync(publicKeyPath);
 
-new PGPKeyStore(
+new crdt.PGPKeyStore(
 	config.get('PGP_PASSPHRASE'),
 	pk,
 	pubk,
@@ -124,7 +124,7 @@ function importMetaPhone(keystore) {
 		if (batchCount == batchSize) {
 			console.debug('reached batch size, breathing');
 			batchCount=0;
-			setTimeout(importMeta, batchDelay, keystore);
+			setTimeout(importMetaPhone, batchDelay, keystore);
 			return;
 		}
 	}
diff --git a/apps/contract-migration/scripts/package-lock.json b/apps/contract-migration/scripts/package-lock.json
index 68e71342..344a6a5d 100644
--- a/apps/contract-migration/scripts/package-lock.json
+++ b/apps/contract-migration/scripts/package-lock.json
@@ -29,9 +29,9 @@
       }
     },
     "@types/node": {
-      "version": "14.14.37",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz",
-      "integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw=="
+      "version": "14.14.39",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.39.tgz",
+      "integrity": "sha512-Qipn7rfTxGEDqZiezH+wxqWYR8vcXq5LRpZrETD19Gs4o8LbklbmqotSUsMU+s5G3PJwMRDfNEYoxrcBwIxOuw=="
     },
     "@types/pbkdf2": {
       "version": "3.1.0",