Pipeline fixes

arthurfiorette · Mar 20, 2021 · de6ce70 · de6ce70
2 parents a94ff8c + 3868c44
commit de6ce70
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/app/src/trading/logic/calculatePrices.ts b/app/src/trading/logic/calculatePrices.ts
@@ -1,8 +1,7 @@
 import { NextFunction } from '../../util/middleware';
-import { OfferContext } from '../types'
 import { getAllItemsPrice } from '../../steam/market';
-import { ItemPrice } from '../types';
 import { AccountOptions } from '../../account/account';
+import { ItemPrice,OfferContext } from '../types';
 
 export default async function middleware(context: OfferContext, next: NextFunction) {
   const { processor, offer } = context;

diff --git a/app/src/trading/logic/checkSides.ts b/app/src/trading/logic/checkSides.ts
@@ -1,6 +1,7 @@
-import { OfferContext, Next } from '../pipeline';
+import { NextFunction } from '../../util/middleware';
+import { OfferContext } from '../types';
 
-export default function middleware(context: OfferContext, next: Next) {
+export default function middleware(context: OfferContext, next: NextFunction) {
   const { processor, offer } = context;
 
   if (offer.itemsToReceive.length < 1) {

diff --git a/app/src/trading/logic/glitched.ts b/app/src/trading/logic/glitched.ts
@@ -1,6 +1,8 @@
-import { OfferContext, Next } from '../pipeline';
+import { NextFunction } from "../../util/middleware";
+import { OfferContext } from "../types";
 
-export default function middleware(context: OfferContext, next: Next) {
+
+export default function middleware(context: OfferContext, next: NextFunction) {
   const { processor, offer } = context;
 
   if (offer.isGlitched()) {

diff --git a/app/src/trading/logic/isOwner.ts b/app/src/trading/logic/isOwner.ts
@@ -1,6 +1,8 @@
-import { OfferContext, Next } from '../pipeline';
+import { NextFunction } from "../../util/middleware";
+import { OfferContext } from "../types";
 
-export default function middleware(context: OfferContext, next: Next) {
+
+export default function middleware(context: OfferContext, next: NextFunction) {
   const { processor, offer } = context;
   const { owners } = processor.account.options.trading;
 

diff --git a/app/src/trading/processor.ts b/app/src/trading/processor.ts
@@ -1,7 +1,7 @@
 import Account from '../account/account';
-import { Offer } from './types';
-import { OfferContext, Pipeline } from './pipeline';
+import { Offer, OfferContext } from './types';
 import logic from './logic';
+import Pipeline from '../util/middleware';
 
 export type Processor = (offer: Offer) => Promise<Offer>;
 
@@ -10,7 +10,7 @@ function createContext(offer: Offer, processor: TradeProcessor): OfferContext {
 }
 
 export default class TradeProcessor {
-  private readonly pipeline = new Pipeline(logic);
+  private readonly pipeline = new Pipeline<OfferContext>(logic);
 
   constructor(readonly account: Account) {}