From 433878c54c248f977d8bbb34cc172c26c610d1a5 Mon Sep 17 00:00:00 2001
From: "Miquel A. Cabot" <miquel.cabot@gmail.com>
Date: Mon, 6 Jun 2022 09:58:11 +0200
Subject: [PATCH] Move Datatoken interface types to @types

---
 src/@types/Erc20.ts               | 21 +++++++++++++++++++++
 src/contracts/tokens/Datatoken.ts | 27 ++++-----------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/@types/Erc20.ts b/src/@types/Erc20.ts
index 19643b47..15715c98 100644
--- a/src/@types/Erc20.ts
+++ b/src/@types/Erc20.ts
@@ -1,3 +1,5 @@
+import { ProviderFees } from '.'
+
 export interface Erc20CreateParams {
   templateIndex: number
   minter: string
@@ -21,3 +23,22 @@ export interface PublishingMarketFee {
   publishMarketFeeToken: string
   publishMarketFeeAmount: string
 }
+
+export interface Roles {
+  minter: boolean
+  paymentManager: boolean
+}
+
+export interface OrderParams {
+  consumer: string
+  serviceIndex: number
+  _providerFee: ProviderFees
+  _consumeMarketFee: ConsumeMarketFee
+}
+
+export interface DispenserParams {
+  maxTokens: string
+  maxBalance: string
+  withMint?: boolean // true if we want to allow the dispenser to be a minter
+  allowedSwapper?: string // only account that can ask tokens. set address(0) if not required
+}
diff --git a/src/contracts/tokens/Datatoken.ts b/src/contracts/tokens/Datatoken.ts
index 21912fb5..53779474 100644
--- a/src/contracts/tokens/Datatoken.ts
+++ b/src/contracts/tokens/Datatoken.ts
@@ -18,33 +18,14 @@ import {
   FreOrderParams,
   FreCreationParams,
   ProviderFees,
-  PublishingMarketFee
+  PublishingMarketFee,
+  DispenserParams,
+  OrderParams,
+  Roles
 } from '../../@types'
 import { Nft } from './NFT'
 import { Config, ConfigHelper } from '../../config'
 
-/**
- * ERC20 ROLES
- */
-interface Roles {
-  minter: boolean
-  paymentManager: boolean
-}
-
-export interface OrderParams {
-  consumer: string
-  serviceIndex: number
-  _providerFee: ProviderFees
-  _consumeMarketFee: ConsumeMarketFee
-}
-
-export interface DispenserParams {
-  maxTokens: string
-  maxBalance: string
-  withMint?: boolean // true if we want to allow the dispenser to be a minter
-  allowedSwapper?: string // only account that can ask tokens. set address(0) if not required
-}
-
 export class Datatoken {
   public factoryAddress: string
   public factoryABI: AbiItem | AbiItem[]