StorageType generic argument (#34)

Author: droserasprout

poetry.lock

@@ -1,11 +1,12 @@
 import demo_hic_et_nunc.models as models
-from demo_hic_et_nunc.types.hen_minter.parameter.cancel_swap import CancelSwap
+from demo_hic_et_nunc.types.hen_minter.parameter.cancel_swap import CancelSwap as CancelSwapParameter
+from demo_hic_et_nunc.types.hen_minter.storage import Storage as HenMinterStorage
 from dipdup.models import HandlerContext, OperationContext
 
 
 async def on_cancel_swap(
     ctx: HandlerContext,
-    cancel_swap: OperationContext[CancelSwap],
+    cancel_swap: OperationContext[CancelSwapParameter, HenMinterStorage],
 ) -> None:
     swap = await models.Swap.filter(id=int(cancel_swap.parameter.__root__)).get()
     swap.status = models.SwapStatus.CANCELED

src/demo_hic_et_nunc/handlers/on_cancel_swap.py

@@ -1,11 +1,12 @@
 import demo_hic_et_nunc.models as models
-from demo_hic_et_nunc.types.hen_minter.parameter.collect import Collect
+from demo_hic_et_nunc.types.hen_minter.parameter.collect import Collect as CollectParameter
+from demo_hic_et_nunc.types.hen_minter.storage import Storage as HenMinterStorage
 from dipdup.models import HandlerContext, OperationContext
 
 
 async def on_collect(
     ctx: HandlerContext,
-    collect: OperationContext[Collect],
+    collect: OperationContext[CollectParameter, HenMinterStorage],
 ) -> None:
     swap = await models.Swap.filter(id=collect.parameter.swap_id).get()
     seller = await swap.creator

src/demo_hic_et_nunc/handlers/on_collect.py

@@ -1,16 +1,18 @@
-from demo_hic_et_nunc.models import Holder, Token
-from demo_hic_et_nunc.types.hen_minter.parameter.mint_objkt import MintOBJKT
-from demo_hic_et_nunc.types.hen_objkts.parameter.mint import Mint
+import demo_hic_et_nunc.models as models
+from demo_hic_et_nunc.types.hen_minter.parameter.mint_objkt import MintOBJKT as MintOBJKTParameter
+from demo_hic_et_nunc.types.hen_minter.storage import Storage as HenMinterStorage
+from demo_hic_et_nunc.types.hen_objkts.parameter.mint import Mint as MintParameter
+from demo_hic_et_nunc.types.hen_objkts.storage import Storage as HenObjktsStorage
 from dipdup.models import HandlerContext, OperationContext
 
 
 async def on_mint(
     ctx: HandlerContext,
-    mint_objkt: OperationContext[MintOBJKT],
-    mint: OperationContext[Mint],
+    mint_objkt: OperationContext[MintOBJKTParameter, HenMinterStorage],
+    mint: OperationContext[MintParameter, HenObjktsStorage],
 ) -> None:
-    holder, _ = await Holder.get_or_create(address=mint.parameter.address)
-    token = Token(
+    holder, _ = await models.Holder.get_or_create(address=mint.parameter.address)
+    token = models.Token(
         id=mint.parameter.token_id,
         creator=holder,
         supply=mint.parameter.amount,

src/demo_hic_et_nunc/handlers/on_mint.py

@@ -1,11 +1,12 @@
 import demo_hic_et_nunc.models as models
-from demo_hic_et_nunc.types.hen_minter.parameter.swap import Swap
+from demo_hic_et_nunc.types.hen_minter.parameter.swap import Swap as SwapParameter
+from demo_hic_et_nunc.types.hen_minter.storage import Storage as HenMinterStorage
 from dipdup.models import HandlerContext, OperationContext
 
 
 async def on_swap(
     ctx: HandlerContext,
-    swap: OperationContext[Swap],
+    swap: OperationContext[SwapParameter, HenMinterStorage],
 ) -> None:
     holder, _ = await models.Holder.get_or_create(address=swap.data.sender_address)
     swap_model = models.Swap(

src/demo_hic_et_nunc/handlers/on_swap.py

@@ -5,28 +5,15 @@
 
 from typing import Dict
 
-from pydantic import BaseModel, Extra
-
-
-class Metadata(BaseModel):
-    class Config:
-        extra = Extra.allow
-
-    __root__: str
+from pydantic import BaseModel
 
 
 class Royalties(BaseModel):
-    class Config:
-        extra = Extra.allow
-
     issuer: str
     royalties: str
 
 
 class Swaps(BaseModel):
-    class Config:
-        extra = Extra.allow
-
     issuer: str
     objkt_amount: str
     objkt_id: str
@@ -39,7 +26,7 @@ class Storage(BaseModel):
     hdao: str
     locked: bool
     manager: str
-    metadata: Dict[str, Metadata]
+    metadata: Dict[str, str]
     objkt: str
     objkt_id: str
     royalties: Dict[str, Royalties]

src/demo_hic_et_nunc/types/hen_minter/storage.py

@@ -5,18 +5,11 @@
 
 from typing import Dict
 
-from pydantic import BaseModel, Extra
-
-
-class TokenInfo(BaseModel):
-    class Config:
-        extra = Extra.allow
-
-    __root__: str
+from pydantic import BaseModel
 
 
 class Mint(BaseModel):
     address: str
     amount: str
     token_id: str
-    token_info: Dict[str, TokenInfo]
+    token_info: Dict[str, str]

src/demo_hic_et_nunc/types/hen_objkts/parameter/mint.py

@@ -5,7 +5,7 @@
 
 from typing import Any, Dict, List
 
-from pydantic import BaseModel, Extra
+from pydantic import BaseModel
 
 
 class Key(BaseModel):
@@ -18,13 +18,6 @@ class LedgerItem(BaseModel):
     value: str
 
 
-class Metadata(BaseModel):
-    class Config:
-        extra = Extra.allow
-
-    __root__: str
-
-
 class Key1(BaseModel):
     owner: str
     operator: str
@@ -36,26 +29,16 @@ class Operator(BaseModel):
     value: Dict[str, Any]
 
 
-class TokenInfo(BaseModel):
-    class Config:
-        extra = Extra.allow
-
-    __root__: str
-
-
 class TokenMetadata(BaseModel):
-    class Config:
-        extra = Extra.allow
-
     token_id: str
-    token_info: Dict[str, TokenInfo]
+    token_info: Dict[str, str]
 
 
 class Storage(BaseModel):
     administrator: str
     all_tokens: str
     ledger: List[LedgerItem]
-    metadata: Dict[str, Metadata]
+    metadata: Dict[str, str]
     operators: List[Operator]
     paused: bool
     token_metadata: Dict[str, TokenMetadata]

src/demo_hic_et_nunc/types/hen_objkts/storage.py

@@ -1,23 +1,22 @@
 from decimal import Decimal
-from typing import cast
 
 import demo_quipuswap.models as models
-from demo_quipuswap.types.fa12_token.parameter.transfer import Transfer
-from demo_quipuswap.types.quipu_fa12.parameter.divest_liquidity import DivestLiquidity
-from demo_quipuswap.types.quipu_fa12.storage import Storage as QuipuFA12Storage
+from demo_quipuswap.types.fa12_token.parameter.transfer import Transfer as TransferParameter
+from demo_quipuswap.types.fa12_token.storage import Storage as Fa12TokenStorage
+from demo_quipuswap.types.quipu_fa12.parameter.divest_liquidity import DivestLiquidity as DivestLiquidityParameter
+from demo_quipuswap.types.quipu_fa12.storage import Storage as QuipuFa12Storage
 from dipdup.models import HandlerContext, OperationContext
 
 
 async def on_fa12_divest_liquidity(
     ctx: HandlerContext,
-    divest_liquidity: OperationContext[DivestLiquidity],
-    transfer: OperationContext[Transfer],
+    divest_liquidity: OperationContext[DivestLiquidityParameter, QuipuFa12Storage],
+    transfer: OperationContext[TransferParameter, Fa12TokenStorage],
 ) -> None:
-
     if ctx.template_values is None:
         raise Exception('This index must be templated')
 
-    storage = cast(QuipuFA12Storage, divest_liquidity.storage)  # FIXME: remove
+    storage = divest_liquidity.storage
 
     decimals = int(ctx.template_values['decimals'])
     symbol = ctx.template_values['symbol']