Преглед на файлове

createType('u128') => createType('Balance')

Leszek Wiesner преди 4 години
родител
ревизия
728bb4c90c

+ 5 - 5
pioneer/packages/joy-roles/src/balances.spec.ts

@@ -7,7 +7,7 @@ describe('Balance arithmetic', (): void => {
     const input: Balance[] = [];
 
     for (let i = 0; i < 10; i++) {
-      input.push(createType('u128', i));
+      input.push(createType('Balance', i));
     }
 
     expect(Sum(input).toNumber()).toEqual(45);
@@ -17,7 +17,7 @@ describe('Balance arithmetic', (): void => {
     const input: Balance[] = [];
 
     for (let i = 0; i < 10; i++) {
-      input.push(createType('u128', i));
+      input.push(createType('Balance', i));
     }
 
     expect(Avg(input).toNumber()).toEqual(4);
@@ -27,7 +27,7 @@ describe('Balance arithmetic', (): void => {
     const input: Balance[] = [];
 
     for (let i = 0; i < 10; i++) {
-      input.push(createType('u128', i));
+      input.push(createType('Balance', i));
     }
 
     expect(AvgDelta(input).toNumber()).toEqual(1);
@@ -37,7 +37,7 @@ describe('Balance arithmetic', (): void => {
     const input: Balance[] = [];
 
     for (let i = 0; i < 10; i++) {
-      input.push(createType('u128', i * 10));
+      input.push(createType('Balance', i * 10));
     }
 
     expect(Step(input).toNumber()).toEqual(4);
@@ -47,7 +47,7 @@ describe('Balance arithmetic', (): void => {
     const input: Balance[] = [];
 
     for (let i = 0; i < 10; i++) {
-      input.push(createType('u128', i));
+      input.push(createType('Balance', i));
     }
 
     expect(Min(Step(input)).toNumber()).toEqual(1);

+ 2 - 2
pioneer/packages/joy-roles/src/flows/apply.controller.tsx

@@ -48,8 +48,8 @@ type State = {
 
 const newEmptyState = (): State => {
   return {
-    applicationStake: createType('u128', 0),
-    roleStake: createType('u128', 0),
+    applicationStake: createType('Balance', 0),
+    roleStake: createType('Balance', 0),
     appDetails: {},
     hasError: false,
     transactionDetails: new Map<string, string>(),

+ 16 - 16
pioneer/packages/joy-roles/src/tabs/MyRoles.elements.stories.tsx

@@ -36,8 +36,8 @@ export function CurrentRolesFragment () {
       {
         workerId: createType('CuratorId', 1),
         name: workerRoleNameByGroup[WorkingGroups.StorageProviders],
-        reward: createType('u128', 321),
-        stake: createType('u128', 100),
+        reward: createType('Balance', 321),
+        stake: createType('Balance', 100),
         group: WorkingGroups.StorageProviders,
         CTAs: [
           {
@@ -50,8 +50,8 @@ export function CurrentRolesFragment () {
         workerId: createType('CuratorId', 1),
         name: 'Some other role',
         url: 'some URL',
-        reward: createType('u128', 321),
-        stake: createType('u128', 12343200),
+        reward: createType('Balance', 321),
+        stake: createType('Balance', 12343200),
         group: WorkingGroups.ContentCurators,
         CTAs: [
           {
@@ -165,8 +165,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       starting_time: yesterday()
     },
     opening: opening,
-    applicationStake: createType('u128', 5),
-    roleStake: createType('u128', 15),
+    applicationStake: createType('Balance', 5),
+    roleStake: createType('Balance', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 15,
     capacity: 20
@@ -185,8 +185,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       starting_time: yesterday()
     },
     opening: opening,
-    applicationStake: createType('u128', 5),
-    roleStake: createType('u128', 15),
+    applicationStake: createType('Balance', 5),
+    roleStake: createType('Balance', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 21,
     capacity: 20
@@ -207,8 +207,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       review_end_block: 12345
     },
     opening: opening,
-    applicationStake: createType('u128', 5),
-    roleStake: createType('u128', 15),
+    applicationStake: createType('Balance', 5),
+    roleStake: createType('Balance', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 15,
     capacity: 20
@@ -229,8 +229,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       review_end_block: 12345
     },
     opening: opening,
-    applicationStake: createType('u128', 5),
-    roleStake: createType('u128', 15),
+    applicationStake: createType('Balance', 5),
+    roleStake: createType('Balance', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 21,
     capacity: 20
@@ -249,8 +249,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       starting_time: yesterday()
     },
     opening: opening,
-    applicationStake: createType('u128', 5),
-    roleStake: createType('u128', 15),
+    applicationStake: createType('Balance', 5),
+    roleStake: createType('Balance', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 21,
     capacity: 20
@@ -269,8 +269,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       starting_time: yesterday()
     },
     opening: opening,
-    applicationStake: createType('u128', 5),
-    roleStake: createType('u128', 15),
+    applicationStake: createType('Balance', 5),
+    roleStake: createType('Balance', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 21,
     capacity: 20,

+ 22 - 22
pioneer/packages/joy-roles/src/transport.mock.ts

@@ -42,7 +42,7 @@ export class Transport extends MockTransportBase implements ITransport {
             'https://www.benholdencrowther.com/wp-content/uploads/2019/03/Hanging_Gardens_of_Babylon.jpg'
           ),
           title: 'Content curator',
-          stake: createType('u128', 10101),
+          stake: createType('Balance', 10101),
           workerId: 1,
           group: WorkingGroups.ContentCurators
         },
@@ -51,7 +51,7 @@ export class Transport extends MockTransportBase implements ITransport {
           roleAccount: createType('AccountId', '5DfJWGbBAH8hLAg8rcRYZW5BEZbE4BJeCQKoxUeqoyewLSew'),
           profile: mockProfile('bwhm0'),
           title: 'Content curator',
-          stake: createType('u128', 10101),
+          stake: createType('Balance', 10101),
           workerId: 2,
           group: WorkingGroups.ContentCurators
         },
@@ -63,7 +63,7 @@ export class Transport extends MockTransportBase implements ITransport {
             'https://yhp.io/img/paul.svg'
           ),
           title: 'Content curator',
-          stake: createType('u128', 10101),
+          stake: createType('Balance', 10101),
           workerId: 3,
           group: WorkingGroups.ContentCurators
         },
@@ -75,7 +75,7 @@ export class Transport extends MockTransportBase implements ITransport {
             'https://avatars2.githubusercontent.com/u/153928?s=200&v=4'
           ),
           title: 'Content curator',
-          stake: createType('u128', 10101),
+          stake: createType('Balance', 10101),
           workerId: 4,
           group: WorkingGroups.ContentCurators
         },
@@ -87,7 +87,7 @@ export class Transport extends MockTransportBase implements ITransport {
             'https://avatars2.githubusercontent.com/u/1621012?s=460&v=4'
           ),
           title: 'Content curator',
-          stake: createType('u128', 10101),
+          stake: createType('Balance', 10101),
           workerId: 5,
           group: WorkingGroups.ContentCurators
         }
@@ -109,7 +109,7 @@ export class Transport extends MockTransportBase implements ITransport {
             'https://www.benholdencrowther.com/wp-content/uploads/2019/03/Hanging_Gardens_of_Babylon.jpg'
           ),
           title: 'Storage provider',
-          stake: createType('u128', 10101),
+          stake: createType('Balance', 10101),
           workerId: 1,
           group: WorkingGroups.StorageProviders
         }
@@ -178,14 +178,14 @@ export class Transport extends MockTransportBase implements ITransport {
             numberOfApplications: 0,
             maxNumberOfApplications: 0,
             requiredApplicationStake: new ApplicationStakeRequirement(
-              createType('u128', 500)
+              createType('Balance', 500)
             ),
             requiredRoleStake: new RoleStakeRequirement(
-              createType('u128', 0)
+              createType('Balance', 0)
             ),
-            defactoMinimumStake: createType('u128', 0)
+            defactoMinimumStake: createType('Balance', 0)
           },
-          defactoMinimumStake: createType('u128', 0)
+          defactoMinimumStake: createType('Balance', 0)
         }
       ]
     );
@@ -256,15 +256,15 @@ export class Transport extends MockTransportBase implements ITransport {
           numberOfApplications: 0,
           maxNumberOfApplications: 0,
           requiredApplicationStake: new ApplicationStakeRequirement(
-            createType('u128', 501),
+            createType('Balance', 501),
             StakeType.AtLeast
           ),
           requiredRoleStake: new RoleStakeRequirement(
-            createType('u128', 502)
+            createType('Balance', 502)
           ),
-          defactoMinimumStake: createType('u128', 0)
+          defactoMinimumStake: createType('Balance', 0)
         },
-        defactoMinimumStake: createType('u128', 0)
+        defactoMinimumStake: createType('Balance', 0)
       }
     );
   }
@@ -273,7 +273,7 @@ export class Transport extends MockTransportBase implements ITransport {
     const slots: Balance[] = [];
 
     for (let i = 0; i < 20; i++) {
-      slots.push(createType('u128', (i * 100) + 10 + i + 1));
+      slots.push(createType('Balance', (i * 100) + 10 + i + 1));
     }
 
     return this.simulateApiResponse<Balance[]>(slots);
@@ -298,17 +298,17 @@ export class Transport extends MockTransportBase implements ITransport {
           {
             shortName: 'KP1',
             accountId: createType('AccountId', '5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
-            balance: createType('u128', 23342)
+            balance: createType('Balance', 23342)
           },
           {
             shortName: 'KP2',
             accountId: createType('AccountId', '5DQqNWRFPruFs9YKheVMqxUbqoXeMzAWfVfcJgzuia7NA3D3'),
-            balance: createType('u128', 993342)
+            balance: createType('Balance', 993342)
           },
           {
             shortName: 'KP3',
             accountId: createType('AccountId', '5DBaczGTDhcHgwsZzNE5qW15GrQxxdyros4pYkcKrSUovFQ9'),
-            balance: createType('u128', 242)
+            balance: createType('Balance', 242)
           }
         ]
       );
@@ -374,8 +374,8 @@ export class Transport extends MockTransportBase implements ITransport {
           }
         })
       }),
-      applicationStake: createType('u128', 5),
-      roleStake: createType('u128', 15),
+      applicationStake: createType('Balance', 5),
+      roleStake: createType('Balance', 15),
       rank: 21,
       capacity: 20
     }];
@@ -389,8 +389,8 @@ export class Transport extends MockTransportBase implements ITransport {
         name: workerRoleNameByGroup[WorkingGroups.ContentCurators],
         group: WorkingGroups.ContentCurators,
         url: 'some URL',
-        reward: createType('u128', 321),
-        stake: createType('u128', 12343200)
+        reward: createType('Balance', 321),
+        stake: createType('Balance', 12343200)
       }
     ];
   }

+ 4 - 4
pioneer/packages/joy-roles/src/transport.substrate.ts

@@ -458,9 +458,9 @@ export class Transport extends BaseTransport implements ITransport {
         maxNumberOfApplications: opening.max_applicants,
         requiredApplicationStake: stakes.application,
         requiredRoleStake: stakes.role,
-        defactoMinimumStake: this.api.createType('u128', 0)
+        defactoMinimumStake: this.api.createType('Balance', 0)
       },
-      defactoMinimumStake: this.api.createType('u128', 0)
+      defactoMinimumStake: this.api.createType('Balance', 0)
     });
   }
 
@@ -642,13 +642,13 @@ export class Transport extends BaseTransport implements ITransport {
       workers
         .filter(([id, worker]) => worker.role_account_id.eq(roleKeyId) && worker.is_active)
         .map(async ([id, worker]) => {
-          let stakeValue: Balance = this.api.createType('u128', 0);
+          let stakeValue: Balance = this.api.createType('Balance', 0);
 
           if (worker.role_stake_profile && worker.role_stake_profile.isSome) {
             stakeValue = await this.workerStake(worker.role_stake_profile.unwrap());
           }
 
-          let earnedValue: Balance = this.api.createType('u128', 0);
+          let earnedValue: Balance = this.api.createType('Balance', 0);
 
           if (worker.reward_relationship && worker.reward_relationship.isSome) {
             earnedValue = await this.workerTotalReward(worker.reward_relationship.unwrap());