From 9c295cee8152b3a3527e81d9d4c8e6113347459a Mon Sep 17 00:00:00 2001
From: mmsqe <mavis@crypto.com>
Date: Fri, 7 Jul 2023 13:24:28 +0800
Subject: [PATCH] Problem: recent version of pystarport is not used (#1000)

* Problem: recent version of pystarport is not used

* point to fix create node

* Update integration_tests/poetry.lock

Signed-off-by: mmsqe <mavis@crypto.com>

---------

Signed-off-by: mmsqe <mavis@crypto.com>
---
 integration_tests/configs/default.jsonnet      | 5 +----
 integration_tests/configs/ibc.jsonnet          | 5 +----
 integration_tests/configs/ledger.jsonnet       | 3 ++-
 integration_tests/configs/nft_transfer.jsonnet | 5 +----
 integration_tests/configs/slashing.jsonnet     | 8 +++++++-
 integration_tests/configs/staking.jsonnet      | 6 +++++-
 integration_tests/configs/validator.jsonnet    | 7 +++++++
 integration_tests/poetry.lock                  | 4 ++--
 integration_tests/test_staking.py              | 2 +-
 9 files changed, 27 insertions(+), 18 deletions(-)
 create mode 100644 integration_tests/configs/validator.jsonnet

diff --git a/integration_tests/configs/default.jsonnet b/integration_tests/configs/default.jsonnet
index 47a59352c..9f39d3706 100644
--- a/integration_tests/configs/default.jsonnet
+++ b/integration_tests/configs/default.jsonnet
@@ -1,9 +1,6 @@
 local default = import 'accounts.jsonnet';
 local genesis = import 'genesis.jsonnet';
-local validator = {
-  coins: '10cro',
-  staked: '10cro',
-};
+local validator = import 'validator.jsonnet';
 
 {
   chaintest: {
diff --git a/integration_tests/configs/ibc.jsonnet b/integration_tests/configs/ibc.jsonnet
index 6429aa9dd..9f403925f 100644
--- a/integration_tests/configs/ibc.jsonnet
+++ b/integration_tests/configs/ibc.jsonnet
@@ -20,10 +20,7 @@ local default = {
     },
   },
 };
-local validator = {
-  coins: '10cro',
-  staked: '10cro',
-};
+local validator = import 'validator.jsonnet';
 
 {
   'ibc-0': default {
diff --git a/integration_tests/configs/ledger.jsonnet b/integration_tests/configs/ledger.jsonnet
index c391b5c05..ec638c188 100644
--- a/integration_tests/configs/ledger.jsonnet
+++ b/integration_tests/configs/ledger.jsonnet
@@ -1,9 +1,10 @@
 local default = import 'accounts.jsonnet';
 local genesis = import 'genesis.jsonnet';
+local validator = import 'validator.jsonnet';
 
 {
   chaintest: {
-    validators: [{ coins: value, staked: value } for value in ['10cro', '10cro']],
+    validators: [validator, validator],
     accounts: default.reserves,
     hw_account: {
       name: 'hw',
diff --git a/integration_tests/configs/nft_transfer.jsonnet b/integration_tests/configs/nft_transfer.jsonnet
index ca40b8287..26f830988 100644
--- a/integration_tests/configs/nft_transfer.jsonnet
+++ b/integration_tests/configs/nft_transfer.jsonnet
@@ -11,10 +11,7 @@ local default = {
   ],
   genesis: {},
 };
-local validator = {
-  coins: '10cro',
-  staked: '10cro',
-};
+local validator = import 'validator.jsonnet';
 
 {
   'ibc-0': default {
diff --git a/integration_tests/configs/slashing.jsonnet b/integration_tests/configs/slashing.jsonnet
index 37a9a6919..2caf77e47 100644
--- a/integration_tests/configs/slashing.jsonnet
+++ b/integration_tests/configs/slashing.jsonnet
@@ -3,7 +3,13 @@ local genesis = import 'genesis.jsonnet';
 
 {
   slashingtest: {
-    validators: [{ coins: value, staked: value } for value in ['40cro', '10cro', '10cro']],
+    validators: [{
+      coins: value,
+      staked: value,
+      client_config: {
+        'broadcast-mode': 'block',
+      },
+    } for value in ['40cro', '10cro', '10cro']],
     accounts: default.accounts + default.reserves,
     genesis: {
       app_state: {
diff --git a/integration_tests/configs/staking.jsonnet b/integration_tests/configs/staking.jsonnet
index e947ff465..9dbe53906 100644
--- a/integration_tests/configs/staking.jsonnet
+++ b/integration_tests/configs/staking.jsonnet
@@ -1,11 +1,15 @@
 local default = import 'accounts.jsonnet';
 local genesis = import 'genesis.jsonnet';
+local validator = import 'validator.jsonnet';
 {
   stakingtest: {
-    validators: [{ coins: value, staked: value } for value in ['10cro', '10cro']] + [{
+    validators: [validator, validator] + [{
       coins: '1cro',
       staked: '1cro',
       min_self_delegation: 10000000,  // 0.1cro
+      client_config: {
+        'broadcast-mode': 'block',
+      },
     }],
     accounts: default.accounts + [
       {
diff --git a/integration_tests/configs/validator.jsonnet b/integration_tests/configs/validator.jsonnet
new file mode 100644
index 000000000..7a6a3d5b4
--- /dev/null
+++ b/integration_tests/configs/validator.jsonnet
@@ -0,0 +1,7 @@
+{
+  coins: '10cro',
+  staked: '10cro',
+  client_config: {
+    'broadcast-mode': 'block',
+  },
+}
diff --git a/integration_tests/poetry.lock b/integration_tests/poetry.lock
index 558f1e45b..ac8c0a4ce 100644
--- a/integration_tests/poetry.lock
+++ b/integration_tests/poetry.lock
@@ -776,7 +776,7 @@ files = [
 
 [[package]]
 name = "pystarport"
-version = "0.2.4"
+version = "0.2.5"
 description = "Spawn local devnets for cosmos-sdk chains"
 optional = false
 python-versions = "^3.8"
@@ -802,7 +802,7 @@ tomlkit = "^0.7.0"
 type = "git"
 url = "https://github.com/crypto-com/pystarport.git"
 reference = "main"
-resolved_reference = "ff645505d5052e11ecc56b6933af8f5f2a6b4373"
+resolved_reference = "f447aa05dc2401c70db747fe66747230c8cf736d"
 
 [[package]]
 name = "pytest"
diff --git a/integration_tests/test_staking.py b/integration_tests/test_staking.py
index a94b693be..7d7904a5f 100644
--- a/integration_tests/test_staking.py
+++ b/integration_tests/test_staking.py
@@ -132,7 +132,7 @@ def test_staking_redelegate(cluster):
 
 
 def test_join_validator(cluster):
-    i = cluster.create_node(moniker="new joined")
+    i = cluster.create_node(moniker="new joined", broadcastmode="block")
     addr = cluster.address("validator", i)
     # transfer 1cro from ecosystem account
     assert cluster.transfer(cluster.address("ecosystem"), addr, "1cro")["code"] == 0