s/callId/callIndex/

polkadot-js · Oct 5, 2018 · 5a57425 · 5a57425
1 parent 947717c
commit 5a57425
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/packages/type-extrinsics/src/types.d.ts b/packages/type-extrinsics/src/types.d.ts
@@ -7,7 +7,7 @@ import { FunctionMetadata } from '@polkadot/types/Metadata';
 
 export interface ExtrinsicFunction {
   (...args: any[]): UncheckedMortalExtrinsic,
-  callId: Uint8Array,
+  callIndex: Uint8Array,
   meta: FunctionMetadata,
   method: string;
   section: string;

diff --git a/packages/type-extrinsics/src/utils/createUnchecked.ts b/packages/type-extrinsics/src/utils/createUnchecked.ts
@@ -19,7 +19,7 @@ export default function createDescriptor (
   index: number,
   meta: FunctionMetadata
 ): ExtrinsicFunction {
-  const callId = new Uint8Array([index, meta.id.toNumber()]);
+  const callIndex = new Uint8Array([index, meta.id.toNumber()]);
   let extrinsicFn: any;
 
   // If the extrinsic function has an argument of type `Origin`, we ignore it
@@ -33,12 +33,12 @@ export default function createDescriptor (
       throw new Error(`Extrinsic ${section}.${method} expects ${expectedArgs.length.valueOf()} arguments, got ${args.length}.`);
     }
 
-    const call = new Call(callId, meta, args);
+    const call = new Call(callIndex, meta, args);
 
     return new UncheckedMortalExtrinsic(call);
   };
 
-  extrinsicFn.callId = callId;
+  extrinsicFn.callIndex = callIndex;
   extrinsicFn.meta = meta;
   extrinsicFn.method = method;
   extrinsicFn.section = section;

diff --git a/packages/types/src/CallIndex.ts b/packages/types/src/CallIndex.ts
@@ -11,11 +11,15 @@ export default class CallIndex extends U8aFixed {
     super(value, 16);
   }
 
+  get callIndex (): Uint8Array {
+    return this.raw;
+  }
+
   get methodIndex (): number {
-    return this.raw[1];
+    return this.callIndex[1];
   }
 
   get sectionIndex (): number {
-    return this.raw[0];
+    return this.callIndex[0];
   }
 }
diff --git a/packages/types/src/UncheckedMortalExtrinsic.ts b/packages/types/src/UncheckedMortalExtrinsic.ts
@@ -60,6 +60,10 @@ export default class UncheckedMortalExtrinsic extends Extrinsic {
     return this._call.meta;
   }
 
+  get callIndex (): Uint8Array {
+    return this._call.callIndex;
+  }
+
   get methodIndex (): number {
     return this._call.methodIndex;
   }