fix: tests

Gearbox-protocol · Oct 25, 2023 · 894736e · 894736e
1 parent 2d83d07
commit 894736e
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 16 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/Gearbox-protocol/third-eye
 go 1.19
 
 require (
-	github.com/Gearbox-protocol/sdk-go v0.0.0-20231025152649-9d89bc0f48e4
+	github.com/Gearbox-protocol/sdk-go v0.0.0-20231025225115-8d4a2441af5f
 	github.com/ethereum/go-ethereum v1.10.17
 	github.com/go-playground/validator/v10 v10.4.1
 	github.com/google/go-cmp v0.5.8
@@ -73,4 +73,4 @@ require (
 
 replace github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.1
 
-// replace github.com/Gearbox-protocol/sdk-go v0.0.0-20231025145745-920ddd2e79d3 => ../sdk-go
+// replace github.com/Gearbox-protocol/sdk-go v0.0.0-20231025152649-9d89bc0f48e4 => ../sdk-go
diff --git a/go.sum b/go.sum
@@ -45,6 +45,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
 github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/Gearbox-protocol/sdk-go v0.0.0-20231025152649-9d89bc0f48e4 h1:gFdMmTGztRI5/5DM9KDwWM9e4kmewvGO/AIdNkm2X9s=
 github.com/Gearbox-protocol/sdk-go v0.0.0-20231025152649-9d89bc0f48e4/go.mod h1:GniLx/DU7tCT+QSlKt9REqUaF748X8rbDNR4vAd1m+Y=
+github.com/Gearbox-protocol/sdk-go v0.0.0-20231025225115-8d4a2441af5f h1:wCwnH7Utfpr6wR2FlEUK6kZoD4JR5pB9lJnWG1CBi78=
+github.com/Gearbox-protocol/sdk-go v0.0.0-20231025225115-8d4a2441af5f/go.mod h1:GniLx/DU7tCT+QSlKt9REqUaF748X8rbDNR4vAd1m+Y=
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=

diff --git a/jsonnet/account_lifecycle/input.jsonnet b/jsonnet/account_lifecycle/input.jsonnet
@@ -180,7 +180,8 @@ local newCollateral = 1;
             repayAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
             cumulativeIndexAtOpen: utils.bigInt(1, 27),
             borrowedAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
-            borrowedAmountPlusInterest: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
+            accruedInterest: utils.bigInt(0, 6),
+            debt: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
             balances: [{
               token: '#Token_1',
               BI: utils.bigInt(6000, 6),
@@ -241,7 +242,8 @@ local newCollateral = 1;
           repayAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
           cumulativeIndexAtOpen: utils.bigInt(1, 27),
           borrowedAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
-          borrowedAmountPlusInterest: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
+          accruedInterest: utils.bigInt(0, 6),
+          debt: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
           balances: [{
             token: '#Token_1',
             BI: utils.bigInt(6000, 6),
@@ -291,7 +293,8 @@ local newCollateral = 1;
           repayAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
           cumulativeIndexAtOpen: utils.bigInt(1, 27),
           borrowedAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
-          borrowedAmountPlusInterest: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
+          accruedInterest: utils.bigInt(0, 6),
+          debt: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
           balances: [{
             token: '#Token_1',
             BI: utils.bigInt(1000, 6),
@@ -383,7 +386,8 @@ local newCollateral = 1;
           repayAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
           cumulativeIndexAtOpen: utils.bigInt(1, 27),
           borrowedAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
-          borrowedAmountPlusInterest: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
+          accruedInterest: utils.bigInt(0, 6),
+          debt: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
           balances: [{
             token: '#Token_1',
             BI: utils.bigInt(2000, 6),

diff --git a/jsonnet/account_lifecycle_v2/input.jsonnet b/jsonnet/account_lifecycle_v2/input.jsonnet
@@ -161,7 +161,8 @@ local newCollateral = 1;
             repayAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
             cumulativeIndexAtOpen: utils.bigInt(1, 27),
             borrowedAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
-            borrowedAmountPlusInterest: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
+            accruedInterest: utils.bigInt(0, 6),
+            debt: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
             balances: [{
               token: '#Token_1',
               BI: utils.bigInt(6000, 6),
@@ -288,7 +289,8 @@ local newCollateral = 1;
           repayAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount / 2, 6),
           cumulativeIndexAtOpen: utils.bigInt(1, 27),
           borrowedAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount / 2, 6),
-          borrowedAmountPlusInterest: utils.bigInt(borrowedAmount + extraBorrowedAmount / 2, 6),
+          accruedInterest: utils.bigInt(0, 6),
+          debt: utils.bigInt(borrowedAmount + extraBorrowedAmount / 2, 6),
           balances: [{
             token: '#Token_1',
             BI: utils.bigInt(5500, 6),
@@ -374,7 +376,8 @@ local newCollateral = 1;
           repayAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount / 2, 6),
           cumulativeIndexAtOpen: utils.bigInt(1, 27),
           borrowedAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount / 2, 6),
-          borrowedAmountPlusInterest: utils.bigInt(borrowedAmount + extraBorrowedAmount / 2, 6),
+          accruedInterest: utils.bigInt(0, 6),
+          debt: utils.bigInt(borrowedAmount + extraBorrowedAmount / 2, 6),
           balances: [{
             token: '#Token_1',
             BI: utils.bigInt(500, 6),

diff --git a/jsonnet/close_credit_account/input.jsonnet b/jsonnet/close_credit_account/input.jsonnet
@@ -22,7 +22,8 @@ local newCollateral = 1;
           repayAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
           cumulativeIndexAtOpen: utils.bigInt(1, 27),
           borrowedAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
-          borrowedAmountPlusInterest: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
+          accruedInterest: utils.bigInt(0, 6),
+          debt: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
           balances: [{
             token: '#Token_1',
             BI: utils.bigInt(2000, 6),

diff --git a/jsonnet/close_credit_account_v2/input.jsonnet b/jsonnet/close_credit_account_v2/input.jsonnet
@@ -50,7 +50,8 @@ local extraBorrowedAmount = 1000;
           repayAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount / 2, 6),
           cumulativeIndexAtOpen: utils.bigInt(1, 27),
           borrowedAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount / 2, 6),
-          borrowedAmountPlusInterest: utils.bigInt(borrowedAmount + extraBorrowedAmount / 2, 6),
+          accruedInterest: utils.bigInt(0, 6),
+          debt: utils.bigInt(borrowedAmount + extraBorrowedAmount / 2, 6),
           balances: [
             {
               token: '#Token_1',

diff --git a/jsonnet/liquidate_credit_account/input.jsonnet b/jsonnet/liquidate_credit_account/input.jsonnet
@@ -37,7 +37,8 @@ local extraBorrowedAmount = 1000;
             liquidationAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
             cumulativeIndexAtOpen: utils.bigInt(1, 27),
             borrowedAmount: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
-            borrowedAmountPlusInterest: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
+            accruedInterest: utils.bigInt(0, 6),
+            debt: utils.bigInt(borrowedAmount + extraBorrowedAmount, 6),
             balances: [{
               token: '#Token_1',
               BI: utils.bigInt(2000, 6),

diff --git a/jsonnet/multiple_facade_interaction_single_tx/input.jsonnet b/jsonnet/multiple_facade_interaction_single_tx/input.jsonnet
@@ -157,7 +157,8 @@ local moreCollateral = 1000;
             repayAmount: utils.bigInt(borrowedAmount, 6),
             cumulativeIndexAtOpen: utils.bigInt(1, 27),
             borrowedAmount: utils.bigInt(borrowedAmount, 6),
-            borrowedAmountPlusInterest: utils.bigInt(borrowedAmount, 6),
+            accruedInterest: utils.bigInt(0, 6),
+            debt: utils.bigInt(borrowedAmount, 6),
             balances: [{
               token: '#Token_1',
               BI: utils.bigInt(6000, 6),
@@ -187,7 +188,8 @@ local moreCollateral = 1000;
           repayAmount: utils.bigInt(borrowedAmount, 6),
           cumulativeIndexAtOpen: utils.bigInt(1, 27),
           borrowedAmount: utils.bigInt(borrowedAmount, 6),
-          borrowedAmountPlusInterest: utils.bigInt(borrowedAmount, 6),
+          debt: utils.bigInt(borrowedAmount, 6),
+          accruedInterest: utils.bigInt(0, 6),
           balances: [
             {
               token: '#Token_1',
@@ -318,7 +320,8 @@ local moreCollateral = 1000;
           repayAmount: utils.bigInt(borrowedAmount, 6),
           cumulativeIndexAtOpen: utils.bigInt(1, 27),
           borrowedAmount: utils.bigInt(borrowedAmount, 6),
-          borrowedAmountPlusInterest: utils.bigInt(borrowedAmount, 6),
+          debt: utils.bigInt(borrowedAmount, 6),
+          accruedInterest: utils.bigInt(0, 6),
           balances: [
             {
               token: '#Token_1',

diff --git a/jsonnet/open_credit_account/input.jsonnet b/jsonnet/open_credit_account/input.jsonnet
@@ -128,7 +128,8 @@ local borrowedAmount = 4000;
             repayAmount: utils.bigInt(borrowedAmount, 6),
             cumulativeIndexAtOpen: utils.bigInt(1, 27),
             borrowedAmount: utils.bigInt(borrowedAmount, 6),
-            borrowedAmountPlusInterest: utils.bigInt(borrowedAmount, 6),
+            debt: utils.bigInt(borrowedAmount, 6),
+            accruedInterest: utils.bigInt(0, 6),
             balances: [{
               token: '#Token_1',
               BI: utils.bigInt(5000, 6),