[TA-3630] integration and upgrade testutils

.github/workflows/unit-coverage.yml

@@ -0,0 +1,22 @@
+name: Coverage
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ '**' ]
+jobs:
+  build:
+    name: Unit test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+
+      - name: Generate unit test coverage
+        run: make coverage-unit
+
+      - name: Check unit test coverage
+        uses: vladopajic/go-test-coverage@v2
+        with:
+          # Configure action using config file (option 1)
+          config: ./.testcoverage.yml

.gitignore

@@ -8,5 +8,7 @@ release/
 
 
 .exrpd/
+*.out
+*.html
 
 bin/

.testcoverage.yml

@@ -0,0 +1,55 @@
+# (mandatory) 
+# Path to coverage profile file (output of `go test -coverprofile` command).
+#
+# For cases where there are many coverage profiles, such as when running 
+# unit tests and integration tests separately, you can combine all those
+# profiles into one. In this case, the profile should have a comma-separated list 
+# of profile files, e.g., 'cover_unit.out,cover_integration.out'.
+profile: coverage_unit.out
+
+# (optional; but recommended to set) 
+# When specified reported file paths will not contain local prefix in the output.
+local-prefix: "github.com/xrplevm/node"
+
+# Holds coverage thresholds percentages, values should be in range [0-100].
+threshold:
+  # (optional; default 0) 
+  # Minimum overall project coverage percentage required.
+  total: 70
+
+# Holds regexp rules which will override thresholds for matched files or packages 
+# using their paths.
+#
+# First rule from this list that matches file or package is going to apply 
+# new threshold to it. If project has multiple rules that match same path, 
+# override rules should be listed in order from specific to more general rules.
+# override:
+  # Increase coverage threshold to 100% for `foo` package 
+  # (default is 80, as configured above in this example).
+  # - path: ^pkg/lib/foo$
+  #   threshold: 100
+
+# Holds regexp rules which will exclude matched files or packages 
+# from coverage statistics.
+exclude:
+  # Exclude files or packages matching their paths
+  paths:
+    - cmd
+    - docs
+    - app
+    - tools
+    - tests
+    - \.pb\.go$
+    - \.pb\.gw\.go$
+    - module.go$
+    - \/testutil\/
+    - \/client\/
+
+# File name of go-test-coverage breakdown file, which can be used to 
+# analyze coverage difference.
+breakdown-file-name: ''
+
+diff:
+  # File name of go-test-coverage breakdown file which will be used to 
+  # report coverage difference.
+  base-breakdown-file-name: ''

Dockerfile

@@ -18,6 +18,9 @@ FROM base AS integration
 RUN make lint
 # Unit tests
 RUN make test-poa
+# Integration tests
+RUN make test-integration
+RUN make test-upgrade
 # Simulation tests
 RUN make test-sim-benchmark-simulation
 RUN make test-sim-full-app-fast

Makefile

@@ -118,14 +118,23 @@ lint-fix:
 ###                                Testing                                  ###
 ###############################################################################
 EXCLUDED_POA_PACKAGES=$(shell go list ./x/poa/... | grep -v /x/poa/testutil | grep -v /x/poa/client | grep -v /x/poa/simulation | grep -v /x/poa/types)
+EXCLUDED_UNIT_PACKAGES=$(shell go list ./... | grep -v tests | grep -v testutil | grep -v tools | grep -v app | grep -v docs | grep -v cmd | grep -v /x/poa/testutil | grep -v /x/poa/client | grep -v /x/poa/simulation | grep -v /x/poa/types)
 
 mocks:
 	@echo "--> Installing mockgen"
 	go install github.com/golang/mock/mockgen@v1.6.0
 	@echo "--> Generating mocks"
 	@./scripts/mockgen.sh
 
-test: test-poa test-sim-benchmark-simulation test-sim-full-app-fast
+test: test-poa test-integration test-upgrade test-sim-benchmark-simulation test-sim-full-app-fast
+
+test-upgrade:
+	@echo "--> Running upgrade testsuite"
+	@go test -mod=readonly -v ./tests/upgrade
+
+test-integration:
+	@echo "--> Running integration testsuite"
+	@go test -mod=readonly -v ./tests/integration
 
 test-poa:
 	@echo "--> Running POA tests"
