Skip to content

Commit 38916db

Browse files
test: fix incorrectly ported vyper contract
1 parent 3f3acb8 commit 38916db

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

contracts/testing/SwapFactory.vy

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ admin: public(address)
4343
factory_ng: FactoryNG
4444
rate_oracle: address
4545

46-
@external
46+
@deploy
4747
def __init__(impl: address):
4848
IMPL = impl
4949
self.admin = msg.sender
@@ -52,26 +52,26 @@ def __init__(impl: address):
5252
@external
5353
def deploy(coin_a: ERC20, coin_b: ERC20) -> address:
5454
pool: Swap = Swap(create_minimal_proxy_to(IMPL))
55-
pool.initialize(
55+
extcall pool.initialize(
5656
"TestName",
5757
"TST",
58-
[address(coin_a), address(coin_b), empty(address), empty(address)],
59-
[10**(18 - coin_a.decimals()) * 10**18, 10**(18 - coin_b.decimals()) * 10**18, 0, 0],
58+
[coin_a.address, coin_b.address, empty(address), empty(address)],
59+
[10**(18 - staticcall coin_a.decimals()) * 10**18, 10**(18 - staticcall coin_b.decimals()) * 10**18, 0, 0],
6060
100,
6161
0,
6262
)
63-
self.pools[self.n] = address(pool)
63+
self.pools[self.n] = pool.address
6464
self.n += 1
65-
return address(pool)
65+
return pool.address
6666

6767

6868
@external
6969
def deploy_ng(coin_a: ERC20, coin_b: ERC20) -> address:
70-
assert address(self.factory_ng) != empty(address), "Factory not set"
71-
pool: address = self.factory_ng.deploy_plain_pool(
70+
assert self.factory_ng.address != empty(address), "Factory not set"
71+
pool: address = extcall self.factory_ng.deploy_plain_pool(
7272
"TestName-ng",
7373
"TST-ng",
74-
[address(coin_a), address(coin_b)],
74+
[coin_a.address, coin_b.address],
7575
100,
7676
0,
7777
10000000000,

0 commit comments

Comments
 (0)