From 8a626096d9f83ba5a30e9f165378384be8479dfd Mon Sep 17 00:00:00 2001
From: ethzoomer <ethzoomer@gmail.com>
Date: Wed, 26 Jun 2024 08:24:44 -0500
Subject: [PATCH] ci: versions, fix tests

---
 contracts/LpSugar.vy       |  2 +-
 contracts/RelaySugar.vy    |  2 +-
 contracts/VeSugar.vy       |  2 +-
 tests/test_govnft_sugar.py | 14 +++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/contracts/LpSugar.vy b/contracts/LpSugar.vy
index 4daf3bd..e45dfd9 100644
--- a/contracts/LpSugar.vy
+++ b/contracts/LpSugar.vy
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BUSL-1.1
-# @version >=0.3.6 <0.4.0
+# @version ^0.3.10
 
 # @title Velodrome Finance LP Sugar v3
 # @author stas, ethzoomer
diff --git a/contracts/RelaySugar.vy b/contracts/RelaySugar.vy
index 1f37c5a..7f967cd 100644
--- a/contracts/RelaySugar.vy
+++ b/contracts/RelaySugar.vy
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BUSL-1.1
-# @version >=0.3.6 <0.4.0
+# @version ^0.3.10
 
 # @title Velodrome Finance Relay Sugar v2
 # @author stas, ZoomerAnon
diff --git a/contracts/VeSugar.vy b/contracts/VeSugar.vy
index 7347c19..ad5aa01 100644
--- a/contracts/VeSugar.vy
+++ b/contracts/VeSugar.vy
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BUSL-1.1
-# @version >=0.3.6 <0.4.0
+# @version ^0.3.10
 
 # @title Velodrome Finance veNFT Sugar v2
 # @author stas
diff --git a/tests/test_govnft_sugar.py b/tests/test_govnft_sugar.py
index b4a4f5f..2a183a1 100644
--- a/tests/test_govnft_sugar.py
+++ b/tests/test_govnft_sugar.py
@@ -38,7 +38,7 @@ def test_byId(sugar_contract, GovNftStruct):
     )
 
     assert govnft is not None
-    assert len() == 15
+    assert len(govnft) == 15
     assert govnft.minter != ADDRESS_ZERO
     assert govnft.address != ADDRESS_ZERO
 
@@ -50,7 +50,7 @@ def test_collections(sugar_contract, CollectionStruct):
     ))
 
     assert collections is not None
-    assert len(collections) > 1
+    assert len(collections) > 0
     assert collections[0].address == os.getenv('GOVNFT_COLLECTION_ADDRESS')
 
 
@@ -62,12 +62,12 @@ def test_owned(sugar_contract, GovNftStruct):
     assert govnft is not None
 
     owned_govnfts = list(map(
-        lambda _p: CollectionStruct(*_p),
+        lambda _p: GovNftStruct(*_p),
         sugar_contract.owned(govnft.owner, govnft.address)
     ))
 
     assert owned_govnfts is not None
-    assert len(owned_govnfts) > 1
+    assert len(owned_govnfts) > 0
     owned_govnft = owned_govnfts[0]
 
     assert owned_govnft.owner == govnft.owner
@@ -82,12 +82,12 @@ def test_minted(sugar_contract, GovNftStruct):
     assert govnft is not None
 
     minted_govnfts = list(map(
-        lambda _p: CollectionStruct(*_p),
-        sugar_contract.minted(govnft.owner, govnft.address)
+        lambda _p: GovNftStruct(*_p),
+        sugar_contract.minted(govnft.minter, govnft.address)
     ))
 
     assert minted_govnfts is not None
-    assert len(minted_govnfts) > 1
+    assert len(minted_govnfts) > 0
     minted_govnft = minted_govnfts[0]
 
     assert minted_govnft.owner == govnft.owner