Correct V0/V1 contract def, adjust namespace tests (#4477)

* Correct V0/V1 contract def, adjust namespace tests

* Some failures

* V0 -> V1 conversion with name as Text[]

* CHANGELOG

Author: jacogr

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+Contributed:
+
+- Add additional namespaced contract tests (Thanks to https://github.com/VargSupercolony)
+
 Changes:
 
 - Adjust `Registry` to augment based on used packages

packages/api-contract/src/Abi/Abi.spec.ts

@@ -62,7 +62,7 @@ describe('Abi', (): void => {
           const messageIds = (abi.V3 || abi.V2 || abi.V1 || abi).spec.messages.map(({ label, name }) =>
             label || (
               Array.isArray(name)
-                ? name[0]
+                ? name.join('::')
                 : name
             )
           );

packages/api-contract/src/Abi/toLatest.spec.ts

@@ -71,9 +71,9 @@ describe('v1ToLatest', (): void => {
 
     expect(
       latest.spec.messages.map(({ label }) => label.toString())
-    ).toEqual(['PSP22Metadata,token_name', 'PSP22Metadata,token_symbol', 'PSP22Metadata,token_decimals', 'PSP22Mintable,mint',
-      'PSP22,decrease_allowance', 'PSP22,transfer', 'PSP22,approve', 'PSP22,allowance', 'PSP22,transfer_from', 'PSP22,balance_of', 'PSP22,increase_allowance',
-      'PSP22,total_supply', 'pause', 'unpause']);
+    ).toEqual([
+      'PSP22Metadata::token_name', 'PSP22Metadata::token_symbol', 'PSP22Metadata::token_decimals', 'PSP22Mintable::mint', 'PSP22::decrease_allowance', 'PSP22::transfer', 'PSP22::approve', 'PSP22::allowance', 'PSP22::transfer_from', 'PSP22::balance_of', 'PSP22::increase_allowance', 'PSP22::total_supply', 'pause', 'unpause'
+    ]);
   });
 
   it('has the correct constructor arguments', (): void => {
@@ -110,11 +110,13 @@ describe('v3ToLatest', (): void => {
   });
 
   it('has the correct messages', (): void => {
-    const contract = registry.createType('ContractMetadata', { V3: abis.ink_v3_trait_erc20.V3 });
+    const contract = registry.createType('ContractMetadata', { V3: abis.ink_v3_traitErc20.V3 });
     const latest = v3ToLatest(registry, contract.asV3);
 
     expect(
       latest.spec.messages.map(({ label }) => label.toString())
-    ).toEqual(['BaseErc20::total_supply', 'BaseErc20::balance_of', 'BaseErc20::allowance', 'BaseErc20::transfer', 'BaseErc20::approve', 'BaseErc20::transfer_from']);
+    ).toEqual([
+      'BaseErc20::total_supply', 'BaseErc20::balance_of', 'BaseErc20::allowance', 'BaseErc20::transfer', 'BaseErc20::approve', 'BaseErc20::transfer_from'
+    ]);
   });
 });

packages/api-contract/src/Abi/toV1.ts

@@ -7,8 +7,25 @@ import type { Registry } from '@polkadot/types/types';
 import { convertSiV0toV1 } from '@polkadot/types';
 import { objectSpread } from '@polkadot/util';
 
+interface Named {
+  name: unknown;
+}
+
+function v0ToV1Names (all: Named[]): unknown[] {
+  return all.map((e) =>
+    objectSpread({}, e, {
+      name: Array.isArray(e.name)
+        ? e.name
+        : [e.name]
+    }));
+}
+
 export function v0ToV1 (registry: Registry, v0: ContractMetadataV0): ContractMetadataV1 {
   return registry.createType('ContractMetadataV1', objectSpread({}, v0, {
+    spec: objectSpread({}, v0.spec, {
+      constructors: v0ToV1Names(v0.spec.constructors),
+      messages: v0ToV1Names(v0.spec.messages)
+    }),
     types: convertSiV0toV1(registry, v0.types)
   }));
 }