Skip to content

Commit

Permalink
Merge remote-tracking branch 'pokt/main' into HEAD
Browse files Browse the repository at this point in the history
* pokt/main:
  [P2P] refactor: unicast router (#844)
  Update E2E_FEATURE_LIST.md
  Update vault_test.go (#862)
  • Loading branch information
bryanchriswhite committed Jun 29, 2023
2 parents 95a3948 + fd30526 commit 7cdc9e7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/client/keybase/hashicorp/vault_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func TestMain(m *testing.M) {
// pulls an image, creates a container based on it and runs it
resource, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "vault",
Tag: "latest",
Tag: "1.13.3",
Env: []string{
"VAULT_DEV_ROOT_TOKEN_ID=dev-only-token",
"VAULT_DEV_LISTEN_ADDRESS=0.0.0.0:8200",
Expand Down
6 changes: 4 additions & 2 deletions p2p/unicast/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,11 @@ func (rtr *UnicastRouter) handleStream(stream libp2pNetwork.Stream) {
// the configured `rtr.messageHandler`. Intended to be called in a go routine.
func (rtr *UnicastRouter) readStream(stream libp2pNetwork.Stream) {
// Time out if no data is sent to free resources.
// NB: tests using libp2p's `mocknet` rely on this not returning an error.
if err := stream.SetReadDeadline(newReadStreamDeadline()); err != nil {
// `SetReadDeadline` not supported by `mocknet` streams.
// Not returning an error for testing purposes; i.e. `SetReadDeadline` is
// not supported by libp2p `mocknet` streams. This should only produce an
// error if a node advertises and listens via an unsupported transport
// protocol, which should never happen in prod.
rtr.logger.Error().Err(err).Msg("setting stream read deadline")
}

Expand Down
5 changes: 5 additions & 0 deletions utility/doc/E2E_FEATURE_LIST.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
- [2. Enabling Feature 🔴](#2-enabling-feature-)
- [3. Disabling Feature 🔴](#3-disabling-feature-)
- [4. Modifying Feature Value 🔴](#4-modifying-feature-value-)
- [5. Protocol Upgrades 🔴](#5-protocol-upgrades-)
- [G. E2E Governance 🔴](#g-e2e-governance-)

## Legend
Expand Down Expand Up @@ -120,6 +121,8 @@ _NOTE: Actor may refer to any relevant actor and custom paths may need to be cre

## F. E2E Feature Flags 🔴

_Note: If it is easier, features 1-4 can be captured in a single ticket_

### 1. Adding New Feature 🔴

### 2. Enabling Feature 🔴
Expand All @@ -128,4 +131,6 @@ _NOTE: Actor may refer to any relevant actor and custom paths may need to be cre

### 4. Modifying Feature Value 🔴

### 5. Protocol Upgrades 🔴

## G. E2E Governance 🔴

0 comments on commit 7cdc9e7

Please sign in to comment.