@@ -142,6 +151,25 @@ test-sim-full-app-fast:
 	@cd ${CURDIR}/app && go test -mod=readonly -run TestFullAppSimulation \
 		-Enabled=true -NumBlocks=100 -BlockSize=200 -Commit=true -Period=5 -Params=${CURDIR}/tests/sim/params.json -v -timeout 24h
 
+###############################################################################
+###                                Coverage                                 ###
+###############################################################################
+
+coverage-unit:
+	@echo "--> Running unit coverage"
+	@go test $(EXCLUDED_UNIT_PACKAGES) -coverprofile=coverage_unit.out > /dev/null
+	@go tool cover -func=coverage_unit.out
+
+coverage-poa:
+	@echo "--> Running POA coverage"
+	@go test $(EXCLUDED_POA_PACKAGES) -coverprofile=coverage_poa.out > /dev/null
+	@go tool cover -func=coverage_poa.out
+
+coverage-integration:
+	@echo "--> Running integration coverage"
+	@go test ./tests/integration -mod=readonly -coverprofile=coverage_integration.out > /dev/null
+	@go tool cover -func=coverage_integration.out
+
 ###############################################################################
 ###                                Protobuf                                 ###
 ###############################################################################

tests/integration/network.go

@@ -0,0 +1,79 @@
+package integration
+
+import (
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	"github.com/cosmos/cosmos-sdk/x/authz"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
+	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
+	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	erc20types "github.com/evmos/evmos/v20/x/erc20/types"
+	evmtypes "github.com/evmos/evmos/v20/x/evm/types"
+	feemarkettypes "github.com/evmos/evmos/v20/x/feemarket/types"
+	commonnetwork "github.com/xrplevm/node/v6/testutil/integration/common/network"
+	exrpcommon "github.com/xrplevm/node/v6/testutil/integration/exrp/common"
+	exrpintegration "github.com/xrplevm/node/v6/testutil/integration/exrp/integration"
+	poatypes "github.com/xrplevm/node/v6/x/poa/types"
+)
+
+var _ commonnetwork.Network = (*Network)(nil)
+
+type Network struct {
+	exrpintegration.IntegrationNetwork
+}
+
+func NewIntegrationNetwork(opts ...exrpcommon.ConfigOption) *Network {
+	network := exrpintegration.New(opts...)
+	return &Network{
+		IntegrationNetwork: *network,
+	}
+}
+
+func (n *Network) SetupSdkConfig() {
+	exrpcommon.SetupSdkConfig()
+}
+
+func (n *Network) GetERC20Client() erc20types.QueryClient {
+	return exrpcommon.GetERC20Client(n)
+}
+
+func (n *Network) GetEvmClient() evmtypes.QueryClient {
+	return exrpcommon.GetEvmClient(n)
+}
+
+func (n *Network) GetGovClient() govtypes.QueryClient {
+	return exrpcommon.GetGovClient(n)
+}
+
+func (n *Network) GetBankClient() banktypes.QueryClient {
+	return exrpcommon.GetBankClient(n)
+}
+
+func (n *Network) GetFeeMarketClient() feemarkettypes.QueryClient {
+	return exrpcommon.GetFeeMarketClient(n)
+}
+
+func (n *Network) GetAuthClient() authtypes.QueryClient {
+	return exrpcommon.GetAuthClient(n)
+}
+
+func (n *Network) GetAuthzClient() authz.QueryClient {
+	return exrpcommon.GetAuthzClient(n)
+}
+
+func (n *Network) GetStakingClient() stakingtypes.QueryClient {
+	return exrpcommon.GetStakingClient(n)
+}
+
+func (n *Network) GetSlashingClient() slashingtypes.QueryClient {
+	return exrpcommon.GetSlashingClient(n)
+}
+
+func (n *Network) GetDistrClient() distrtypes.QueryClient {
+	return exrpcommon.GetDistrClient(n)
+}
+
+func (n *Network) GetPoaClient() poatypes.QueryClient {
+	return exrpcommon.GetPoaClient(n)
+}