Split Submittable into actual classes (#1350)

* Split Submittable into actual classes

* *sigh* Fix VSCode's "helpful" imports

* Rename option creation functions

* Extrinsic already has version embedded

* V3
This commit is contained in:
Jaco Greeff
2019-08-29 22:33:57 +02:00
committed by GitHub
parent 3fa8f9f89d
commit d905b4fef3
15 changed files with 403 additions and 343 deletions
+3 -3
View File
@@ -2,7 +2,7 @@
// This software may be modified and distributed under the terms
// of the Apache-2.0 license. See the LICENSE file for details.
import { ISubmittableResult, SubmittableResult } from '@polkadot/api/SubmittableExtrinsic';
import { SubmittableResultImpl } from '@polkadot/api/types';
import { AccountId, Address, Hash } from '@polkadot/types/interfaces';
import { IKeyringPair } from '@polkadot/types/types';
import { ContractABI } from './types';
@@ -10,7 +10,7 @@ import { ContractABI } from './types';
import BN from 'bn.js';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { ApiRx } from '@polkadot/api';
import { ApiRx, SubmittableResult } from '@polkadot/api';
import { createType } from '@polkadot/types';
import Abi from './Abi';
@@ -26,7 +26,7 @@ export interface BlueprintCreate {
class BlueprintCreateResult extends SubmittableResult {
public readonly contract?: RxContract;
public constructor (result: ISubmittableResult, contract?: RxContract) {
public constructor (result: SubmittableResultImpl, contract?: RxContract) {
super(result);
this.contract = contract;
+4 -4
View File
@@ -2,7 +2,7 @@
// This software may be modified and distributed under the terms
// of the Apache-2.0 license. See the LICENSE file for details.
import { ISubmittableResult, SubmittableResult } from '@polkadot/api/SubmittableExtrinsic';
import { SubmittableResultImpl } from '@polkadot/api/types';
import { AccountId, Address, Hash } from '@polkadot/types/interfaces';
import { IKeyringPair } from '@polkadot/types/types';
import { ContractABI } from './types';
@@ -10,7 +10,7 @@ import { ContractABI } from './types';
import BN from 'bn.js';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { ApiRx } from '@polkadot/api';
import { ApiRx, SubmittableResult } from '@polkadot/api';
import { compactAddLength, u8aToU8a } from '@polkadot/util';
import Abi from './Abi';
@@ -39,7 +39,7 @@ export interface CodePutCode {
class CodePutCodeResult extends SubmittableResult {
public readonly blueprint?: RxBlueprint;
public constructor (result: ISubmittableResult, blueprint?: RxBlueprint) {
public constructor (result: SubmittableResultImpl, blueprint?: RxBlueprint) {
super(result);
this.blueprint = blueprint;
@@ -67,7 +67,7 @@ export default class RxCode extends RxBase {
return { signAndSend };
}
private createResult = (result: ISubmittableResult): CodePutCodeResult => {
private createResult = (result: SubmittableResultImpl): CodePutCodeResult => {
let blueprint: RxBlueprint | undefined;
if (result.isFinalized) {
+1 -2
View File
@@ -8,8 +8,7 @@ import { ContractABI, ContractABIFn, InterfaceContract, InterfaceContractCalls }
import BN from 'bn.js';
import { Observable } from 'rxjs';
import { ApiRx } from '@polkadot/api';
import { SubmittableResult } from '@polkadot/api/SubmittableExtrinsic';
import { ApiRx, SubmittableResult } from '@polkadot/api';
import { createType } from '@polkadot/types';
import Abi from './Abi';
import RxBase from './RxBase';