[E2E relay test] Update to #178

.gitignore

@@ -62,4 +62,13 @@ localnet_config.yaml
 # Relase artifacts produced by `ignite chain build --release`
 release
 
+# SMT KVStore files
+smt
+
+# Do not allow a multi-moduled projected
 go.work.sum
+
+# TODO_IN_THIS_COMMIT: Why did we start generating .dot files?
+# **/*.dot
+
+

Makefile

@@ -2,6 +2,7 @@
 
 POKTROLLD_HOME := ./localnet/poktrolld
 POCKET_NODE = tcp://127.0.0.1:36657 # The pocket rollup node (full node and sequencer in the localnet context)
+APPGATE_SERVER = http://localhost:42069
 POCKET_ADDR_PREFIX = pokt
 
 ####################
@@ -136,6 +137,7 @@ go_imports: check_go_version ## Run goimports on all go files
 .PHONY: test_e2e
 test_e2e: ## Run all E2E tests
  export POCKET_NODE=$(POCKET_NODE) && \
+ export APPGATE_SERVER=$(APPGATE_SERVER) && \
  POKTROLLD_HOME=../../$(POKTROLLD_HOME) && \
  go test -v ./e2e/tests/... -tags=e2e
 
@@ -281,7 +283,7 @@ app_stake: ## Stake tokens for the application specified (must specify the APP a
  poktrolld --home=$(POKTROLLD_HOME) tx application stake-application 1000upokt $(SERVICES) --keyring-backend test --from $(APP) --node $(POCKET_NODE)
 
 .PHONY: app1_stake
-app1_stake: ## Stake app1
+app1_stake: ## Stake app1 (also staked in genesis)
  APP=app1 SERVICES=anvil,svc1,svc2 make app_stake
 
 .PHONY: app2_stake
@@ -361,16 +363,23 @@ supplier_stake: ## Stake tokens for the supplier specified (must specify the APP
  poktrolld --home=$(POKTROLLD_HOME) tx supplier stake-supplier 1000upokt "$(SERVICES)" --keyring-backend test --from $(SUPPLIER) --node $(POCKET_NODE)
 
 .PHONY: supplier1_stake
-supplier1_stake: ## Stake supplier1
- SUPPLIER=supplier1 SERVICES="anvil;http://anvil:8547,svc1;http://localhost:8081" make supplier_stake
+supplier1_stake: ## Stake supplier1 (also staked in genesis)
+ # TODO_TECHDEBT(#179): once `relayminer` service is added to tilt, this hostname should point to that service.
+ # I.e.: replace `localhost` with `relayminer` (or whatever the service's hostname is).
+ # TODO_IMPROVE(#180): Make sure genesis-staked actors are available via AccountKeeper
+ SUPPLIER=supplier1 SERVICES="anvil;http://localhost:8545,svc1;http://localhost:8081" make supplier_stake
 
 .PHONY: supplier2_stake
 supplier2_stake: ## Stake supplier2
- SUPPLIER=supplier2 SERVICES="anvil;http://anvil:8547,svc2;http://localhost:8082" make supplier_stake
+ # TODO_TECHDEBT(#179): once `relayminer` service is added to tilt, this hostname should point to that service.
+ # I.e.: replace `localhost` with `relayminer` (or whatever the service's hostname is).
+ SUPPLIER=supplier2 SERVICES="anvil;http://localhost:8545,svc2;http://localhost:8082" make supplier_stake
 
 .PHONY: supplier3_stake
 supplier3_stake: ## Stake supplier3
- SUPPLIER=supplier3 SERVICES="anvil;http://anvil:8547,svc3;http://localhost:8083" make supplier_stake
+ # TODO_TECHDEBT(#179): once `relayminer` service is added to tilt, this hostname should point to that service.
+ # I.e.: replace `localhost` with `relayminer` (or whatever the service's hostname is).
+ SUPPLIER=supplier3 SERVICES="anvil;http://localhost:8545,svc3;http://localhost:8083" make supplier_stake
 
 .PHONY: supplier_unstake
 supplier_unstake: ## Unstake an supplier (must specify the SUPPLIER env var)

cmd/pocketd/cmd/root.go

