fix: update regression tests

arkeonetwork · Sep 17, 2024 · 652f72c · 652f72c
1 parent 051443a
commit 652f72c
Show file tree

Hide file tree

Showing 10 changed files with 115 additions and 57 deletions.
diff --git a/directory/indexer/consumer.go b/directory/indexer/consumer.go
@@ -238,6 +238,9 @@ func convertEventToMap(event abcitypes.Event) (map[string]any, error) {
 		if attr.Key == "msg_index" {
 			continue
 		}
+		if attr.Key == "mode" {
+			continue
+		}
 		switch attrValue[0] {
 		case '{':
 			var nest any

diff --git a/test/regression/mnt/exports/suites_contracts_pay-as-you-go.json b/test/regression/mnt/exports/suites_contracts_pay-as-you-go.json
@@ -26,7 +26,7 @@
           "authorization": "STRICT",
           "client": "tarkeopub1addwnpepq2res6tu0m73ulk5sepgp6g3y37schfgymxy8z6l3lc78k7ju9u45yajwem",
           "delegate": "",
-          "deposit": "100",
+          "deposit": "3",
           "duration": "10",
           "height": "2",
           "id": "1",
@@ -40,7 +40,7 @@
           },
           "service": 1,
           "settlement_duration": "11",
-          "settlement_height": "0",
+          "settlement_height": "15",
           "type": "PAY_AS_YOU_GO"
         }
       ],
@@ -72,16 +72,7 @@
           ]
         }
       ],
-      "user_contract_sets": [
-        {
-          "contract_set": {
-            "contract_ids": [
-              "1"
-            ]
-          },
-          "user": "tarkeopub1addwnpepq2res6tu0m73ulk5sepgp6g3y37schfgymxy8z6l3lc78k7ju9u45yajwem"
-        }
-      ],
+      "user_contract_sets": [],
       "version": "0"
     },
     "auth": {
@@ -273,20 +264,11 @@
             }
           ]
         },
-        {
-          "address": "tarkeo1kz2dkl8zlxwte008astc5e65htrxdcse6x3h3h",
-          "coins": [
-            {
-              "amount": "97",
-              "denom": "uarkeo"
-            }
-          ]
-        },
         {
           "address": "tarkeo1uhapc6jjq6ns0ydnk7zld5x7f5kl2ukemjw5fg",
           "coins": [
             {
-              "amount": "999999899999900",
+              "amount": "999999899999997",
               "denom": "uarkeo"
             }
           ]
@@ -340,6 +322,19 @@
         }
       ]
     },
+    "claimarkeo": {
+      "claim_records": [],
+      "module_account_balance": {
+        "amount": "0",
+        "denom": "uarkeo"
+      },
+      "params": {
+        "claim_denom": "uarkeo",
+        "duration_of_decay": "3600s",
+        "duration_until_decay": "3600s",
+        "initial_gas_amount": null
+      }
+    },
     "crisis": {
       "constant_fee": {
         "amount": "1000",

diff --git a/test/regression/mnt/exports/suites_contracts_subscription.json b/test/regression/mnt/exports/suites_contracts_subscription.json
@@ -31,7 +31,7 @@
           "height": "2",
           "id": "1",
           "nonce": "0",
-          "paid": "0",
+          "paid": "100",
           "provider": "tarkeopub1addwnpepqtsg8syrpcn60t2nnvnhtk6psr8qxlrtwjk8rmpkhxk9vy9wkd8ewmqv7rh",
           "queries_per_minute": "1",
           "rate": {
@@ -40,7 +40,7 @@
           },
           "service": 1,
           "settlement_duration": "11",
-          "settlement_height": "0",
+          "settlement_height": "12",
           "type": "SUBSCRIPTION"
         },
         {
@@ -93,16 +93,7 @@
           ]
         }
       ],
