rename some stuff

This commit is contained in:
Michael Zhu 2019-10-17 20:02:15 -07:00
parent 4210477e71
commit 21cf2319d5
5 changed files with 10 additions and 10 deletions

View File

@ -10,7 +10,7 @@ export interface ActorConfig {
address: string; address: string;
name?: string; name?: string;
deployment: DeploymentManager; deployment: DeploymentManager;
[subclassProperty: string]: any; [mixinProperty: string]: any;
} }
export class Actor { export class Actor {

View File

@ -1,5 +1,5 @@
import { Actor } from './base'; import { Actor } from './base';
import { Maker } from './maker'; import { MakerMixin } from './maker';
import { PoolOperator } from './pool_operator'; import { PoolOperatorMixin } from './pool_operator';
export const OperatorAndMaker = PoolOperator(Maker(Actor)); export const OperatorMaker = PoolOperatorMixin(MakerMixin(Actor));

View File

@ -1,3 +1,3 @@
export { MakerActor } from './maker'; export { Maker } from './maker';
export { PoolOperatorActor } from './pool_operator'; export { PoolOperator } from './pool_operator';
export * from './hybrids'; export * from './hybrids';

View File

@ -8,7 +8,7 @@ export interface MakerConfig extends ActorConfig {
orderConfig: Partial<Order>; orderConfig: Partial<Order>;
} }
export function Maker<TBase extends Constructor>(Base: TBase) { export function MakerMixin<TBase extends Constructor>(Base: TBase) {
return class extends Base { return class extends Base {
public readonly actor: Actor; public readonly actor: Actor;
public readonly orderFactory: OrderFactory; public readonly orderFactory: OrderFactory;
@ -49,4 +49,4 @@ export function Maker<TBase extends Constructor>(Base: TBase) {
}; };
} }
export const MakerActor = Maker(Actor); export const Maker = MakerMixin(Actor);

View File

@ -6,7 +6,7 @@ export interface PoolOperatorConfig extends ActorConfig {
operatorShare: number; operatorShare: number;
} }
export function PoolOperator<TBase extends Constructor>(Base: TBase) { export function PoolOperatorMixin<TBase extends Constructor>(Base: TBase) {
return class extends Base { return class extends Base {
public readonly operatorShare: number; public readonly operatorShare: number;
public readonly poolIds: string[] = []; public readonly poolIds: string[] = [];
@ -57,4 +57,4 @@ export function PoolOperator<TBase extends Constructor>(Base: TBase) {
}; };
} }
export const PoolOperatorActor = PoolOperator(Actor); export const PoolOperator = PoolOperatorMixin(Actor);