@@ -1456,37 +1456,36 @@ def test_dynamic_fees_empty_block(liquidity: list[float], lrna: list[float], ora
14561456 )
14571457
14581458 events = run .run (initial_state = initial_state , time_steps = 4 , silent = True )
1459- omnipool = events [1 ].pools ['omnipool1' ]
1459+ omnipool1 = events [1 ].pools ['omnipool1' ]
14601460 omnipool2 = events [1 ].pools ['omnipool2' ]
14611461 lrna_fee_1 , asset_fee_1 = {}, {}
14621462 lrna_fee_2 , asset_fee_2 = {}, {}
14631463 # omnipool.update()
1464- for tkn in omnipool .asset_list :
1465- lrna_fee_1 [tkn ] = omnipool .lrna_fee (tkn )
1466- asset_fee_1 [tkn ] = omnipool .asset_fee (tkn )
1464+ for tkn in omnipool1 .asset_list :
1465+ lrna_fee_1 [tkn ] = omnipool1 .lrna_fee (tkn )
1466+ asset_fee_1 [tkn ] = omnipool1 .asset_fee (tkn )
14671467 lrna_fee_2 [tkn ] = omnipool2 .lrna_fee (tkn )
14681468 asset_fee_2 [tkn ] = omnipool2 .asset_fee (tkn )
14691469 if lrna_fee_1 [tkn ] != pytest .approx (lrna_fee_2 [tkn ], rel = 1e-15 ):
14701470 raise AssertionError ('LRNA fee is not correct.' )
14711471 if asset_fee_1 [tkn ] != pytest .approx (asset_fee_2 [tkn ], rel = 1e-15 ):
14721472 raise AssertionError ('Asset fee is not correct.' )
14731473
1474- omnipool_oracle = events [0 ].pools ['omnipool' ].oracles ['price' ]
1475- # fees should be updated using oracle values from the previous block
1476- prev_lrna_fees = {tkn : events [0 ].pools ['omnipool' ].lrna_fee (tkn ) for tkn in omnipool .asset_list }
1477- prev_asset_fees = {tkn : events [0 ].pools ['omnipool' ].asset_fee (tkn ) for tkn in omnipool .asset_list }
1474+ omnipool_oracle = events [1 ].pools ['omnipool1' ].oracles ['price' ]
1475+ prev_lrna_fees = {tkn : events [0 ].pools ['omnipool1' ].lrna_fee (tkn ) for tkn in omnipool1 .asset_list }
1476+ prev_asset_fees = {tkn : events [0 ].pools ['omnipool1' ].asset_fee (tkn ) for tkn in omnipool1 .asset_list }
14781477 for tkn in ['HDX' , 'USD' , 'DOT' ]:
14791478 x = (omnipool_oracle .volume_out [tkn ] - omnipool_oracle .volume_in [tkn ]) / omnipool_oracle .liquidity [tkn ]
14801479
14811480 df = - lrna_fee_params ['amplification' ] * x - lrna_fee_params ['decay' ]
14821481 expected_lrna_fee = min (max (prev_lrna_fees [tkn ] + df , lrna_fee_params ['minimum' ]), lrna_fee_params ['fee_max' ])
1483- if omnipool .lrna_fee (tkn ) != pytest .approx (expected_lrna_fee , rel = 1e-15 ):
1482+ if omnipool1 .lrna_fee (tkn ) != pytest .approx (expected_lrna_fee , rel = 1e-15 ):
14841483 raise AssertionError ('LRNA fee is not correct.' )
14851484
14861485 df = asset_fee_params ['amplification' ] * x - asset_fee_params ['decay' ]
14871486 expected_asset_fee = min (max (prev_asset_fees [tkn ] + df , asset_fee_params ['minimum' ]),
14881487 asset_fee_params ['fee_max' ])
1489- if omnipool .asset_fee (tkn ) != pytest .approx (expected_asset_fee , rel = 1e-15 ):
1488+ if omnipool1 .asset_fee (tkn ) != pytest .approx (expected_asset_fee , rel = 1e-15 ):
14901489 raise AssertionError ('Asset fee is not correct.' )
14911490
14921491
0 commit comments