Add test for createAddressId()

creditcoin-js/package.json

@@ -1,6 +1,6 @@
 {
     "name": "creditcoin-js",
-    "version": "0.7.0",
+    "version": "0.7.1",
     "author": "Jeremy Frank <jeremy.frank@gluwa.com>",
     "license": "MIT",
     "main": "lib/index.js",

creditcoin-js/src/testUtils.ts

@@ -124,6 +124,24 @@ export const lendOnEth = async (
     return lendTxHash;
 };
 
+export const checkAddress = async (
+    ccApi: CreditcoinApi,
+    existingAddressId: string,
+): Promise<AddressRegistered | undefined> => {
+    const { api } = ccApi;
+
+    const result = await api.query.creditcoin.addresses<Option<PalletCreditcoinAddress>>(existingAddressId);
+
+    if (result.isSome) {
+        return {
+            itemId: existingAddressId,
+            item: createAddress(result.unwrap()),
+        } as AddressRegistered;
+    }
+
+    return undefined;
+};
+
 export const tryRegisterAddress = async (
     ccApi: CreditcoinApi,
     externalAddress: string,
@@ -133,19 +151,14 @@ export const tryRegisterAddress = async (
     checkForExisting = false,
 ): Promise<AddressRegistered> => {
     const {
-        api,
         extrinsics: { registerAddress },
     } = ccApi;
 
     if (checkForExisting) {
         const existingAddressId = createAddressId(blockchain, externalAddress);
-        const result = await api.query.creditcoin.addresses<Option<PalletCreditcoinAddress>>(existingAddressId);
-
-        if (result.isSome) {
-            return {
-                itemId: existingAddressId,
-                item: createAddress(result.unwrap()),
-            } as AddressRegistered;
+        const result = await checkAddress(ccApi, existingAddressId);
+        if (result) {
+            return result;
         }
     }
 

integration-tests/package.json

@@ -17,7 +17,7 @@
         "@polkadot/keyring": "10.1.9",
         "@types/ws": "^8.5.3",
         "axios": "^1.0.0",
-        "creditcoin-js": "file:../creditcoin-js/creditcoin-js-v0.7.0.tgz",
+        "creditcoin-js": "file:../creditcoin-js/creditcoin-js-v0.7.1.tgz",
         "ws": "^8.5.0"
     },
     "devDependencies": {

integration-tests/src/test/register-address.test.ts

@@ -1,22 +1,25 @@
-import { ApiPromise, Keyring, WsProvider, KeyringPair, Wallet, POINT_01_CTC } from 'creditcoin-js';
+import { Blockchain, Keyring, KeyringPair, Wallet, POINT_01_CTC, creditcoinApi } from 'creditcoin-js';
+import { createAddressId } from 'creditcoin-js/lib/extrinsics/register-address';
 import { createCreditcoinBlockchain } from 'creditcoin-js/lib/transforms';
+import { checkAddress, testData } from 'creditcoin-js/lib/testUtils';
+import { CreditcoinApi } from 'creditcoin-js/lib/types';
 import { signAccountId } from 'creditcoin-js/lib/utils';
 import { extractFee } from '../utils';
 
 describe('RegisterAddress', () => {
-    let api: ApiPromise;
+    let ccApi: CreditcoinApi;
     let alice: KeyringPair;
 
     beforeAll(async () => {
-        api = await ApiPromise.create({
-            provider: new WsProvider((global as any).CREDITCOIN_API_URL),
-        });
+        ccApi = await creditcoinApi((global as any).CREDITCOIN_API_URL);
         alice = new Keyring({ type: 'sr25519' }).addFromUri('//Alice');
     });
 
-    afterAll(async () => await api.disconnect());
+    afterAll(async () => await ccApi.api.disconnect());
 
     it('fee is min 0.01 CTC', async (): Promise<void> => {
+        const { api } = ccApi;
+
         return new Promise((resolve, reject) => {
             const wallet = Wallet.createRandom();
             const unsubscribe = api.tx.creditcoin
@@ -33,4 +36,33 @@ describe('RegisterAddress', () => {
             expect(fee).toBeGreaterThanOrEqual(POINT_01_CTC);
         });
     });
+
+    it('createAddressId works as expected', async (): Promise<void> => {
+        const { blockchain } = testData(
+            (global as any).CREDITCOIN_ETHEREUM_CHAIN as Blockchain,
+            (global as any).CREDITCOIN_CREATE_WALLET,
+        );
+
+        const {
+            api,
+            extrinsics: { registerAddress },
+        } = ccApi;
+
+        const lender = alice;
+        const lenderWallet = Wallet.createRandom();
+        const lenderRegAddr = await registerAddress(
+            lenderWallet.address,
+            blockchain,
+            signAccountId(api, lenderWallet, lender.address),
+            lender,
+        );
+
+        // manually constructed address is the same as returned by Creditcoin
+        const addressId = createAddressId(blockchain, lenderWallet.address);
+        expect(addressId).toBe(lenderRegAddr.itemId);
+
+        // manually constructed address should be reported as registered
+        const result = await checkAddress(ccApi, addressId);
+        expect(result).toBeDefined();
+    });
 });