Problem: pystarport don't have standalone repository (fix #555) (#580)

Solution: separate pystarport repo

Makefile

@@ -159,7 +159,7 @@ nix-integration-test-upgrade: check-network
 	nix run -f ./default.nix run-integration-tests -c run-integration-tests "pytest -v -m upgrade"	
 
 nix-integration-test-ledger: check-network 
-	nix run -f ./default.nix run-integration-tests -c run-integration-tests "pytest -v -m ledger"		
+	nix run -f ./default.nix run-integration-tests-zemu -c run-integration-tests "pytest -v -m ledger"		
 
 nix-integration-test-slow: check-network 
 	nix run -f ./default.nix run-integration-tests -c run-integration-tests "pytest -v -m slow"

default.nix

@@ -68,6 +68,7 @@ rec {
   inherit (pkgs) hermes cosmovisor;
 
   chain-maind = build-chain-maind { };
+
   pystarport = import ./pystarport { inherit pkgs; chaind = "${chain-maind}/bin/chain-maind"; };
 
   chain-maind-testnet = build-chain-maind { network = "testnet"; };
@@ -133,6 +134,8 @@ rec {
     set -e
     export PATH=${ci-env}/bin:$PATH
     export TESTS=${tests_src}/integration_tests
+    export PYTHONPATH=$PWD/pystarport/proto_python/:$PYTHONPATH
+    export CHAIN_MAIND="${chain-maind}/bin/chain-maind"
     # check argument exists, then use it, otherwise use default
     if [ -z $1 ]
     then 
@@ -142,6 +145,24 @@ rec {
     fi
   '';
 
+  run-integration-tests-zemu = pkgs.writeShellScriptBin "run-integration-tests" ''
+    set -e
+    export PATH=${ci-env}/bin:$PATH
+    export TESTS=${tests_src}/integration_tests
+    export PYTHONPATH=$PWD/pystarport/proto_python/:$PYTHONPATH
+    export CHAIN_MAIND="${chain-maind-zemu}/bin/chain-maind"
+    echo "CHAIN_MAIND="$CHAIN_MAIND
+    # check argument exists, then use it, otherwise use default
+    if [ -z $1 ]
+    then 
+      pytest -v -m 'not upgrade and not ledger and not slow and not ibc and not byzantine and not gov and not grpc' $TESTS
+    else 
+      $1 $TESTS
+    fi
+  '';
+
+
+
   ci-shell = pkgs.mkShell {
     buildInputs = [
       ci-env

integration_tests/pyproject.toml

@@ -18,7 +18,7 @@ protobuf = "^3.13.0"
 grpcio = "^1.33.2"
 PyYAML = "^5.3.1"
 python-dateutil = "^2.8.1"
-pystarport = {path = "../pystarport"}
+pystarport = "^0.2.1"
 chainlibpy = "^1.0.0"
 
 [tool.poetry.dev-dependencies]

integration_tests/test_basic.py

@@ -90,5 +90,5 @@ def test_statesync(cluster):
     cluster.supervisor.startProcess(f"{cluster.chain_id}-node{i}")
 
     # discovery_time is set to 5 seconds, add extra seconds for processing
-    wait_for_block(cluster.cosmos_cli(i), 5)
+    wait_for_block(cluster.cosmos_cli(i), 10)
     print("succesfully syncing")

makeproto.sh

@@ -1,3 +1,2 @@
 #!/bin/bash
-cd ./pystarport/pystarport
-nix-shell . --run ""
+nix-shell proto.nix --run ""

pystarport/pystarport/default.nix → proto.nix

@@ -1,4 +1,4 @@
-{ pkgs ? import ../../nix { }, commit ? "" }:
+{ pkgs ? import ./nix { }, commit ? "" }:
 with pkgs;
 pkgs.mkShell {
   buildInputs = [
@@ -8,5 +8,6 @@ pkgs.mkShell {
     git
   ];
   shellHook = ''                                                                                       
+  cd ./pystarport
   ./convert.sh                                                                                          '';
 }

pystarport/pystarport/convert.sh → pystarport/convert.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 OUTPUT=./proto_python
-COSMOS=../../third_party/cosmos-sdk
+COSMOS=../third_party/cosmos-sdk
 TENDERMINT=./tendermint
 TMP=$(whereis grpc_python_plugin)
 PLUGIN="$(cut -d' ' -f2 <<<"$TMP")"

pystarport/default.nix

@@ -1,9 +1,3 @@
 { pkgs ? import <nixpkgs> { }
-, chaind ? "chain-maind"
 }:
-pkgs.poetry2nix.mkPoetryApplication {
-  projectDir = ./.;
-  preBuild = ''
-    sed -i -e 's@CHAIN = ""  # edit by nix-build@CHAIN = "${chaind}"@' pystarport/app.py
-  '';
-}
+pkgs.poetry2nix.mkPoetryEnv { projectDir = ./.; }