-      "user_contract_sets": [
-        {
-          "contract_set": {
-            "contract_ids": [
-              "1"
-            ]
-          },
-          "user": "tarkeopub1addwnpepq2res6tu0m73ulk5sepgp6g3y37schfgymxy8z6l3lc78k7ju9u45yajwem"
-        }
-      ],
+      "user_contract_sets": [],
       "version": "0"
     },
     "auth": {
@@ -268,7 +259,7 @@
           "address": "tarkeo1v0n7wer498vqq6yddkr4clg3lck7kaw9lstp4k",
           "coins": [
             {
-              "amount": "1000000000000018",
+              "amount": "1000000000000108",
               "denom": "uarkeo"
             }
           ]
@@ -277,7 +268,7 @@
           "address": "tarkeo1d0m97ywk2y4vq58ud6q5e0r3q9khj9e3unfe4t",
           "coins": [
             {
-              "amount": "200000002",
+              "amount": "200000012",
               "denom": "uarkeo"
             }
           ]
@@ -291,15 +282,6 @@
             }
           ]
         },
-        {
-          "address": "tarkeo1kz2dkl8zlxwte008astc5e65htrxdcse6x3h3h",
-          "coins": [
-            {
-              "amount": "100",
-              "denom": "uarkeo"
-            }
-          ]
-        },
         {
           "address": "tarkeo1uhapc6jjq6ns0ydnk7zld5x7f5kl2ukemjw5fg",
           "coins": [
@@ -358,6 +340,19 @@
         }
       ]
     },
+    "claimarkeo": {
+      "claim_records": [],
+      "module_account_balance": {
+        "amount": "0",
+        "denom": "uarkeo"
+      },
+      "params": {
+        "claim_denom": "uarkeo",
+        "duration_of_decay": "3600s",
+        "duration_until_decay": "3600s",
+        "initial_gas_amount": null
+      }
+    },
     "crisis": {
       "constant_fee": {
         "amount": "1000",
@@ -708,7 +703,7 @@
     "upgrade": {},
     "vesting": {}
   },
- "app_version": "v1.0.0-prerelease",
+  "app_version": "v1.0.0-prerelease",
   "chain_id": "arkeo",
   "consensus": {
     "params": {

diff --git a/test/regression/mnt/exports/suites_core_send.json b/test/regression/mnt/exports/suites_core_send.json
@@ -215,6 +215,19 @@
         }
       ]
     },
+    "claimarkeo": {
+      "claim_records": [],
+      "module_account_balance": {
+        "amount": "0",
+        "denom": "uarkeo"
+      },
+      "params": {
+        "claim_denom": "uarkeo",
+        "duration_of_decay": "3600s",
+        "duration_until_decay": "3600s",
+        "initial_gas_amount": null
+      }
+    },
     "crisis": {
       "constant_fee": {
         "amount": "1000",
@@ -565,7 +578,7 @@
     "upgrade": {},
     "vesting": {}
   },
- "app_version": "v1.0.0-prerelease",
+  "app_version": "v1.0.0-prerelease",
   "chain_id": "arkeo",
   "consensus": {
     "params": {

diff --git a/test/regression/mnt/exports/suites_initialize.json b/test/regression/mnt/exports/suites_initialize.json
@@ -212,6 +212,19 @@
         }
       ]
     },
+    "claimarkeo": {
+      "claim_records": [],
+      "module_account_balance": {
+        "amount": "0",
+        "denom": "uarkeo"
+      },
+      "params": {
+        "claim_denom": "uarkeo",
+        "duration_of_decay": "3600s",
+        "duration_until_decay": "3600s",
+        "initial_gas_amount": null
+      }
+    },
     "crisis": {
       "constant_fee": {
         "amount": "1000",
@@ -562,7 +575,7 @@
     "upgrade": {},
     "vesting": {}
   },
- "app_version": "v1.0.0-prerelease",
+  "app_version": "v1.0.0-prerelease",
   "chain_id": "arkeo",
   "consensus": {
     "params": {

diff --git a/test/regression/mnt/exports/suites_providers_providers.json b/test/regression/mnt/exports/suites_providers_providers.json
@@ -226,6 +226,19 @@
         }
       ]
     },
+    "claimarkeo": {
+      "claim_records": [],
+      "module_account_balance": {
+        "amount": "0",
+        "denom": "uarkeo"
+      },
+      "params": {
+        "claim_denom": "uarkeo",
+        "duration_of_decay": "3600s",
+        "duration_until_decay": "3600s",
+        "initial_gas_amount": null
+      }
+    },
     "crisis": {
       "constant_fee": {
         "amount": "1000",

diff --git a/test/regression/mnt/exports/suites_sentinel_contract_config.json b/test/regression/mnt/exports/suites_sentinel_contract_config.json
@@ -319,6 +319,19 @@
         }
       ]
     },