@@ -44,6 +44,7 @@ import (
  "github.com/pokt-network/poktroll/app"
  appparams "github.com/pokt-network/poktroll/app/params"
  appgateservercmd "github.com/pokt-network/poktroll/pkg/appgateserver/cmd"
+ relayercmd "github.com/pokt-network/poktroll/pkg/relayer/cmd"
 )
 
 // NewRootCmd creates a new root command for a Cosmos SDK application
@@ -142,6 +143,11 @@ func initRootCmd(
  addModuleInitFlags,
  )
 
+ // add relayer command
+ rootCmd.AddCommand(
+ relayercmd.RelayerCmd(),
+ )
+
  // add keybase, auxiliary RPC, query, and tx child commands
  rootCmd.AddCommand(
  rpc.StatusCommand(),

cmd/signals/on_exit.go

@@ -0,0 +1,23 @@
+package signals
+
+import (
+ "os"
+ "os/signal"
+)
+
+// GoOnExitSignal calls the given callback when the process receives an interrupt
+// or kill signal.
+func GoOnExitSignal(onInterrupt func()) {
+ go func() {
+ // Set up sigCh to receive when this process receives an interrupt or
+ // kill signal.
+ sigCh := make(chan os.Signal, 1)
+ signal.Notify(sigCh, os.Interrupt, os.Kill)
+
+ // Block until we receive an interrupt or kill signal (OS-agnostic)
+ <-sigCh
+
+ // Call the onInterrupt callback.
+ onInterrupt()
+ }()
+}

config.yml

@@ -100,7 +100,8 @@ genesis:
  - endpoints:
  - configs: []
  rpc_type: JSON_RPC
- url: http://anvil:8547
+ # TODO_TECHDEBT(#179): once `relayminer` service is added to tilt, this hostname should point to it instead of `localhost`.
+ url: http://localhost:8545
  service:
  id: anvil
  name: ""

docs/static/openapi.yml

@@ -46480,7 +46480,7 @@ paths:
  service:
  title: >-
  The Service for which the application is
- configured
+ configured for
  type: object
  properties:
  id:
@@ -46660,7 +46660,9 @@ paths:
  type: object
  properties:
  service:
- title: The Service for which the application is configured
+ title: >-
+ The Service for which the application is configured
+ for
  type: object
  properties:
  id:
@@ -47176,7 +47178,7 @@ paths:
  service:
  title: >-
  The Service for which the application is
- configured
+ configured for
  type: object
  properties:
  id:
@@ -47243,7 +47245,7 @@ paths:
  service:
  title: >-
  The Service for which the supplier is
- configured
+ configured for
  type: object
  properties:
  id:
@@ -76787,7 +76789,7 @@ definitions:
  type: object
  properties:
  service:
- title: The Service for which the application is configured
+ title: The Service for which the application is configured for
  type: object
  properties:
  id:
@@ -76871,7 +76873,7 @@ definitions:
  type: object
  properties:
  service:
- title: The Service for which the application is configured
+ title: The Service for which the application is configured for
  type: object
  properties:
  id:
@@ -76965,7 +76967,7 @@ definitions:
  type: object
  properties:
  service:
- title: The Service for which the application is configured
+ title: The Service for which the application is configured for
  type: object
  properties:
  id:
@@ -77016,7 +77018,7 @@ definitions:
  type: object
  properties:
  service:
- title: The Service for which the application is configured
+ title: The Service for which the application is configured for
  type: object
  properties:
  id:
@@ -77284,7 +77286,7 @@ definitions:
  type: object
  properties:
  service:
- title: The Service for which the application is configured
+ title: The Service for which the application is configured for
  type: object
  properties:
  id:
@@ -77348,7 +77350,7 @@ definitions:
  type: object
  properties:
  service:
- title: The Service for which the supplier is configured
+ title: The Service for which the supplier is configured for
  type: object
  properties:
  id:
@@ -77538,7 +77540,7 @@ definitions:
  type: object
  properties:
  service:
- title: The Service for which the application is configured
+ title: The Service for which the application is configured for
  type: object
  properties:
  id:
@@ -77600,7 +77602,7 @@ definitions:
  type: object
  properties:
  service:
- title: The Service for which the supplier is configured
+ title: The Service for which the supplier is configured for
  type: object
  properties:
  id:
@@ -77814,7 +77816,7 @@ definitions:
  type: object
  properties:
  service:
- title: The Service for which the supplier is configured
+ title: The Service for which the supplier is configured for
  type: object
  properties:
  id:
@@ -77943,7 +77945,7 @@ definitions:
  type: object
  properties:
  service:
- title: The Service for which the supplier is configured
+ title: The Service for which the supplier is configured for
  type: object
  properties:
  id:

e2e/tests/init_test.go

@@ -3,7 +3,9 @@
 package e2e
 
 import (
+ "flag"
  "fmt"
+ "log"
  "regexp"
  "strconv"
  "strings"
@@ -22,6 +24,12 @@ import (
  suppliertypes "github.com/pokt-network/poktroll/x/supplier/types"
 )
 
+// TODO_TECHDEBT(#179): Once relayminer and appgateserver are running in tilt,
+// use their respective in-tilt hostnames and run E2E tests in tilt. This
+// should match the on-chain advertised endpoint for the service with the
+// given serviceId.
+const localnetAppGateServerUrl = "http://localhost:42069"
+
 var (
  addrRe *regexp.Regexp
  amountRe *regexp.Regexp
@@ -31,12 +39,21 @@ var (
  accNameToAppMap = make(map[string]apptypes.Application)
  accNameToSupplierMap = make(map[string]sharedtypes.Supplier)
 
- keyRingFlag = "--keyring-backend=test"
+ flagFeaturesPath string
+ keyRingFlag = "--keyring-backend=test"
 )
 
 func init() {
  addrRe = regexp.MustCompile(`address:\s+(\S+)\s+name:\s+(\S+)`)
  amountRe = regexp.MustCompile(`amount:\s+"(.+?)"\s+denom:\s+upokt`)
+
+ flag.StringVar(&flagFeaturesPath, "features-path", "*.feature", "Specifies glob paths for the runner to look up .feature files")
+}
+
+func TestMain(m *testing.M) {
+ flag.Parse()
+ log.Printf("features path: %s", flagFeaturesPath)
+ m.Run()
 }
 
 type suite struct {
@@ -58,7 +75,7 @@ func (s *suite) Before() {
 // TestFeatures runs the e2e tests specified in any .features files in this directory
 // * This test suite assumes that a LocalNet is running
 func TestFeatures(t *testing.T) {
- gocuke.NewRunner(t, &suite{}).Path("*.feature").Run()
+ gocuke.NewRunner(t, &suite{}).Path(flagFeaturesPath).Run()
 }
 
 func (s *suite) TheUserHasThePocketdBinaryInstalled() {
@@ -242,12 +259,22 @@ func (s *suite) TheSessionForApplicationAndServiceContainsTheSupplier(appName st
  s.Fatalf("session for app %s and service %s does not contain supplier %s", appName, serviceId, supplierName)
 }
 
-func (s *suite) TheApplicationSendsTheSupplierARelayRequestForService(appName string, supplierName string, requestName string, serviceId string) {
- // TODO(#126, @Olshansk): Implement this step
+func (s *suite) TheApplicationSendsTheSupplierARequestForServiceWithData(appName, supplierName, serviceId, requestData string) {
+ res, err := s.pocketd.RunCurl(localnetAppGateServerUrl, serviceId, requestData)
+ if err != nil {
+ s.Fatalf("error sending relay request from app %s to supplier %s for service %s: %v", appName, supplierName, serviceId, err)
+ }
+
+ relayKey := relayReferenceKey(appName, supplierName)
+ s.scenarioState[relayKey] = res.Stdout
 }
 
 func (s *suite) TheApplicationReceivesASuccessfulRelayResponseSignedBy(appName string, supplierName string) {
- // TODO(#126, @Olshansk): Implement this step
+ relayKey := relayReferenceKey(appName, supplierName)
+ stdout, ok := s.scenarioState[relayKey]
+
+ require.Truef(s, ok, "no relay response found for %s", relayKey)
+ require.Contains(s, stdout, `"result":"0x`)
 }
 
 func (s *suite) getStakedAmount(actorType, accName string) (bool, int) {
@@ -358,3 +385,9 @@ func (s *suite) getAccBalance(accName string) int {
  require.NoError(s, err)
  return found
 }
+
+// TODO_IMPROVE: use `sessionId` and `supplierName` since those are the two values
+// used to create the primary composite key on-chain to uniquely distinguish relays.
+func relayReferenceKey(appName, supplierName string) string {
+ return fmt.Sprintf("%s/%s", appName, supplierName)
+}