Merge pull request #265 from KILTprotocol/demo-qrcode-uniform-encoding

refactor: change the qrcode to be uniform when encoding
KILTprotocol · May 28, 2020 · 5627a7b · 5627a7b
2 parents 7c4485f + d23122c
commit 5627a7b
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/src/utils/PublicIdentity/Encoding.ts b/src/utils/PublicIdentity/Encoding.ts
@@ -1,25 +1,23 @@
 import { IPublicIdentity, IDelegationNode } from '@kiltprotocol/sdk-js'
 
-const encodePublicIdentity = (publicIdentity: IPublicIdentity): string[] => [
-  publicIdentity.address,
-  publicIdentity.boxPublicKeyAsHex,
-  ...(publicIdentity.serviceAddress ? [publicIdentity.serviceAddress] : []),
-]
-
 export type IAttesterWithDelegation = {
   publicIdentity: IPublicIdentity
   delegationId: IDelegationNode['id']
 }
 
+const encodePublicIdentity = (publicIdentity: IPublicIdentity): string[] => [
+  publicIdentity.address,
+  publicIdentity.boxPublicKeyAsHex,
+  publicIdentity.serviceAddress || '',
+]
+
 const encodePublicIdentityWithDelegation = (
   publicIdentityWithDelegation: IAttesterWithDelegation
 ): string[] => [
-  publicIdentityWithDelegation.delegationId,
   publicIdentityWithDelegation.publicIdentity.address,
   publicIdentityWithDelegation.publicIdentity.boxPublicKeyAsHex,
-  ...(publicIdentityWithDelegation.publicIdentity.serviceAddress
-    ? [publicIdentityWithDelegation.publicIdentity.serviceAddress]
-    : []),
+  publicIdentityWithDelegation.publicIdentity.serviceAddress || '',
+  publicIdentityWithDelegation.delegationId,
 ]
 
 export { encodePublicIdentity, encodePublicIdentityWithDelegation }