+    "claimarkeo": {
+      "claim_records": [],
+      "module_account_balance": {
+        "amount": "0",
+        "denom": "uarkeo"
+      },
+      "params": {
+        "claim_denom": "uarkeo",
+        "duration_of_decay": "3600s",
+        "duration_until_decay": "3600s",
+        "initial_gas_amount": null
+      }
+    },
     "crisis": {
       "constant_fee": {
         "amount": "1000",

diff --git a/test/regression/mnt/exports/suites_sentinel_sentinel.json b/test/regression/mnt/exports/suites_sentinel_sentinel.json
@@ -212,6 +212,19 @@
         }
       ]
     },
+    "claimarkeo": {
+      "claim_records": [],
+      "module_account_balance": {
+        "amount": "0",
+        "denom": "uarkeo"
+      },
+      "params": {
+        "claim_denom": "uarkeo",
+        "duration_of_decay": "3600s",
+        "duration_until_decay": "3600s",
+        "initial_gas_amount": null
+      }
+    },
     "crisis": {
       "constant_fee": {
         "amount": "1000",

diff --git a/test/regression/suites/contracts/pay-as-you-go.yaml b/test/regression/suites/contracts/pay-as-you-go.yaml
@@ -236,12 +236,12 @@ description: cat account balance should increase
 endpoint: http://localhost:1317/cosmos/bank/v1beta1/balances/{{ addr_cat }}
 asserts:
   - .balances|length == 1
-  - .balances[]|select(.denom == "uarkeo")|.amount|tonumber == 999999899999900
+  - .balances[]|select(.denom == "uarkeo")|.amount|tonumber == 999999899999997
 ---
 type: check
 description: ensure contract is closed
 endpoint: http://localhost:1317/arkeo/contract/1
 asserts:
   - .contract.paid == "3"
-  - .contract.deposit == "100"
----
+  - .contract.deposit == "3"
+---
diff --git a/test/regression/suites/contracts/subscription.yaml b/test/regression/suites/contracts/subscription.yaml
@@ -94,14 +94,14 @@ type: check
 description: ensure contract is closed
 endpoint: http://localhost:1317/arkeo/contract/1
 asserts:
-  - .contract.paid == "0"
+  - .contract.paid == "100"
 ---
 type: check
 description: fox account balance should increase
 endpoint: http://localhost:1317/cosmos/bank/v1beta1/balances/{{ addr_fox }}
 asserts:
   - .balances|length == 1
-  - .balances[]|select(.denom == "uarkeo")|.amount|tonumber == 1000000000000000 # fox gets 90 due to 10% tax to reserve
+  - .balances[]|select(.denom == "uarkeo")|.amount|tonumber == 1000000000000090 # fox gets 90 due to 10% tax to reserve
 ---
 type: check
 description: check that contract is in directory service
@@ -111,8 +111,8 @@ asserts:
   - .client_pubkey == "tarkeopub1addwnpepq2res6tu0m73ulk5sepgp6g3y37schfgymxy8z6l3lc78k7ju9u45yajwem"
   - .contract_type == "SUBSCRIPTION"
   - .settlement_duration == 11 
-  - .paid == 0
-  - .reserve_contrib_asset == 0
+  - .paid == 100
+  - .reserve_contrib_asset == 10
 # - .reserve_contrib_usd == 10 # TODO
 ---
 ########################################################################################
@@ -209,7 +209,7 @@ description: fox account balance should increase
 endpoint: http://localhost:1317/cosmos/bank/v1beta1/balances/{{ addr_fox }}
 asserts:
   - .balances|length == 1
-  - .balances[]|select(.denom == "uarkeo")|.amount|tonumber == 1000000000000018
+  - .balances[]|select(.denom == "uarkeo")|.amount|tonumber == 1000000000000108
 ---
 type: check
 description: ensure contract is closed
@@ -225,4 +225,4 @@ asserts:
   - .paid == 20
   - .reserve_contrib_asset == 2
 # - .reserve_contrib_usd == 10 # TODO
-  - .settlement_duration == 11 
+  - .settlement_duration == 11