go mod

remove gas from merklization in headers

Im not sure where to change docs since main points to the spec repo but that repo is archived. Maybe someone can help me?

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.17"
+          go-version: "1.18"
       - uses: actions/checkout@v3
       - uses: technote-space/get-diff-action@v6
         with:
@@ -43,7 +43,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.17"
+          go-version: "1.18"
       - uses: actions/checkout@v3
       - uses: technote-space/get-diff-action@v6
         with:
@@ -65,7 +65,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.17"
+          go-version: "1.18"
       - uses: actions/checkout@v3
       - uses: technote-space/get-diff-action@v6
         with:

.github/workflows/check-generated.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.17'
+          go-version: '1.18'
 
       - uses: actions/checkout@v3
 
@@ -26,8 +26,6 @@ jobs:
         run: |
           set -euo pipefail
 
-          readonly MOCKERY=2.12.3  # N.B. no leading "v"
-          curl -sL "https://github.com/vektra/mockery/releases/download/v${MOCKERY}/mockery_${MOCKERY}_Linux_x86_64.tar.gz" | tar -C /usr/local/bin -xzf -
           make mockery 2>/dev/null
 
           if ! git diff --stat --exit-code ; then
@@ -44,7 +42,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.17'
+          go-version: '1.18'
 
       - uses: actions/checkout@v3
         with:

.github/workflows/docker.yml

@@ -49,7 +49,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Publish to Docker Hub
-        uses: docker/build-push-action@v3.1.0
+        uses: docker/build-push-action@v3.1.1
         with:
           context: .
           file: ./DOCKER/Dockerfile

.github/workflows/docs-toc.yml

@@ -1,21 +1,20 @@
-# TODO(thane): Re-enable once we've pulled in the ADRs and RFCs from master.
 # Verify that important design docs have ToC entries.
-#name: Check documentation ToC
-#on:
-#  pull_request:
-#    push:
-#      branches:
-#        - main
-#
-#jobs:
-#  check:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v3
-#      - uses: technote-space/get-diff-action@v6
-#        with:
-#          PATTERNS: |
-#            docs/architecture/**
-#            docs/rfc/**
-#      - run: ./docs/presubmit.sh
-#        if: env.GIT_DIFF
+name: Check documentation ToC
+on:
+  pull_request:
+    push:
+      branches:
+        - main
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: technote-space/get-diff-action@v6
+        with:
+          PATTERNS: |
+            docs/architecture/**
+            docs/rfc/**
+      - run: make check-docs-toc
+        if: env.GIT_DIFF

.github/workflows/e2e-manual.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.17'
+          go-version: '1.18'
 
       - uses: actions/checkout@v3
 

.github/workflows/e2e-nightly-34x.yml

@@ -15,18 +15,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        group: ['00', '01', '02', '03', "04"]
+        group: ['00', '01']
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.17'
+          go-version: '1.18'
 
       - uses: actions/checkout@v3
         with:
           ref: 'v0.34.x'
 
+      - name: Capture git repo info
+        id: git-info
+        run: |
+          echo "::set-output name=branch::`git branch --show-current`"
+          echo "::set-output name=commit::`git rev-parse HEAD`"
+
       - name: Build
         working-directory: test/e2e
         # Run make jobs in parallel, since we can't run steps in parallel.
@@ -41,18 +47,58 @@ jobs:
         working-directory: test/e2e
         run: ./run-multiple.sh networks/nightly/*-group${{ matrix.group }}-*.toml
 
+    outputs:
+      git-branch: ${{ steps.git-info.outputs.branch }}
+      git-commit: ${{ steps.git-info.outputs.commit }}
+
   e2e-nightly-fail:
     needs: e2e-nightly-test
     if: ${{ failure() }}
     runs-on: ubuntu-latest
     steps:
       - name: Notify Slack on failure
-        uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
+        uses: slackapi/slack-github-action@v1.21.0
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: tendermint-internal
-          SLACK_USERNAME: Nightly E2E Tests
-          SLACK_ICON_EMOJI: ':skull:'
-          SLACK_COLOR: danger
-          SLACK_MESSAGE: Nightly E2E tests failed on v0.34.x
-          SLACK_FOOTER: ''
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+          BRANCH: ${{ needs.e2e-nightly-test.outputs.git-branch }}
+          RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          COMMIT_URL: "${{ github.server_url }}/${{ github.repository }}/commit/${{ needs.e2e-nightly-test.outputs.git-commit }}"
+        with:
+          payload: |
+            {
+              "blocks": [
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": ":skull: Nightly E2E tests for `${{ env.BRANCH }}` failed. See the <${{ env.RUN_URL }}|run details> and the <${{ env.COMMIT_URL }}|commit> that caused the failure."
+                  }
+                }
+              ]
+            }
+
+  e2e-nightly-success:  # may turn this off once they seem to pass consistently
+    needs: e2e-nightly-test
+    if: ${{ success() }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Notify Slack on success
+        uses: slackapi/slack-github-action@v1.21.0
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+          BRANCH: ${{ needs.e2e-nightly-test.outputs.git-branch }}
+        with:
+          payload: |
+            {
+              "blocks": [
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": ":white_check_mark: Nightly E2E tests for `${{ env.BRANCH }}` passed."
+                  }
+                }
+              ]
+            }

.github/workflows/e2e-nightly-main.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.17'
+          go-version: '1.18'
 
       - uses: actions/checkout@v3
 
@@ -46,15 +46,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Notify Slack on failure
-        uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
+        uses: slackapi/slack-github-action@v1.21.0
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: tendermint-internal
-          SLACK_USERNAME: Nightly E2E Tests
-          SLACK_ICON_EMOJI: ':skull:'
-          SLACK_COLOR: danger
-          SLACK_MESSAGE: Nightly E2E tests failed on main
-          SLACK_FOOTER: ''
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+          BRANCH: ${{ github.ref_name }}
+          RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          COMMIT_URL: "${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}"
+        with:
+          payload: |
+            {
+              "blocks": [
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": ":skull: Nightly E2E tests for `${{ env.BRANCH }}` failed. See the <${{ env.RUN_URL }}|run details> and the <${{ env.COMMIT_URL }}|commit> that caused the failure."
+                  }
+                }
+              ]
+            }
 
   e2e-nightly-success:  # may turn this off once they seem to pass consistently
     needs: e2e-nightly-test
@@ -62,12 +73,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Notify Slack on success
-        uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
+        uses: slackapi/slack-github-action@v1.21.0
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: tendermint-internal
-          SLACK_USERNAME: Nightly E2E Tests
-          SLACK_ICON_EMOJI: ':white_check_mark:'
-          SLACK_COLOR: good
-          SLACK_MESSAGE: Nightly E2E tests passed on main
-          SLACK_FOOTER: ''
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+          BRANCH: ${{ github.ref_name }}
+        with:
+          payload: |
+            {
+              "blocks": [
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": ":white_check_mark: Nightly E2E tests for `${{ env.BRANCH }}` passed."
+                  }
+                }
+              ]
+            }

.github/workflows/e2e.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.17'
+          go-version: '1.18'
       - uses: actions/checkout@v3
       - uses: technote-space/get-diff-action@v6
         with:

.github/workflows/fuzz-nightly.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.17'
+          go-version: '1.18'
 
       - uses: actions/checkout@v3
 
@@ -75,13 +75,24 @@ jobs:
     if: ${{ needs.fuzz-nightly-test.outputs.crashers-count != 0 }}
     runs-on: ubuntu-latest
     steps:
-      - name: Notify Slack if any crashers
-        uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
+      - name: Notify Slack on failure
+        uses: slackapi/slack-github-action@v1.21.0
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: tendermint-internal
-          SLACK_USERNAME: Nightly Fuzz Tests
-          SLACK_ICON_EMOJI: ':firecracker:'
-          SLACK_COLOR: danger
-          SLACK_MESSAGE: Crashers found in Nightly Fuzz tests
-          SLACK_FOOTER: ''
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+          BRANCH: ${{ github.ref_name }}
+          CRASHERS: ${{ needs.fuzz-nightly-test.outputs.crashers-count }}
+          RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+        with:
+          payload: |
+            {
+              "blocks": [
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": ":skull: Nightly fuzz tests for `${{ env.BRANCH }}` failed with ${{ env.CRASHERS }} crasher(s). See the <${{ env.RUN_URL }}|run details>."
+                  }
+                }
+              ]
+            }

.github/workflows/lint.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.17'
+          go-version: '1.18'
       - uses: technote-space/get-diff-action@v6
         with:
           PATTERNS: |
@@ -34,7 +34,7 @@ jobs:
           # Required: the version of golangci-lint is required and
           # must be specified without patch version: we always use the
           # latest patch version.
-          version: v1.45
+          version: v1.47.3
           args: --timeout 10m
           github-token: ${{ secrets.github_token }}
         if: env.GIT_DIFF

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
 
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.17'
+          go-version: '1.18'
 
       - name: Build
         uses: goreleaser/goreleaser-action@v3

.github/workflows/tests.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.17"
+          go-version: "1.18"
       - uses: actions/checkout@v3
       - uses: technote-space/get-diff-action@v6
         with:

.golangci.yml

@@ -21,7 +21,7 @@ linters:
     - nolintlint
     - prealloc
     - staticcheck
-    - structcheck
+    # - structcheck // to be fixed by golangci-lint
     - stylecheck
     - typecheck
     - unconvert

CHANGELOG.md

@@ -1283,7 +1283,7 @@ This release contains a minor enhancement to the ABCI and some breaking changes
 
 - [p2p] [\#3338](https://github.com/tendermint/tendermint/issues/3338) Prevent "sent next PEX request too soon" errors by not calling
   ensurePeers outside of ensurePeersRoutine
-- [behaviour] [\3772](https://github.com/tendermint/tendermint/pull/3772) Return correct reason in MessageOutOfOrder (@jim380)
+- [behavior] [\3772](https://github.com/tendermint/tendermint/pull/3772) Return correct reason in MessageOutOfOrder (@jim380)
 - [config] [\#3723](https://github.com/tendermint/tendermint/issues/3723) Add consensus_params to testnet config generation; document time_iota_ms (@ashleyvega)
 
 
@@ -1603,7 +1603,7 @@ It brings back `NetAddress()` to `NodeInfo` and uses it instead of `SocketAddr`
 Additionally, it improves response time on the `/validators` or `/status` RPC endpoints.
 As a side-effect it makes these RPC endpoint more difficult to DoS and fixes a performance degradation in `ExecCommitBlock`.
 Also, it contains an [ADR](https://github.com/tendermint/tendermint/pull/3539) that proposes decoupling the
-responsibility for peer behaviour from the `p2p.Switch` (by @brapse).
+responsibility for peer behavior from the `p2p.Switch` (by @brapse).
 
 Special thanks to external contributors on this release:
 @brapse, @guagualvcha, @mydring
@@ -2271,8 +2271,8 @@ Special thanks to external contributors on this release:
 - [blockchain] [\#2731](https://github.com/tendermint/tendermint/issues/2731) Retry both blocks if either is bad to avoid getting stuck during fast sync (@goolAdapter)
 - [consensus] [\#2893](https://github.com/tendermint/tendermint/issues/2893) Use genDoc.Validators instead of state.NextValidators on replay when appHeight==0 (@james-ray)
 - [log] [\#2868](https://github.com/tendermint/tendermint/issues/2868) Fix `module=main` setting overriding all others
-    - NOTE: this changes the default logging behaviour to be much less verbose.
-      Set `log_level="info"` to restore the previous behaviour.
+    - NOTE: this changes the default logging behavior to be much less verbose.
+      Set `log_level="info"` to restore the previous behavior.
 - [rpc] [\#2808](https://github.com/tendermint/tendermint/issues/2808) Fix `accum` field in `/validators` by calling `IncrementAccum` if necessary
 - [rpc] [\#2811](https://github.com/tendermint/tendermint/issues/2811) Allow integer IDs in JSON-RPC requests (@tomtau)
 - [txindex/kv] [\#2759](https://github.com/tendermint/tendermint/issues/2759) Fix tx.height range queries
@@ -2403,7 +2403,7 @@ increasing attention to backwards compatibility. Thanks for bearing with us!
   * [state] [\#2644](https://github.com/tendermint/tendermint/issues/2644) Add Version field to State, breaking the format of State as
     encoded on disk.
   * [rpc] [\#2298](https://github.com/tendermint/tendermint/issues/2298) `/abci_query` takes `prove` argument instead of `trusted` and switches the default
-    behaviour to `prove=false`
+    behavior to `prove=false`
   * [rpc] [\#2654](https://github.com/tendermint/tendermint/issues/2654) Remove all `node_info.other.*_version` fields in `/status` and
     `/net_info`
   * [rpc] [\#2636](https://github.com/tendermint/tendermint/issues/2636) Remove
@@ -2548,7 +2548,7 @@ FEATURES:
 - [libs] [\#2286](https://github.com/tendermint/tendermint/issues/2286) Panic if `autofile` or `db/fsdb` permissions change from 0600.
 
 IMPROVEMENTS:
-- [libs/db] [\#2371](https://github.com/tendermint/tendermint/issues/2371) Output error instead of panic when the given `db_backend` is not initialised (@bradyjoestar)
+- [libs/db] [\#2371](https://github.com/tendermint/tendermint/issues/2371) Output error instead of panic when the given `db_backend` is not initialized (@bradyjoestar)
 - [mempool] [\#2399](https://github.com/tendermint/tendermint/issues/2399) Make mempool cache a proper LRU (@bradyjoestar)
 - [p2p] [\#2126](https://github.com/tendermint/tendermint/issues/2126) Introduce PeerTransport interface to improve isolation of concerns
 - [libs/common] [\#2326](https://github.com/tendermint/tendermint/issues/2326) Service returns ErrNotStarted

CHANGELOG_PENDING.md

@@ -1,6 +1,6 @@
 # Unreleased Changes
 
-## v0.34.21
+## v0.37.0
 
 Special thanks to external contributors on this release:
 
@@ -12,16 +12,23 @@ Friendly reminder, we have a [bug bounty program](https://hackerone.com/tendermi
 
 - Apps
 
+  - [abci/counter] \#6684 Delete counter example app
+  - [txResults] \#9175 Remove `gas_used` & `gas_wanted` from being merkelized in the lastresulthash in the header
+  - [abci] \#5783 Make length delimiter encoding consistent (`uint64`) between ABCI and P2P wire-level protocols
+
 - P2P Protocol
 
 - Go API
 
+    - [all] \#9144 Change spelling from British English to American (@cmwaters)
+        - Rename "Subscription.Cancelled()" to "Subscription.Canceled()" in libs/pubsub
+
 - Blockchain Protocol
 
 ### FEATURES
 
-- [#9083] backport cli command to reindex missed events (@cmwaters)
-
 ### IMPROVEMENTS
 
 ### BUG FIXES
+
+[docker] \#9073 enable cross platform build using docker buildx

CODE_OF_CONDUCT.md

@@ -27,7 +27,7 @@ and hence to Tendermint.
   want to experiment with, make a fork and see how it works.
 
 * We will exclude you from interaction if you insult, demean or harass anyone.
-  That is not welcome behaviour. We interpret the term “harassment” as including
+  That is not welcome behavior. We interpret the term “harassment” as including
   the definition in the [Citizen Code of Conduct][ccoc]; if you have any lack of
   clarity about what might be included in that concept, please read their
   definition. In particular, we don’t tolerate behavior that excludes people in
@@ -40,7 +40,7 @@ and hence to Tendermint.
   making this community a safe place for you and we’ve got your back.
 
 * Likewise any spamming, trolling, flaming, baiting or other attention-stealing
-  behaviour is not welcome.
+  behavior is not welcome.
 
 ----
 

DOCKER/Dockerfile

@@ -1,11 +1,11 @@
 # stage 1 Generate Tendermint Binary
-FROM golang:1.15-alpine as builder
+FROM --platform=$BUILDPLATFORM golang:1.18-alpine as builder
 RUN apk update && \
     apk upgrade && \
     apk --no-cache add make
 COPY / /tendermint
 WORKDIR /tendermint
-RUN make build-linux
+RUN TARGETPLATFORM=$TARGETPLATFORM make build-linux
 
 # stage 2
 FROM golang:1.15-alpine

Makefile

@@ -53,6 +53,67 @@ endif
 # allow users to pass additional flags via the conventional LDFLAGS variable
 LD_FLAGS += $(LDFLAGS)
 
+# Process Docker environment varible TARGETPLATFORM 
+# in order to build binary with correspondent ARCH
+# by default will always build for linux/amd64
+TARGETPLATFORM ?= 
+GOOS ?= linux
+GOARCH ?= amd64
+GOARM ?=
+
+ifeq (linux/arm,$(findstring linux/arm,$(TARGETPLATFORM)))
+	GOOS=linux
+	GOARCH=arm
+	GOARM=7
+endif
+
+ifeq (linux/arm/v6,$(findstring linux/arm/v6,$(TARGETPLATFORM)))
+	GOOS=linux
+	GOARCH=arm
+	GOARM=6
+endif
+
+ifeq (linux/arm64,$(findstring linux/arm64,$(TARGETPLATFORM)))
+	GOOS=linux
+	GOARCH=arm64
+	GOARM=7
+endif
+
+ifeq (linux/386,$(findstring linux/386,$(TARGETPLATFORM)))
+	GOOS=linux
+	GOARCH=386
+endif
+
+ifeq (linux/amd64,$(findstring linux/amd64,$(TARGETPLATFORM)))
+	GOOS=linux
+	GOARCH=amd64
+endif
+
+ifeq (linux/mips,$(findstring linux/mips,$(TARGETPLATFORM)))
+	GOOS=linux
+	GOARCH=mips
+endif
+
+ifeq (linux/mipsle,$(findstring linux/mipsle,$(TARGETPLATFORM)))
+	GOOS=linux
+	GOARCH=mipsle
+endif
+
+ifeq (linux/mips64,$(findstring linux/mips64,$(TARGETPLATFORM)))
+	GOOS=linux
+	GOARCH=mips64
+endif
+
+ifeq (linux/mips64le,$(findstring linux/mips64le,$(TARGETPLATFORM)))
+	GOOS=linux
+	GOARCH=mips64le
+endif
+
+ifeq (linux/riscv64,$(findstring linux/riscv64,$(TARGETPLATFORM)))
+	GOOS=linux
+	GOARCH=riscv64
+endif
+
 all: check build test install
 .PHONY: all
 
@@ -70,6 +131,20 @@ install:
 	CGO_ENABLED=$(CGO_ENABLED) go install $(BUILD_FLAGS) -tags $(BUILD_TAGS) ./cmd/tendermint
 .PHONY: install
 
+###############################################################################
+###                               Metrics                                   ###
+###############################################################################
+
+metrics: testdata-metrics
+	go generate -run="scripts/metricsgen" ./...
+.PHONY: metrics
+
+# By convention, the go tool ignores subdirectories of directories named
+# 'testdata'. This command invokes the generate command on the folder directly
+# to avoid this.
+testdata-metrics:
+	ls ./scripts/metricsgen/testdata | xargs -I{} go generate -v -run="scripts/metricsgen" ./scripts/metricsgen/testdata/{}
+.PHONY: testdata-metrics
 
 ###############################################################################
 ###                                Mocks                                    ###
@@ -228,6 +303,11 @@ sync-docs:
 	aws cloudfront create-invalidation --distribution-id ${CF_DISTRIBUTION_ID} --profile terraform --path "/*" ;
 .PHONY: sync-docs
 
+# Verify that important design docs have ToC entries.
+check-docs-toc:
+	@./docs/presubmit.sh
+.PHONY: check-docs-toc
+
 ###############################################################################
 ###                            Docker image                                 ###
 ###############################################################################
@@ -244,7 +324,7 @@ build-docker: build-linux
 
 # Build linux binary on other platforms
 build-linux:
-	GOOS=linux GOARCH=amd64 $(MAKE) build
+	GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) $(MAKE) build
 .PHONY: build-linux
 
 build-docker-localnode:

README.md

@@ -62,7 +62,7 @@ Tendermint Core. You can subscribe [here](http://eepurl.com/gZ5hQD).
 
 | Requirement | Notes             |
 |-------------|-------------------|
-| Go version  | Go 1.17 or higher |
+| Go version  | Go 1.18 or higher |
 
 ### Install
 

UPGRADING.md

@@ -1,6 +1,29 @@
 # Upgrading Tendermint Core
 
-This guide provides instructions for upgrading to specific versions of Tendermint Core.
+This guide provides instructions for upgrading to specific versions of
+Tendermint Core.
+
+## v0.37 (Unreleased)
+
+This version requires a coordinated network upgrade. It alters the elements in
+the predigest of the `LastResultsHash` and thus all nodes must upgrade together
+(see [\#9175](https://github.com/tendermint/tendermint/pull/9175)).
+
+NOTE: v0.35 was recalled and v0.36 was skipped
+
+### ABCI Changes
+
+* In v0.34, messages on the wire used to be length-delimited with `int64` varint
+  values, which was inconsistent with the `uint64` varint length delimiters used
+  in the P2P layer. Both now consistently use `uint64` varint length delimiters.
+
+
+## v0.37 (Unreleased)
+
+This version requires a coordinated network upgrade. It alters the elements in the predigest of the `LastResultsHash` and thus
+all nodes must upgrade together (see #9175).
+
+NOTE: v0.35 was recalled and v0.36 was skipped
 
 ## v0.34.20
 
@@ -437,7 +460,7 @@ use `make build_c` / `make install_c` (full instructions can be found at
 
 ## v0.31.0
 
-This release contains a breaking change to the behaviour of the pubsub system.
+This release contains a breaking change to the behavior of the pubsub system.
 It also contains some minor breaking changes in the Go API and ABCI.
 There are no changes to the block or p2p protocols, so v0.31.0 should work fine
 with blockchains created from the v0.30 series.
@@ -455,7 +478,7 @@ In this case, the WS client will receive an error with description:
   "error": {
     "code": -32000,
     "msg": "Server error",
-    "data": "subscription was cancelled (reason: client is not pulling messages fast enough)" // or "subscription was cancelled (reason: Tendermint exited)"
+    "data": "subscription was canceled (reason: client is not pulling messages fast enough)" // or "subscription was canceled (reason: Tendermint exited)"
   }
 }
 
@@ -636,7 +659,7 @@ to `timeout_propose = "3s"`.
 
 ### RPC Changes
 
-The default behaviour of `/abci_query` has been changed to not return a proof,
+The default behavior of `/abci_query` has been changed to not return a proof,
 and the name of the parameter that controls this has been changed from `trusted`
 to `prove`. To get proofs with your queries, ensure you set `prove=true`.
 

abci/cmd/abci-cli/abci-cli.go

@@ -16,7 +16,6 @@ import (
 
 	abcicli "github.com/tendermint/tendermint/abci/client"
 	"github.com/tendermint/tendermint/abci/example/code"
-	"github.com/tendermint/tendermint/abci/example/counter"
 	"github.com/tendermint/tendermint/abci/example/kvstore"
 	"github.com/tendermint/tendermint/abci/server"
 	servertest "github.com/tendermint/tendermint/abci/tests/server"
@@ -44,9 +43,6 @@ var (
 	flagHeight int
 	flagProve  bool
 
-	// counter
-	flagSerial bool
-
 	// kvstore
 	flagPersist string
 )
@@ -58,9 +54,7 @@ var RootCmd = &cobra.Command{
 	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
 
 		switch cmd.Use {
-		case "counter", "kvstore": // for the examples apps, don't pre-run
-			return nil
-		case "version": // skip running for version command
+		case "kvstore", "version":
 			return nil
 		}
 
@@ -135,10 +129,6 @@ func addQueryFlags() {
 		"whether or not to return a merkle proof of the query result")
 }
 
-func addCounterFlags() {
-	counterCmd.PersistentFlags().BoolVarP(&flagSerial, "serial", "", false, "enforce incrementing (serial) transactions")
-}
-
 func addKVStoreFlags() {
 	kvstoreCmd.PersistentFlags().StringVarP(&flagPersist, "persist", "", "", "directory to use for a database")
 }
@@ -158,8 +148,6 @@ func addCommands() {
 	RootCmd.AddCommand(queryCmd)
 
 	// examples
-	addCounterFlags()
-	RootCmd.AddCommand(counterCmd)
 	addKVStoreFlags()
 	RootCmd.AddCommand(kvstoreCmd)
 }
@@ -267,14 +255,6 @@ var queryCmd = &cobra.Command{
 	RunE:  cmdQuery,
 }
 
-var counterCmd = &cobra.Command{
-	Use:   "counter",
-	Short: "ABCI demo example",
-	Long:  "ABCI demo example",
-	Args:  cobra.ExactArgs(0),
-	RunE:  cmdCounter,
-}
-
 var kvstoreCmd = &cobra.Command{
 	Use:   "kvstore",
 	Short: "ABCI demo example",
@@ -625,32 +605,6 @@ func cmdQuery(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func cmdCounter(cmd *cobra.Command, args []string) error {
-	app := counter.NewApplication(flagSerial)
-	logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
-
-	// Start the listener
-	srv, err := server.NewServer(flagAddress, flagAbci, app)
-	if err != nil {
-		return err
-	}
-	srv.SetLogger(logger.With("module", "abci-server"))
-	if err := srv.Start(); err != nil {
-		return err
-	}
-
-	// Stop upon receiving SIGTERM or CTRL-C.
-	tmos.TrapSignal(logger, func() {
-		// Cleanup
-		if err := srv.Stop(); err != nil {
-			logger.Error("Error while stopping server", "err", err)
-		}
-	})
-
-	// Run forever.
-	select {}
-}
-
 func cmdKVStore(cmd *cobra.Command, args []string) error {
 	logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
 

abci/example/counter/counter.go

@@ -1,103 +0,0 @@
-package counter
-
-import (
-	"encoding/binary"
-	"fmt"
-
-	"github.com/tendermint/tendermint/abci/example/code"
-	"github.com/tendermint/tendermint/abci/types"
-)
-
-type Application struct {
-	types.BaseApplication
-
-	hashCount int
-	txCount   int
-	serial    bool
-}
-
-func NewApplication(serial bool) *Application {
-	return &Application{serial: serial}
-}
-
-func (app *Application) Info(req types.RequestInfo) types.ResponseInfo {
-	return types.ResponseInfo{Data: fmt.Sprintf("{\"hashes\":%v,\"txs\":%v}", app.hashCount, app.txCount)}
-}
-
-func (app *Application) SetOption(req types.RequestSetOption) types.ResponseSetOption {
-	key, value := req.Key, req.Value
-	if key == "serial" && value == "on" {
-		app.serial = true
-	} else {
-		/*
-			TODO Panic and have the ABCI server pass an exception.
-			The client can call SetOptionSync() and get an `error`.
-			return types.ResponseSetOption{
-				Error: fmt.Sprintf("Unknown key (%s) or value (%s)", key, value),
-			}
-		*/
-		return types.ResponseSetOption{}
-	}
-
-	return types.ResponseSetOption{}
-}
-
-func (app *Application) DeliverTx(req types.RequestDeliverTx) types.ResponseDeliverTx {
-	if app.serial {
-		if len(req.Tx) > 8 {
-			return types.ResponseDeliverTx{
-				Code: code.CodeTypeEncodingError,
-				Log:  fmt.Sprintf("Max tx size is 8 bytes, got %d", len(req.Tx))}
-		}
-		tx8 := make([]byte, 8)
-		copy(tx8[len(tx8)-len(req.Tx):], req.Tx)
-		txValue := binary.BigEndian.Uint64(tx8)
-		if txValue != uint64(app.txCount) {
-			return types.ResponseDeliverTx{
-				Code: code.CodeTypeBadNonce,
-				Log:  fmt.Sprintf("Invalid nonce. Expected %v, got %v", app.txCount, txValue)}
-		}
-	}
-	app.txCount++
-	return types.ResponseDeliverTx{Code: code.CodeTypeOK}
-}
-
-func (app *Application) CheckTx(req types.RequestCheckTx) types.ResponseCheckTx {
-	if app.serial {
-		if len(req.Tx) > 8 {
-			return types.ResponseCheckTx{
-				Code: code.CodeTypeEncodingError,
-				Log:  fmt.Sprintf("Max tx size is 8 bytes, got %d", len(req.Tx))}
-		}
-		tx8 := make([]byte, 8)
-		copy(tx8[len(tx8)-len(req.Tx):], req.Tx)
-		txValue := binary.BigEndian.Uint64(tx8)
-		if txValue < uint64(app.txCount) {
-			return types.ResponseCheckTx{
-				Code: code.CodeTypeBadNonce,
-				Log:  fmt.Sprintf("Invalid nonce. Expected >= %v, got %v", app.txCount, txValue)}
-		}
-	}
-	return types.ResponseCheckTx{Code: code.CodeTypeOK}
-}
-
-func (app *Application) Commit() (resp types.ResponseCommit) {
-	app.hashCount++
-	if app.txCount == 0 {
-		return types.ResponseCommit{}
-	}
-	hash := make([]byte, 8)
-	binary.BigEndian.PutUint64(hash, uint64(app.txCount))
-	return types.ResponseCommit{Data: hash}
-}
-
-func (app *Application) Query(reqQuery types.RequestQuery) types.ResponseQuery {
-	switch reqQuery.Path {
-	case "hash":
-		return types.ResponseQuery{Value: []byte(fmt.Sprintf("%v", app.hashCount))}
-	case "tx":
-		return types.ResponseQuery{Value: []byte(fmt.Sprintf("%v", app.txCount))}
-	default:
-		return types.ResponseQuery{Log: fmt.Sprintf("Invalid query path. Expected hash or tx, got %v", reqQuery.Path)}
-	}
-}

abci/example/kvstore/kvstore_test.go

@@ -2,7 +2,7 @@ package kvstore
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"sort"
 	"testing"
 
@@ -71,7 +71,7 @@ func TestKVStoreKV(t *testing.T) {
 }
 
 func TestPersistentKVStoreKV(t *testing.T) {
-	dir, err := ioutil.TempDir("/tmp", "abci-kvstore-test") // TODO
+	dir, err := os.MkdirTemp("/tmp", "abci-kvstore-test") // TODO
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -87,7 +87,7 @@ func TestPersistentKVStoreKV(t *testing.T) {
 }
 
 func TestPersistentKVStoreInfo(t *testing.T) {
-	dir, err := ioutil.TempDir("/tmp", "abci-kvstore-test") // TODO
+	dir, err := os.MkdirTemp("/tmp", "abci-kvstore-test") // TODO
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -119,7 +119,7 @@ func TestPersistentKVStoreInfo(t *testing.T) {
 
 // add a validator, remove a validator, update a validator
 func TestValUpdates(t *testing.T) {
-	dir, err := ioutil.TempDir("/tmp", "abci-kvstore-test") // TODO
+	dir, err := os.MkdirTemp("/tmp", "abci-kvstore-test") // TODO
 	if err != nil {
 		t.Fatal(err)
 	}

abci/tests/test_app/app.go

@@ -1,78 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-
-	abcicli "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
-)
-
-func startClient(abciType string) abcicli.Client {
-	// Start client
-	client, err := abcicli.NewClient("tcp://127.0.0.1:26658", abciType, true)
-	if err != nil {
-		panic(err.Error())
-	}
-	logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
-	client.SetLogger(logger.With("module", "abcicli"))
-	if err := client.Start(); err != nil {
-		panicf("connecting to abci_app: %v", err.Error())
-	}
-
-	return client
-}
-
-func setOption(client abcicli.Client, key, value string) {
-	_, err := client.SetOptionSync(types.RequestSetOption{Key: key, Value: value})
-	if err != nil {
-		panicf("setting %v=%v: \nerr: %v", key, value, err)
-	}
-}
-
-func commit(client abcicli.Client, hashExp []byte) {
-	res, err := client.CommitSync()
-	if err != nil {
-		panicf("client error: %v", err)
-	}
-	if !bytes.Equal(res.Data, hashExp) {
-		panicf("Commit hash was unexpected. Got %X expected %X", res.Data, hashExp)
-	}
-}
-
-func deliverTx(client abcicli.Client, txBytes []byte, codeExp uint32, dataExp []byte) {
-	res, err := client.DeliverTxSync(types.RequestDeliverTx{Tx: txBytes})
-	if err != nil {
-		panicf("client error: %v", err)
-	}
-	if res.Code != codeExp {
-		panicf("DeliverTx response code was unexpected. Got %v expected %v. Log: %v", res.Code, codeExp, res.Log)
-	}
-	if !bytes.Equal(res.Data, dataExp) {
-		panicf("DeliverTx response data was unexpected. Got %X expected %X", res.Data, dataExp)
-	}
-}
-
-/*func checkTx(client abcicli.Client, txBytes []byte, codeExp uint32, dataExp []byte) {
-	res, err := client.CheckTxSync(txBytes)
-	if err != nil {
-		panicf("client error: %v", err)
-	}
-	if res.IsErr() {
-		panicf("checking tx %X: %v\nlog: %v", txBytes, res.Log)
-	}
-	if res.Code != codeExp {
-		panicf("CheckTx response code was unexpected. Got %v expected %v. Log: %v",
-			res.Code, codeExp, res.Log)
-	}
-	if !bytes.Equal(res.Data, dataExp) {
-		panicf("CheckTx response data was unexpected. Got %X expected %X",
-			res.Data, dataExp)
-	}
-}*/
-
-func panicf(format string, a ...interface{}) {
-	panic(fmt.Sprintf(format, a...))
-}

abci/tests/test_app/main.go

@@ -1,95 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"os/exec"
-	"time"
-
-	"github.com/tendermint/tendermint/abci/example/code"
-	"github.com/tendermint/tendermint/abci/types"
-)
-
-var abciType string
-
-func init() {
-	abciType = os.Getenv("ABCI")
-	if abciType == "" {
-		abciType = "socket"
-	}
-}
-
-func main() {
-	testCounter()
-}
-
-const (
-	maxABCIConnectTries = 10
-)
-
-func ensureABCIIsUp(typ string, n int) error {
-	var err error
-	cmdString := "abci-cli echo hello"
-	if typ == "grpc" {
-		cmdString = "abci-cli --abci grpc echo hello"
-	}
-
-	for i := 0; i < n; i++ {
-		cmd := exec.Command("bash", "-c", cmdString)
-		_, err = cmd.CombinedOutput()
-		if err == nil {
-			break
-		}
-		<-time.After(500 * time.Millisecond)
-	}
-	return err
-}
-
-func testCounter() {
-	abciApp := os.Getenv("ABCI_APP")
-	if abciApp == "" {
-		panic("No ABCI_APP specified")
-	}
-
-	fmt.Printf("Running %s test with abci=%s\n", abciApp, abciType)
-	subCommand := fmt.Sprintf("abci-cli %s", abciApp)
-	cmd := exec.Command("bash", "-c", subCommand)
-	cmd.Stdout = os.Stdout
-	if err := cmd.Start(); err != nil {
-		log.Fatalf("starting %q err: %v", abciApp, err)
-	}
-	defer func() {
-		if err := cmd.Process.Kill(); err != nil {
-			log.Printf("error on process kill: %v", err)
-		}
-		if err := cmd.Wait(); err != nil {
-			log.Printf("error while waiting for cmd to exit: %v", err)
-		}
-	}()
-
-	if err := ensureABCIIsUp(abciType, maxABCIConnectTries); err != nil {
-		log.Fatalf("echo failed: %v", err) //nolint:gocritic
-	}
-
-	client := startClient(abciType)
-	defer func() {
-		if err := client.Stop(); err != nil {
-			log.Printf("error trying client stop: %v", err)
-		}
-	}()
-
-	setOption(client, "serial", "on")
-	commit(client, nil)
-	deliverTx(client, []byte("abc"), code.CodeTypeBadNonce, nil)
-	commit(client, nil)
-	deliverTx(client, []byte{0x00}, types.CodeTypeOK, nil)
-	commit(client, []byte{0, 0, 0, 0, 0, 0, 0, 1})
-	deliverTx(client, []byte{0x00}, code.CodeTypeBadNonce, nil)
-	deliverTx(client, []byte{0x01}, types.CodeTypeOK, nil)
-	deliverTx(client, []byte{0x00, 0x02}, types.CodeTypeOK, nil)
-	deliverTx(client, []byte{0x00, 0x03}, types.CodeTypeOK, nil)
-	deliverTx(client, []byte{0x00, 0x00, 0x04}, types.CodeTypeOK, nil)
-	deliverTx(client, []byte{0x00, 0x00, 0x06}, code.CodeTypeBadNonce, nil)
-	commit(client, []byte{0, 0, 0, 0, 0, 0, 0, 5})
-}

abci/tests/test_app/test.sh

@@ -1,28 +0,0 @@
-#! /bin/bash
-set -e
-
-# These tests spawn the counter app and server by execing the ABCI_APP command and run some simple client tests against it
-
-# Get the directory of where this script is.
-export PATH="$GOBIN:$PATH"
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
-# Change into that dir because we expect that.
-cd "$DIR"
-
-echo "RUN COUNTER OVER SOCKET"
-# test golang counter
-ABCI_APP="counter" go run -mod=readonly ./*.go
-echo "----------------------"
-
-
-echo "RUN COUNTER OVER GRPC"
-# test golang counter via grpc
-ABCI_APP="counter --abci=grpc" ABCI="grpc" go run -mod=readonly ./*.go
-echo "----------------------"
-
-# test nodejs counter
-# TODO: fix node app
-#ABCI_APP="node $GOPATH/src/github.com/tendermint/js-abci/example/app.js" go test -test.run TestCounter

abci/tests/test_cli/test.sh

@@ -37,7 +37,6 @@ function testExample() {
 }
 
 testExample 1 tests/test_cli/ex1.abci abci-cli kvstore
-testExample 2 tests/test_cli/ex2.abci abci-cli counter
 
 echo ""
 echo "PASS"

abci/types/messages.go

@@ -1,11 +1,10 @@
 package types
 
 import (
-	"bufio"
-	"encoding/binary"
 	"io"
 
 	"github.com/gogo/protobuf/proto"
+	"github.com/tendermint/tendermint/libs/protoio"
 )
 
 const (
@@ -14,57 +13,19 @@ const (
 
 // WriteMessage writes a varint length-delimited protobuf message.
 func WriteMessage(msg proto.Message, w io.Writer) error {
-	bz, err := proto.Marshal(msg)
+	protoWriter := protoio.NewDelimitedWriter(w)
+	_, err := protoWriter.WriteMsg(msg)
 	if err != nil {
 		return err
 	}
-	return encodeByteSlice(w, bz)
+
+	return nil
 }
 
 // ReadMessage reads a varint length-delimited protobuf message.
 func ReadMessage(r io.Reader, msg proto.Message) error {
-	return readProtoMsg(r, msg, maxMsgSize)
-}
-
-func readProtoMsg(r io.Reader, msg proto.Message, maxSize int) error {
-	// binary.ReadVarint takes an io.ByteReader, eg. a bufio.Reader
-	reader, ok := r.(*bufio.Reader)
-	if !ok {
-		reader = bufio.NewReader(r)
-	}
-	length64, err := binary.ReadVarint(reader)
-	if err != nil {
-		return err
-	}
-	length := int(length64)
-	if length < 0 || length > maxSize {
-		return io.ErrShortBuffer
-	}
-	buf := make([]byte, length)
-	if _, err := io.ReadFull(reader, buf); err != nil {
-		return err
-	}
-	return proto.Unmarshal(buf, msg)
-}
-
-//-----------------------------------------------------------------------
-// NOTE: we copied wire.EncodeByteSlice from go-wire rather than keep
-// go-wire as a dep
-
-func encodeByteSlice(w io.Writer, bz []byte) (err error) {
-	err = encodeVarint(w, int64(len(bz)))
-	if err != nil {
-		return
-	}
-	_, err = w.Write(bz)
-	return
-}
-
-func encodeVarint(w io.Writer, i int64) (err error) {
-	var buf [10]byte
-	n := binary.PutVarint(buf[:], i)
-	_, err = w.Write(buf[0:n])
-	return
+	_, err := protoio.NewDelimitedReader(r, maxMsgSize).ReadMsg(msg)
+	return err
 }
 
 //----------------------------------------

behaviour/doc.go

@@ -1,42 +0,0 @@
-/*
-Package Behaviour provides a mechanism for reactors to report behaviour of peers.
-
-Instead of a reactor calling the switch directly it will call the behaviour module which will
-handle the stoping and marking peer as good on behalf of the reactor.
-
-There are four different behaviours a reactor can report.
-
-1. bad message
-
-type badMessage struct {
-	explanation string
-}
-
-This message will request the peer be stopped for an error
-
-2. message out of order
-
-type messageOutOfOrder struct {
-	explanation string
-}
-
-This message will request the peer be stopped for an error
-
-3. consesnsus Vote
-
-type consensusVote struct {
-	explanation string
-}
-
-This message will request the peer be marked as good
-
-4. block part
-
-type blockPart struct {
-	explanation string
-}
-
-This message will request the peer be marked as good
-
-*/
-package behaviour

behaviour/peer_behaviour.go

@@ -1,49 +0,0 @@
-package behaviour
-
-import (
-	"github.com/tendermint/tendermint/p2p"
-)
-
-// PeerBehaviour is a struct describing a behaviour a peer performed.
-// `peerID` identifies the peer and reason characterizes the specific
-// behaviour performed by the peer.
-type PeerBehaviour struct {
-	peerID p2p.ID
-	reason interface{}
-}
-
-type badMessage struct {
-	explanation string
-}
-
-// BadMessage returns a badMessage PeerBehaviour.
-func BadMessage(peerID p2p.ID, explanation string) PeerBehaviour {
-	return PeerBehaviour{peerID: peerID, reason: badMessage{explanation}}
-}
-
-type messageOutOfOrder struct {
-	explanation string
-}
-
-// MessageOutOfOrder returns a messagOutOfOrder PeerBehaviour.
-func MessageOutOfOrder(peerID p2p.ID, explanation string) PeerBehaviour {
-	return PeerBehaviour{peerID: peerID, reason: messageOutOfOrder{explanation}}
-}
-
-type consensusVote struct {
-	explanation string
-}
-
-// ConsensusVote returns a consensusVote PeerBehaviour.
-func ConsensusVote(peerID p2p.ID, explanation string) PeerBehaviour {
-	return PeerBehaviour{peerID: peerID, reason: consensusVote{explanation}}
-}
-
-type blockPart struct {
-	explanation string
-}
-
-// BlockPart returns blockPart PeerBehaviour.
-func BlockPart(peerID p2p.ID, explanation string) PeerBehaviour {
-	return PeerBehaviour{peerID: peerID, reason: blockPart{explanation}}
-}

behaviour/reporter.go

@@ -1,86 +0,0 @@
-package behaviour
-
-import (
-	"errors"
-
-	tmsync "github.com/tendermint/tendermint/libs/sync"
-	"github.com/tendermint/tendermint/p2p"
-)
-
-// Reporter provides an interface for reactors to report the behaviour
-// of peers synchronously to other components.
-type Reporter interface {
-	Report(behaviour PeerBehaviour) error
-}
-
-// SwitchReporter reports peer behaviour to an internal Switch.
-type SwitchReporter struct {
-	sw *p2p.Switch
-}
-
-// NewSwitchReporter return a new SwitchReporter instance which wraps the Switch.
-func NewSwitchReporter(sw *p2p.Switch) *SwitchReporter {
-	return &SwitchReporter{
-		sw: sw,
-	}
-}
-
-// Report reports the behaviour of a peer to the Switch.
-func (spbr *SwitchReporter) Report(behaviour PeerBehaviour) error {
-	peer := spbr.sw.Peers().Get(behaviour.peerID)
-	if peer == nil {
-		return errors.New("peer not found")
-	}
-
-	switch reason := behaviour.reason.(type) {
-	case consensusVote, blockPart:
-		spbr.sw.MarkPeerAsGood(peer)
-	case badMessage:
-		spbr.sw.StopPeerForError(peer, reason.explanation)
-	case messageOutOfOrder:
-		spbr.sw.StopPeerForError(peer, reason.explanation)
-	default:
-		return errors.New("unknown reason reported")
-	}
-
-	return nil
-}
-
-// MockReporter is a concrete implementation of the Reporter
-// interface used in reactor tests to ensure reactors report the correct
-// behaviour in manufactured scenarios.
-type MockReporter struct {
-	mtx tmsync.RWMutex
-	pb  map[p2p.ID][]PeerBehaviour
-}
-
-// NewMockReporter returns a Reporter which records all reported
-// behaviours in memory.
-func NewMockReporter() *MockReporter {
-	return &MockReporter{
-		pb: map[p2p.ID][]PeerBehaviour{},
-	}
-}
-
-// Report stores the PeerBehaviour produced by the peer identified by peerID.
-func (mpbr *MockReporter) Report(behaviour PeerBehaviour) error {
-	mpbr.mtx.Lock()
-	defer mpbr.mtx.Unlock()
-	mpbr.pb[behaviour.peerID] = append(mpbr.pb[behaviour.peerID], behaviour)
-
-	return nil
-}
-
-// GetBehaviours returns all behaviours reported on the peer identified by peerID.
-func (mpbr *MockReporter) GetBehaviours(peerID p2p.ID) []PeerBehaviour {
-	mpbr.mtx.RLock()
-	defer mpbr.mtx.RUnlock()
-	if items, ok := mpbr.pb[peerID]; ok {
-		result := make([]PeerBehaviour, len(items))
-		copy(result, items)
-
-		return result
-	}
-
-	return []PeerBehaviour{}
-}

behaviour/reporter_test.go

@@ -1,205 +0,0 @@
-package behaviour_test
-
-import (
-	"sync"
-	"testing"
-
-	bh "github.com/tendermint/tendermint/behaviour"
-	"github.com/tendermint/tendermint/p2p"
-)
-
-// TestMockReporter tests the MockReporter's ability to store reported
-// peer behaviour in memory indexed by the peerID.
-func TestMockReporter(t *testing.T) {
-	var peerID p2p.ID = "MockPeer"
-	pr := bh.NewMockReporter()
-
-	behaviours := pr.GetBehaviours(peerID)
-	if len(behaviours) != 0 {
-		t.Error("Expected to have no behaviours reported")
-	}
-
-	badMessage := bh.BadMessage(peerID, "bad message")
-	if err := pr.Report(badMessage); err != nil {
-		t.Error(err)
-	}
-	behaviours = pr.GetBehaviours(peerID)
-	if len(behaviours) != 1 {
-		t.Error("Expected the peer have one reported behaviour")
-	}
-
-	if behaviours[0] != badMessage {
-		t.Error("Expected Bad Message to have been reported")
-	}
-}
-
-type scriptItem struct {
-	peerID    p2p.ID
-	behaviour bh.PeerBehaviour
-}
-
-// equalBehaviours returns true if a and b contain the same PeerBehaviours with
-// the same freequencies and otherwise false.
-func equalBehaviours(a []bh.PeerBehaviour, b []bh.PeerBehaviour) bool {
-	aHistogram := map[bh.PeerBehaviour]int{}
-	bHistogram := map[bh.PeerBehaviour]int{}
-
-	for _, behaviour := range a {
-		aHistogram[behaviour]++
-	}
-
-	for _, behaviour := range b {
-		bHistogram[behaviour]++
-	}
-
-	if len(aHistogram) != len(bHistogram) {
-		return false
-	}
-
-	for _, behaviour := range a {
-		if aHistogram[behaviour] != bHistogram[behaviour] {
-			return false
-		}
-	}
-
-	for _, behaviour := range b {
-		if bHistogram[behaviour] != aHistogram[behaviour] {
-			return false
-		}
-	}
-
-	return true
-}
-
-// TestEqualPeerBehaviours tests that equalBehaviours can tell that two slices
-// of peer behaviours can be compared for the behaviours they contain and the
-// freequencies that those behaviours occur.
-func TestEqualPeerBehaviours(t *testing.T) {
-	var (
-		peerID        p2p.ID = "MockPeer"
-		consensusVote        = bh.ConsensusVote(peerID, "voted")
-		blockPart            = bh.BlockPart(peerID, "blocked")
-		equals               = []struct {
-			left  []bh.PeerBehaviour
-			right []bh.PeerBehaviour
-		}{
-			// Empty sets
-			{[]bh.PeerBehaviour{}, []bh.PeerBehaviour{}},
-			// Single behaviours
-			{[]bh.PeerBehaviour{consensusVote}, []bh.PeerBehaviour{consensusVote}},
-			// Equal Frequencies
-			{[]bh.PeerBehaviour{consensusVote, consensusVote},
-				[]bh.PeerBehaviour{consensusVote, consensusVote}},
-			// Equal frequencies different orders
-			{[]bh.PeerBehaviour{consensusVote, blockPart},
-				[]bh.PeerBehaviour{blockPart, consensusVote}},
-		}
-		unequals = []struct {
-			left  []bh.PeerBehaviour
-			right []bh.PeerBehaviour
-		}{
-			// Comparing empty sets to non empty sets
-			{[]bh.PeerBehaviour{}, []bh.PeerBehaviour{consensusVote}},
-			// Different behaviours
-			{[]bh.PeerBehaviour{consensusVote}, []bh.PeerBehaviour{blockPart}},
-			// Same behaviour with different frequencies
-			{[]bh.PeerBehaviour{consensusVote},
-				[]bh.PeerBehaviour{consensusVote, consensusVote}},
-		}
-	)
-
-	for _, test := range equals {
-		if !equalBehaviours(test.left, test.right) {
-			t.Errorf("expected %#v and %#v to be equal", test.left, test.right)
-		}
-	}
-
-	for _, test := range unequals {
-		if equalBehaviours(test.left, test.right) {
-			t.Errorf("expected %#v and %#v to be unequal", test.left, test.right)
-		}
-	}
-}
-
-// TestPeerBehaviourConcurrency constructs a scenario in which
-// multiple goroutines are using the same MockReporter instance.
-// This test reproduces the conditions in which MockReporter will
-// be used within a Reactor `Receive` method tests to ensure thread safety.
-func TestMockPeerBehaviourReporterConcurrency(t *testing.T) {
-	var (
-		behaviourScript = []struct {
-			peerID     p2p.ID
-			behaviours []bh.PeerBehaviour
-		}{
-			{"1", []bh.PeerBehaviour{bh.ConsensusVote("1", "")}},
-			{"2", []bh.PeerBehaviour{bh.ConsensusVote("2", ""), bh.ConsensusVote("2", ""), bh.ConsensusVote("2", "")}},
-			{
-				"3",
-				[]bh.PeerBehaviour{bh.BlockPart("3", ""),
-					bh.ConsensusVote("3", ""),
-					bh.BlockPart("3", ""),
-					bh.ConsensusVote("3", "")}},
-			{
-				"4",
-				[]bh.PeerBehaviour{bh.ConsensusVote("4", ""),
-					bh.ConsensusVote("4", ""),
-					bh.ConsensusVote("4", ""),
-					bh.ConsensusVote("4", "")}},
-			{
-				"5",
-				[]bh.PeerBehaviour{bh.BlockPart("5", ""),
-					bh.ConsensusVote("5", ""),
-					bh.BlockPart("5", ""),
-					bh.ConsensusVote("5", "")}},
-		}
-	)
-
-	var receiveWg sync.WaitGroup
-	pr := bh.NewMockReporter()
-	scriptItems := make(chan scriptItem)
-	done := make(chan int)
-	numConsumers := 3
-	for i := 0; i < numConsumers; i++ {
-		receiveWg.Add(1)
-		go func() {
-			defer receiveWg.Done()
-			for {
-				select {
-				case pb := <-scriptItems:
-					if err := pr.Report(pb.behaviour); err != nil {
-						t.Error(err)
-					}
-				case <-done:
-					return
-				}
-			}
-		}()
-	}
-
-	var sendingWg sync.WaitGroup
-	sendingWg.Add(1)
-	go func() {
-		defer sendingWg.Done()
-		for _, item := range behaviourScript {
-			for _, reason := range item.behaviours {
-				scriptItems <- scriptItem{item.peerID, reason}
-			}
-		}
-	}()
-
-	sendingWg.Wait()
-
-	for i := 0; i < numConsumers; i++ {
-		done <- 1
-	}
-
-	receiveWg.Wait()
-
-	for _, items := range behaviourScript {
-		reported := pr.GetBehaviours(items.peerID)
-		if !equalBehaviours(reported, items.behaviours) {
-			t.Errorf("expected peer %s to have behaved \nExpected: %#v \nGot %#v \n",
-				items.peerID, items.behaviours, reported)
-		}
-	}
-}

blockchain/pool.go

@@ -1,4 +1,4 @@
-package v0
+package blockchain
 
 import (
 	"errors"

blockchain/pool_test.go

@@ -1,4 +1,4 @@
-package v0
+package blockchain
 
 import (
 	"fmt"

blockchain/reactor.go

@@ -1,11 +1,10 @@
-package v0
+package blockchain
 
 import (
 	"fmt"
 	"reflect"
 	"time"
 
-	bc "github.com/tendermint/tendermint/blockchain"
 	"github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/p2p"
 	bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain"
@@ -45,8 +44,8 @@ func (e peerError) Error() string {
 	return fmt.Sprintf("error with peer %v: %s", e.peerID, e.err.Error())
 }
 
-// BlockchainReactor handles long-term catchup syncing.
-type BlockchainReactor struct {
+// Reactor handles long-term catchup syncing.
+type Reactor struct {
 	p2p.BaseReactor
 
 	// immutable
@@ -61,9 +60,9 @@ type BlockchainReactor struct {
 	errorsCh   <-chan peerError
 }
 
-// NewBlockchainReactor returns new reactor instance.
-func NewBlockchainReactor(state sm.State, blockExec *sm.BlockExecutor, store *store.BlockStore,
-	fastSync bool) *BlockchainReactor {
+// NewReactor returns new reactor instance.
+func NewReactor(state sm.State, blockExec *sm.BlockExecutor, store *store.BlockStore,
+	fastSync bool) *Reactor {
 
 	if state.LastBlockHeight != store.Height() {
 		panic(fmt.Sprintf("state (%v) and store (%v) height mismatch", state.LastBlockHeight,
@@ -81,7 +80,7 @@ func NewBlockchainReactor(state sm.State, blockExec *sm.BlockExecutor, store *st
 	}
 	pool := NewBlockPool(startHeight, requestsCh, errorsCh)
 
-	bcR := &BlockchainReactor{
+	bcR := &Reactor{
 		initialState: state,
 		blockExec:    blockExec,
 		store:        store,
@@ -90,18 +89,18 @@ func NewBlockchainReactor(state sm.State, blockExec *sm.BlockExecutor, store *st
 		requestsCh:   requestsCh,
 		errorsCh:     errorsCh,
 	}
-	bcR.BaseReactor = *p2p.NewBaseReactor("BlockchainReactor", bcR)
+	bcR.BaseReactor = *p2p.NewBaseReactor("Reactor", bcR)
 	return bcR
 }
 
 // SetLogger implements service.Service by setting the logger on reactor and pool.
-func (bcR *BlockchainReactor) SetLogger(l log.Logger) {
+func (bcR *Reactor) SetLogger(l log.Logger) {
 	bcR.BaseService.Logger = l
 	bcR.pool.Logger = l
 }
 
 // OnStart implements service.Service.
-func (bcR *BlockchainReactor) OnStart() error {
+func (bcR *Reactor) OnStart() error {
 	if bcR.fastSync {
 		err := bcR.pool.Start()
 		if err != nil {
@@ -113,7 +112,7 @@ func (bcR *BlockchainReactor) OnStart() error {
 }
 
 // SwitchToFastSync is called by the state sync reactor when switching to fast sync.
-func (bcR *BlockchainReactor) SwitchToFastSync(state sm.State) error {
+func (bcR *Reactor) SwitchToFastSync(state sm.State) error {
 	bcR.fastSync = true
 	bcR.initialState = state
 
@@ -127,7 +126,7 @@ func (bcR *BlockchainReactor) SwitchToFastSync(state sm.State) error {
 }
 
 // OnStop implements service.Service.
-func (bcR *BlockchainReactor) OnStop() {
+func (bcR *Reactor) OnStop() {
 	if bcR.fastSync {
 		if err := bcR.pool.Stop(); err != nil {
 			bcR.Logger.Error("Error stopping pool", "err", err)
@@ -136,21 +135,21 @@ func (bcR *BlockchainReactor) OnStop() {
 }
 
 // GetChannels implements Reactor
-func (bcR *BlockchainReactor) GetChannels() []*p2p.ChannelDescriptor {
+func (bcR *Reactor) GetChannels() []*p2p.ChannelDescriptor {
 	return []*p2p.ChannelDescriptor{
 		{
 			ID:                  BlockchainChannel,
 			Priority:            5,
 			SendQueueCapacity:   1000,
 			RecvBufferCapacity:  50 * 4096,
-			RecvMessageCapacity: bc.MaxMsgSize,
+			RecvMessageCapacity: MaxMsgSize,
 		},
 	}
 }
 
 // AddPeer implements Reactor by sending our state to peer.
-func (bcR *BlockchainReactor) AddPeer(peer p2p.Peer) {
-	msgBytes, err := bc.EncodeMsg(&bcproto.StatusResponse{
+func (bcR *Reactor) AddPeer(peer p2p.Peer) {
+	msgBytes, err := EncodeMsg(&bcproto.StatusResponse{
 		Base:   bcR.store.Base(),
 		Height: bcR.store.Height()})
 	if err != nil {
@@ -166,13 +165,13 @@ func (bcR *BlockchainReactor) AddPeer(peer p2p.Peer) {
 }
 
 // RemovePeer implements Reactor by removing peer from the pool.
-func (bcR *BlockchainReactor) RemovePeer(peer p2p.Peer, reason interface{}) {
+func (bcR *Reactor) RemovePeer(peer p2p.Peer, reason interface{}) {
 	bcR.pool.RemovePeer(peer.ID())
 }
 
 // respondToPeer loads a block and sends it to the requesting peer,
 // if we have it. Otherwise, we'll respond saying we don't have it.
-func (bcR *BlockchainReactor) respondToPeer(msg *bcproto.BlockRequest,
+func (bcR *Reactor) respondToPeer(msg *bcproto.BlockRequest,
 	src p2p.Peer) (queued bool) {
 
 	block := bcR.store.LoadBlock(msg.Height)
@@ -183,7 +182,7 @@ func (bcR *BlockchainReactor) respondToPeer(msg *bcproto.BlockRequest,
 			return false
 		}
 
-		msgBytes, err := bc.EncodeMsg(&bcproto.BlockResponse{Block: bl})
+		msgBytes, err := EncodeMsg(&bcproto.BlockResponse{Block: bl})
 		if err != nil {
 			bcR.Logger.Error("could not marshal msg", "err", err)
 			return false
@@ -194,7 +193,7 @@ func (bcR *BlockchainReactor) respondToPeer(msg *bcproto.BlockRequest,
 
 	bcR.Logger.Info("Peer asking for a block we don't have", "src", src, "height", msg.Height)
 
-	msgBytes, err := bc.EncodeMsg(&bcproto.NoBlockResponse{Height: msg.Height})
+	msgBytes, err := EncodeMsg(&bcproto.NoBlockResponse{Height: msg.Height})
 	if err != nil {
 		bcR.Logger.Error("could not convert msg to protobuf", "err", err)
 		return false
@@ -204,15 +203,15 @@ func (bcR *BlockchainReactor) respondToPeer(msg *bcproto.BlockRequest,
 }
 
 // Receive implements Reactor by handling 4 types of messages (look below).
-func (bcR *BlockchainReactor) Receive(chID byte, src p2p.Peer, msgBytes []byte) {
-	msg, err := bc.DecodeMsg(msgBytes)
+func (bcR *Reactor) Receive(chID byte, src p2p.Peer, msgBytes []byte) {
+	msg, err := DecodeMsg(msgBytes)
 	if err != nil {
 		bcR.Logger.Error("Error decoding message", "src", src, "chId", chID, "err", err)
 		bcR.Switch.StopPeerForError(src, err)
 		return
 	}
 
-	if err = bc.ValidateMsg(msg); err != nil {
+	if err = ValidateMsg(msg); err != nil {
 		bcR.Logger.Error("Peer sent us invalid msg", "peer", src, "msg", msg, "err", err)
 		bcR.Switch.StopPeerForError(src, err)
 		return
@@ -232,7 +231,7 @@ func (bcR *BlockchainReactor) Receive(chID byte, src p2p.Peer, msgBytes []byte)
 		bcR.pool.AddBlock(src.ID(), bi, len(msgBytes))
 	case *bcproto.StatusRequest:
 		// Send peer our state.
-		msgBytes, err := bc.EncodeMsg(&bcproto.StatusResponse{
+		msgBytes, err := EncodeMsg(&bcproto.StatusResponse{
 			Height: bcR.store.Height(),
 			Base:   bcR.store.Base(),
 		})
@@ -253,7 +252,7 @@ func (bcR *BlockchainReactor) Receive(chID byte, src p2p.Peer, msgBytes []byte)
 
 // Handle messages from the poolReactor telling the reactor what to do.
 // NOTE: Don't sleep in the FOR_LOOP or otherwise slow it down!
-func (bcR *BlockchainReactor) poolRoutine(stateSynced bool) {
+func (bcR *Reactor) poolRoutine(stateSynced bool) {
 
 	trySyncTicker := time.NewTicker(trySyncIntervalMS * time.Millisecond)
 	defer trySyncTicker.Stop()
@@ -286,7 +285,7 @@ func (bcR *BlockchainReactor) poolRoutine(stateSynced bool) {
 				if peer == nil {
 					continue
 				}
-				msgBytes, err := bc.EncodeMsg(&bcproto.BlockRequest{Height: request.Height})
+				msgBytes, err := EncodeMsg(&bcproto.BlockRequest{Height: request.Height})
 				if err != nil {
 					bcR.Logger.Error("could not convert msg to proto", "err", err)
 					continue
@@ -382,14 +381,14 @@ FOR_LOOP:
 				if peer != nil {
 					// NOTE: we've already removed the peer's request, but we
 					// still need to clean up the rest.
-					bcR.Switch.StopPeerForError(peer, fmt.Errorf("blockchainReactor validation error: %v", err))
+					bcR.Switch.StopPeerForError(peer, fmt.Errorf("Reactor validation error: %v", err))
 				}
 				peerID2 := bcR.pool.RedoRequest(second.Height)
 				peer2 := bcR.Switch.Peers().Get(peerID2)
 				if peer2 != nil && peer2 != peer {
 					// NOTE: we've already removed the peer's request, but we
 					// still need to clean up the rest.
-					bcR.Switch.StopPeerForError(peer2, fmt.Errorf("blockchainReactor validation error: %v", err))
+					bcR.Switch.StopPeerForError(peer2, fmt.Errorf("Reactor validation error: %v", err))
 				}
 				continue FOR_LOOP
 			}
@@ -424,8 +423,8 @@ FOR_LOOP:
 }
 
 // BroadcastStatusRequest broadcasts `BlockStore` base and height.
-func (bcR *BlockchainReactor) BroadcastStatusRequest() error {
-	bm, err := bc.EncodeMsg(&bcproto.StatusRequest{})
+func (bcR *Reactor) BroadcastStatusRequest() error {
+	bm, err := EncodeMsg(&bcproto.StatusRequest{})
 	if err != nil {
 		bcR.Logger.Error("could not convert msg to proto", "err", err)
 		return fmt.Errorf("could not convert msg to proto: %w", err)

blockchain/reactor_test.go

@@ -1,4 +1,4 @@
-package v0
+package blockchain
 
 import (
 	"fmt"
@@ -46,23 +46,23 @@ func randGenesisDoc(numValidators int, randPower bool, minPower int64) (*types.G
 	}, privValidators
 }
 
-type BlockchainReactorPair struct {
-	reactor *BlockchainReactor
+type ReactorPair struct {
+	reactor *Reactor
 	app     proxy.AppConns
 }
 
-func newBlockchainReactor(
+func newReactor(
 	logger log.Logger,
 	genDoc *types.GenesisDoc,
 	privVals []types.PrivValidator,
-	maxBlockHeight int64) BlockchainReactorPair {
+	maxBlockHeight int64) ReactorPair {
 	if len(privVals) != 1 {
 		panic("only support one validator")
 	}
 
 	app := &testApp{}
 	cc := proxy.NewLocalClientCreator(app)
-	proxyApp := proxy.NewAppConns(cc)
+	proxyApp := proxy.NewAppConns(cc, proxy.NopMetrics())
 	err := proxyApp.Start()
 	if err != nil {
 		panic(fmt.Errorf("error start app: %w", err))
@@ -78,7 +78,7 @@ func newBlockchainReactor(
 		panic(fmt.Errorf("error constructing state from genesis file: %w", err))
 	}
 
-	// Make the BlockchainReactor itself.
+	// Make the Reactor itself.
 	// NOTE we have to create and commit the blocks first because
 	// pool.height is determined from the store.
 	fastSync := true
@@ -125,10 +125,10 @@ func newBlockchainReactor(
 		blockStore.SaveBlock(thisBlock, thisParts, lastCommit)
 	}
 
-	bcReactor := NewBlockchainReactor(state.Copy(), blockExec, blockStore, fastSync)
+	bcReactor := NewReactor(state.Copy(), blockExec, blockStore, fastSync)
 	bcReactor.SetLogger(logger.With("module", "blockchain"))
 
-	return BlockchainReactorPair{bcReactor, proxyApp}
+	return ReactorPair{bcReactor, proxyApp}
 }
 
 func TestNoBlockResponse(t *testing.T) {
@@ -138,10 +138,10 @@ func TestNoBlockResponse(t *testing.T) {
 
 	maxBlockHeight := int64(65)
 
-	reactorPairs := make([]BlockchainReactorPair, 2)
+	reactorPairs := make([]ReactorPair, 2)
 
-	reactorPairs[0] = newBlockchainReactor(log.TestingLogger(), genDoc, privVals, maxBlockHeight)
-	reactorPairs[1] = newBlockchainReactor(log.TestingLogger(), genDoc, privVals, 0)
+	reactorPairs[0] = newReactor(log.TestingLogger(), genDoc, privVals, maxBlockHeight)
+	reactorPairs[1] = newReactor(log.TestingLogger(), genDoc, privVals, 0)
 
 	p2p.MakeConnectedSwitches(config.P2P, 2, func(i int, s *p2p.Switch) *p2p.Switch {
 		s.AddReactor("BLOCKCHAIN", reactorPairs[i].reactor)
@@ -202,7 +202,7 @@ func TestBadBlockStopsPeer(t *testing.T) {
 
 	// Other chain needs a different validator set
 	otherGenDoc, otherPrivVals := randGenesisDoc(1, false, 30)
-	otherChain := newBlockchainReactor(log.TestingLogger(), otherGenDoc, otherPrivVals, maxBlockHeight)
+	otherChain := newReactor(log.TestingLogger(), otherGenDoc, otherPrivVals, maxBlockHeight)
 
 	defer func() {
 		err := otherChain.reactor.Stop()
@@ -211,12 +211,12 @@ func TestBadBlockStopsPeer(t *testing.T) {
 		require.NoError(t, err)
 	}()
 
-	reactorPairs := make([]BlockchainReactorPair, 4)
+	reactorPairs := make([]ReactorPair, 4)
 
-	reactorPairs[0] = newBlockchainReactor(log.TestingLogger(), genDoc, privVals, maxBlockHeight)
-	reactorPairs[1] = newBlockchainReactor(log.TestingLogger(), genDoc, privVals, 0)
-	reactorPairs[2] = newBlockchainReactor(log.TestingLogger(), genDoc, privVals, 0)
-	reactorPairs[3] = newBlockchainReactor(log.TestingLogger(), genDoc, privVals, 0)
+	reactorPairs[0] = newReactor(log.TestingLogger(), genDoc, privVals, maxBlockHeight)
+	reactorPairs[1] = newReactor(log.TestingLogger(), genDoc, privVals, 0)
+	reactorPairs[2] = newReactor(log.TestingLogger(), genDoc, privVals, 0)
+	reactorPairs[3] = newReactor(log.TestingLogger(), genDoc, privVals, 0)
 
 	switches := p2p.MakeConnectedSwitches(config.P2P, 4, func(i int, s *p2p.Switch) *p2p.Switch {
 		s.AddReactor("BLOCKCHAIN", reactorPairs[i].reactor)
@@ -254,7 +254,7 @@ func TestBadBlockStopsPeer(t *testing.T) {
 	// race, but can't be easily avoided.
 	reactorPairs[3].reactor.store = otherChain.reactor.store
 
-	lastReactorPair := newBlockchainReactor(log.TestingLogger(), genDoc, privVals, 0)
+	lastReactorPair := newReactor(log.TestingLogger(), genDoc, privVals, 0)
 	reactorPairs = append(reactorPairs, lastReactorPair)
 
 	switches = append(switches, p2p.MakeConnectedSwitches(config.P2P, 1, func(i int, s *p2p.Switch) *p2p.Switch {

blockchain/v1/peer.go

@@ -1,211 +0,0 @@
-package v1
-
-import (
-	"fmt"
-	"math"
-	"time"
-
-	flow "github.com/tendermint/tendermint/libs/flowrate"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
-)
-
-//--------
-// Peer
-
-// BpPeerParams stores the peer parameters that are used when creating a peer.
-type BpPeerParams struct {
-	timeout     time.Duration
-	minRecvRate int64
-	sampleRate  time.Duration
-	windowSize  time.Duration
-}
-
-// BpPeer is the datastructure associated with a fast sync peer.
-type BpPeer struct {
-	logger log.Logger
-	ID     p2p.ID
-
-	Base                    int64                  // the peer reported base
-	Height                  int64                  // the peer reported height
-	NumPendingBlockRequests int                    // number of requests still waiting for block responses
-	blocks                  map[int64]*types.Block // blocks received or expected to be received from this peer
-	blockResponseTimer      *time.Timer
-	recvMonitor             *flow.Monitor
-	params                  *BpPeerParams // parameters for timer and monitor
-
-	onErr func(err error, peerID p2p.ID) // function to call on error
-}
-
-// NewBpPeer creates a new peer.
-func NewBpPeer(peerID p2p.ID, base int64, height int64,
-	onErr func(err error, peerID p2p.ID), params *BpPeerParams) *BpPeer {
-
-	if params == nil {
-		params = BpPeerDefaultParams()
-	}
-	return &BpPeer{
-		ID:     peerID,
-		Base:   base,
-		Height: height,
-		blocks: make(map[int64]*types.Block, maxRequestsPerPeer),
-		logger: log.NewNopLogger(),
-		onErr:  onErr,
-		params: params,
-	}
-}
-
-// String returns a string representation of a peer.
-func (peer *BpPeer) String() string {
-	return fmt.Sprintf("peer: %v height: %v pending: %v", peer.ID, peer.Height, peer.NumPendingBlockRequests)
-}
-
-// SetLogger sets the logger of the peer.
-func (peer *BpPeer) SetLogger(l log.Logger) {
-	peer.logger = l
-}
-
-// Cleanup performs cleanup of the peer, removes blocks, requests, stops timer and monitor.
-func (peer *BpPeer) Cleanup() {
-	if peer.blockResponseTimer != nil {
-		peer.blockResponseTimer.Stop()
-	}
-	if peer.NumPendingBlockRequests != 0 {
-		peer.logger.Info("peer with pending requests is being cleaned", "peer", peer.ID)
-	}
-	if len(peer.blocks)-peer.NumPendingBlockRequests != 0 {
-		peer.logger.Info("peer with pending blocks is being cleaned", "peer", peer.ID)
-	}
-	for h := range peer.blocks {
-		delete(peer.blocks, h)
-	}
-	peer.NumPendingBlockRequests = 0
-	peer.recvMonitor = nil
-}
-
-// BlockAtHeight returns the block at a given height if available and errMissingBlock otherwise.
-func (peer *BpPeer) BlockAtHeight(height int64) (*types.Block, error) {
-	block, ok := peer.blocks[height]
-	if !ok {
-		return nil, errMissingBlock
-	}
-	if block == nil {
-		return nil, errMissingBlock
-	}
-	return peer.blocks[height], nil
-}
-
-// AddBlock adds a block at peer level. Block must be non-nil and recvSize a positive integer
-// The peer must have a pending request for this block.
-func (peer *BpPeer) AddBlock(block *types.Block, recvSize int) error {
-	if block == nil || recvSize < 0 {
-		panic("bad parameters")
-	}
-	existingBlock, ok := peer.blocks[block.Height]
-	if !ok {
-		peer.logger.Error("unsolicited block", "blockHeight", block.Height, "peer", peer.ID)
-		return errMissingBlock
-	}
-	if existingBlock != nil {
-		peer.logger.Error("already have a block for height", "height", block.Height)
-		return errDuplicateBlock
-	}
-	if peer.NumPendingBlockRequests == 0 {
-		panic("peer does not have pending requests")
-	}
-	peer.blocks[block.Height] = block
-	peer.NumPendingBlockRequests--
-	if peer.NumPendingBlockRequests == 0 {
-		peer.stopMonitor()
-		peer.stopBlockResponseTimer()
-	} else {
-		peer.recvMonitor.Update(recvSize)
-		peer.resetBlockResponseTimer()
-	}
-	return nil
-}
-
-// RemoveBlock removes the block of given height
-func (peer *BpPeer) RemoveBlock(height int64) {
-	delete(peer.blocks, height)
-}
-
-// RequestSent records that a request was sent, and starts the peer timer and monitor if needed.
-func (peer *BpPeer) RequestSent(height int64) {
-	peer.blocks[height] = nil
-
-	if peer.NumPendingBlockRequests == 0 {
-		peer.startMonitor()
-		peer.resetBlockResponseTimer()
-	}
-	peer.NumPendingBlockRequests++
-}
-
-// CheckRate verifies that the response rate of the peer is acceptable (higher than the minimum allowed).
-func (peer *BpPeer) CheckRate() error {
-	if peer.NumPendingBlockRequests == 0 {
-		return nil
-	}
-	curRate := peer.recvMonitor.Status().CurRate
-	// curRate can be 0 on start
-	if curRate != 0 && curRate < peer.params.minRecvRate {
-		err := errSlowPeer
-		peer.logger.Error("SendTimeout", "peer", peer,
-			"reason", err,
-			"curRate", fmt.Sprintf("%d KB/s", curRate/1024),
-			"minRate", fmt.Sprintf("%d KB/s", peer.params.minRecvRate/1024))
-		return err
-	}
-	return nil
-}
-
-func (peer *BpPeer) onTimeout() {
-	peer.onErr(errNoPeerResponse, peer.ID)
-}
-
-func (peer *BpPeer) stopMonitor() {
-	peer.recvMonitor.Done()
-	peer.recvMonitor = nil
-}
-
-func (peer *BpPeer) startMonitor() {
-	peer.recvMonitor = flow.New(peer.params.sampleRate, peer.params.windowSize)
-	initialValue := float64(peer.params.minRecvRate) * math.E
-	peer.recvMonitor.SetREMA(initialValue)
-}
-
-func (peer *BpPeer) resetBlockResponseTimer() {
-	if peer.blockResponseTimer == nil {
-		peer.blockResponseTimer = time.AfterFunc(peer.params.timeout, peer.onTimeout)
-	} else {
-		peer.blockResponseTimer.Reset(peer.params.timeout)
-	}
-}
-
-func (peer *BpPeer) stopBlockResponseTimer() bool {
-	if peer.blockResponseTimer == nil {
-		return false
-	}
-	return peer.blockResponseTimer.Stop()
-}
-
-// BpPeerDefaultParams returns the default peer parameters.
-func BpPeerDefaultParams() *BpPeerParams {
-	return &BpPeerParams{
-		// Timeout for a peer to respond to a block request.
-		timeout: 15 * time.Second,
-
-		// Minimum recv rate to ensure we're receiving blocks from a peer fast
-		// enough. If a peer is not sending data at at least that rate, we
-		// consider them to have timedout and we disconnect.
-		//
-		// Assuming a DSL connection (not a good choice) 128 Kbps (upload) ~ 15 KB/s,
-		// sending data across atlantic ~ 7.5 KB/s.
-		minRecvRate: int64(7680),
-
-		// Monitor parameters
-		sampleRate: time.Second,
-		windowSize: 40 * time.Second,
-	}
-}

blockchain/v1/peer_test.go

@@ -1,280 +0,0 @@
-package v1
-
-import (
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/tendermint/tendermint/libs/log"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	"github.com/tendermint/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
-)
-
-func TestPeerMonitor(t *testing.T) {
-	peer := NewBpPeer(
-		p2p.ID(tmrand.Str(12)), 0, 10,
-		func(err error, _ p2p.ID) {},
-		nil)
-	peer.SetLogger(log.TestingLogger())
-	peer.startMonitor()
-	assert.NotNil(t, peer.recvMonitor)
-	peer.stopMonitor()
-	assert.Nil(t, peer.recvMonitor)
-}
-
-func TestPeerResetBlockResponseTimer(t *testing.T) {
-	var (
-		numErrFuncCalls int        // number of calls to the errFunc
-		lastErr         error      // last generated error
-		peerTestMtx     sync.Mutex // modifications of ^^ variables are also done from timer handler goroutine
-	)
-	params := &BpPeerParams{timeout: 20 * time.Millisecond}
-
-	peer := NewBpPeer(
-		p2p.ID(tmrand.Str(12)), 0, 10,
-		func(err error, _ p2p.ID) {
-			peerTestMtx.Lock()
-			defer peerTestMtx.Unlock()
-			lastErr = err
-			numErrFuncCalls++
-		},
-		params)
-
-	peer.SetLogger(log.TestingLogger())
-	checkByStoppingPeerTimer(t, peer, false)
-
-	// initial reset call with peer having a nil timer
-	peer.resetBlockResponseTimer()
-	assert.NotNil(t, peer.blockResponseTimer)
-	// make sure timer is running and stop it
-	checkByStoppingPeerTimer(t, peer, true)
-
-	// reset with running timer
-	peer.resetBlockResponseTimer()
-	time.Sleep(5 * time.Millisecond)
-	peer.resetBlockResponseTimer()
-	assert.NotNil(t, peer.blockResponseTimer)
-
-	// let the timer expire and ...
-	time.Sleep(50 * time.Millisecond)
-	// ... check timer is not running
-	checkByStoppingPeerTimer(t, peer, false)
-
-	peerTestMtx.Lock()
-	// ... check errNoPeerResponse has been sent
-	assert.Equal(t, 1, numErrFuncCalls)
-	assert.Equal(t, lastErr, errNoPeerResponse)
-	peerTestMtx.Unlock()
-}
-
-func TestPeerRequestSent(t *testing.T) {
-	params := &BpPeerParams{timeout: 2 * time.Millisecond}
-
-	peer := NewBpPeer(
-		p2p.ID(tmrand.Str(12)), 0, 10,
-		func(err error, _ p2p.ID) {},
-		params)
-
-	peer.SetLogger(log.TestingLogger())
-
-	peer.RequestSent(1)
-	assert.NotNil(t, peer.recvMonitor)
-	assert.NotNil(t, peer.blockResponseTimer)
-	assert.Equal(t, 1, peer.NumPendingBlockRequests)
-
-	peer.RequestSent(1)
-	assert.NotNil(t, peer.recvMonitor)
-	assert.NotNil(t, peer.blockResponseTimer)
-	assert.Equal(t, 2, peer.NumPendingBlockRequests)
-}
-
-func TestPeerGetAndRemoveBlock(t *testing.T) {
-	peer := NewBpPeer(
-		p2p.ID(tmrand.Str(12)), 0, 100,
-		func(err error, _ p2p.ID) {},
-		nil)
-
-	// Change peer height
-	peer.Height = int64(10)
-	assert.Equal(t, int64(10), peer.Height)
-
-	// request some blocks and receive few of them
-	for i := 1; i <= 10; i++ {
-		peer.RequestSent(int64(i))
-		if i > 5 {
-			// only receive blocks 1..5
-			continue
-		}
-		_ = peer.AddBlock(makeSmallBlock(i), 10)
-	}
-
-	tests := []struct {
-		name         string
-		height       int64
-		wantErr      error
-		blockPresent bool
-	}{
-		{"no request", 100, errMissingBlock, false},
-		{"no block", 6, errMissingBlock, false},
-		{"block 1 present", 1, nil, true},
-		{"block max present", 5, nil, true},
-	}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			// try to get the block
-			b, err := peer.BlockAtHeight(tt.height)
-			assert.Equal(t, tt.wantErr, err)
-			assert.Equal(t, tt.blockPresent, b != nil)
-
-			// remove the block
-			peer.RemoveBlock(tt.height)
-			_, err = peer.BlockAtHeight(tt.height)
-			assert.Equal(t, errMissingBlock, err)
-		})
-	}
-}
-
-func TestPeerAddBlock(t *testing.T) {
-	peer := NewBpPeer(
-		p2p.ID(tmrand.Str(12)), 0, 100,
-		func(err error, _ p2p.ID) {},
-		nil)
-
-	// request some blocks, receive one
-	for i := 1; i <= 10; i++ {
-		peer.RequestSent(int64(i))
-		if i == 5 {
-			// receive block 5
-			_ = peer.AddBlock(makeSmallBlock(i), 10)
-		}
-	}
-
-	tests := []struct {
-		name         string
-		height       int64
-		wantErr      error
-		blockPresent bool
-	}{
-		{"no request", 50, errMissingBlock, false},
-		{"duplicate block", 5, errDuplicateBlock, true},
-		{"block 1 successfully received", 1, nil, true},
-		{"block max successfully received", 10, nil, true},
-	}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			// try to get the block
-			err := peer.AddBlock(makeSmallBlock(int(tt.height)), 10)
-			assert.Equal(t, tt.wantErr, err)
-			_, err = peer.BlockAtHeight(tt.height)
-			assert.Equal(t, tt.blockPresent, err == nil)
-		})
-	}
-}
-
-func TestPeerOnErrFuncCalledDueToExpiration(t *testing.T) {
-
-	params := &BpPeerParams{timeout: 10 * time.Millisecond}
-	var (
-		numErrFuncCalls int        // number of calls to the onErr function
-		lastErr         error      // last generated error
-		peerTestMtx     sync.Mutex // modifications of ^^ variables are also done from timer handler goroutine
-	)
-
-	peer := NewBpPeer(
-		p2p.ID(tmrand.Str(12)), 0, 10,
-		func(err error, _ p2p.ID) {
-			peerTestMtx.Lock()
-			defer peerTestMtx.Unlock()
-			lastErr = err
-			numErrFuncCalls++
-		},
-		params)
-
-	peer.SetLogger(log.TestingLogger())
-
-	peer.RequestSent(1)
-	time.Sleep(50 * time.Millisecond)
-	// timer should have expired by now, check that the on error function was called
-	peerTestMtx.Lock()
-	assert.Equal(t, 1, numErrFuncCalls)
-	assert.Equal(t, errNoPeerResponse, lastErr)
-	peerTestMtx.Unlock()
-}
-
-func TestPeerCheckRate(t *testing.T) {
-	params := &BpPeerParams{
-		timeout:     time.Second,
-		minRecvRate: int64(100), // 100 bytes/sec exponential moving average
-	}
-	peer := NewBpPeer(
-		p2p.ID(tmrand.Str(12)), 0, 10,
-		func(err error, _ p2p.ID) {},
-		params)
-	peer.SetLogger(log.TestingLogger())
-
-	require.Nil(t, peer.CheckRate())
-
-	for i := 0; i < 40; i++ {
-		peer.RequestSent(int64(i))
-	}
-
-	// monitor starts with a higher rEMA (~ 2*minRecvRate), wait for it to go down
-	time.Sleep(900 * time.Millisecond)
-
-	// normal peer - send a bit more than 100 bytes/sec, > 10 bytes/100msec, check peer is not considered slow
-	for i := 0; i < 10; i++ {
-		_ = peer.AddBlock(makeSmallBlock(i), 11)
-		time.Sleep(100 * time.Millisecond)
-		require.Nil(t, peer.CheckRate())
-	}
-
-	// slow peer - send a bit less than 10 bytes/100msec
-	for i := 10; i < 20; i++ {
-		_ = peer.AddBlock(makeSmallBlock(i), 9)
-		time.Sleep(100 * time.Millisecond)
-	}
-	// check peer is considered slow
-	assert.Equal(t, errSlowPeer, peer.CheckRate())
-}
-
-func TestPeerCleanup(t *testing.T) {
-	params := &BpPeerParams{timeout: 2 * time.Millisecond}
-
-	peer := NewBpPeer(
-		p2p.ID(tmrand.Str(12)), 0, 10,
-		func(err error, _ p2p.ID) {},
-		params)
-	peer.SetLogger(log.TestingLogger())
-
-	assert.Nil(t, peer.blockResponseTimer)
-	peer.RequestSent(1)
-	assert.NotNil(t, peer.blockResponseTimer)
-
-	peer.Cleanup()
-	checkByStoppingPeerTimer(t, peer, false)
-}
-
-// Check if peer timer is running or not (a running timer can be successfully stopped).
-// Note: stops the timer.
-func checkByStoppingPeerTimer(t *testing.T, peer *BpPeer, running bool) {
-	assert.NotPanics(t, func() {
-		stopped := peer.stopBlockResponseTimer()
-		if running {
-			assert.True(t, stopped)
-		} else {
-			assert.False(t, stopped)
-		}
-	})
-}
-
-func makeSmallBlock(height int) *types.Block {
-	return types.MakeBlock(int64(height), []types.Tx{types.Tx("foo")}, nil, nil)
-}

blockchain/v1/pool.go

@@ -1,370 +0,0 @@
-package v1
-
-import (
-	"sort"
-
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
-)
-
-// BlockPool keeps track of the fast sync peers, block requests and block responses.
-type BlockPool struct {
-	logger log.Logger
-	// Set of peers that have sent status responses, with height bigger than pool.Height
-	peers map[p2p.ID]*BpPeer
-	// Set of block heights and the corresponding peers from where a block response is expected or has been received.
-	blocks map[int64]p2p.ID
-
-	plannedRequests   map[int64]struct{} // list of blocks to be assigned peers for blockRequest
-	nextRequestHeight int64              // next height to be added to plannedRequests
-
-	Height        int64 // height of next block to execute
-	MaxPeerHeight int64 // maximum height of all peers
-	toBcR         bcReactor
-}
-
-// NewBlockPool creates a new BlockPool.
-func NewBlockPool(height int64, toBcR bcReactor) *BlockPool {
-	return &BlockPool{
-		Height:            height,
-		MaxPeerHeight:     0,
-		peers:             make(map[p2p.ID]*BpPeer),
-		blocks:            make(map[int64]p2p.ID),
-		plannedRequests:   make(map[int64]struct{}),
-		nextRequestHeight: height,
-		toBcR:             toBcR,
-	}
-}
-
-// SetLogger sets the logger of the pool.
-func (pool *BlockPool) SetLogger(l log.Logger) {
-	pool.logger = l
-}
-
-// ReachedMaxHeight check if the pool has reached the maximum peer height.
-func (pool *BlockPool) ReachedMaxHeight() bool {
-	return pool.Height >= pool.MaxPeerHeight
-}
-
-func (pool *BlockPool) rescheduleRequest(peerID p2p.ID, height int64) {
-	pool.logger.Info("reschedule requests made to peer for height ", "peerID", peerID, "height", height)
-	pool.plannedRequests[height] = struct{}{}
-	delete(pool.blocks, height)
-	pool.peers[peerID].RemoveBlock(height)
-}
-
-// Updates the pool's max height. If no peers are left MaxPeerHeight is set to 0.
-func (pool *BlockPool) updateMaxPeerHeight() {
-	var newMax int64
-	for _, peer := range pool.peers {
-		peerHeight := peer.Height
-		if peerHeight > newMax {
-			newMax = peerHeight
-		}
-	}
-	pool.MaxPeerHeight = newMax
-}
-
-// UpdatePeer adds a new peer or updates an existing peer with a new base and height.
-// If a peer is short it is not added.
-func (pool *BlockPool) UpdatePeer(peerID p2p.ID, base int64, height int64) error {
-
-	peer := pool.peers[peerID]
-
-	if peer == nil {
-		if height < pool.Height {
-			pool.logger.Info("Peer height too small",
-				"peer", peerID, "height", height, "fsm_height", pool.Height)
-			return errPeerTooShort
-		}
-		// Add new peer.
-		peer = NewBpPeer(peerID, base, height, pool.toBcR.sendPeerError, nil)
-		peer.SetLogger(pool.logger.With("peer", peerID))
-		pool.peers[peerID] = peer
-		pool.logger.Info("added peer", "peerID", peerID, "base", base, "height", height, "num_peers", len(pool.peers))
-	} else {
-		// Check if peer is lowering its height. This is not allowed.
-		if height < peer.Height {
-			pool.RemovePeer(peerID, errPeerLowersItsHeight)
-			return errPeerLowersItsHeight
-		}
-		// Update existing peer.
-		peer.Base = base
-		peer.Height = height
-	}
-
-	// Update the pool's MaxPeerHeight if needed.
-	pool.updateMaxPeerHeight()
-
-	return nil
-}
-
-// Cleans and deletes the peer. Recomputes the max peer height.
-func (pool *BlockPool) deletePeer(peer *BpPeer) {
-	if peer == nil {
-		return
-	}
-	peer.Cleanup()
-	delete(pool.peers, peer.ID)
-
-	if peer.Height == pool.MaxPeerHeight {
-		pool.updateMaxPeerHeight()
-	}
-}
-
-// RemovePeer removes the blocks and requests from the peer, reschedules them and deletes the peer.
-func (pool *BlockPool) RemovePeer(peerID p2p.ID, err error) {
-	peer := pool.peers[peerID]
-	if peer == nil {
-		return
-	}
-	pool.logger.Info("removing peer", "peerID", peerID, "error", err)
-
-	// Reschedule the block requests made to the peer, or received and not processed yet.
-	// Note that some of the requests may be removed further down.
-	for h := range pool.peers[peerID].blocks {
-		pool.rescheduleRequest(peerID, h)
-	}
-
-	oldMaxPeerHeight := pool.MaxPeerHeight
-	// Delete the peer. This operation may result in the pool's MaxPeerHeight being lowered.
-	pool.deletePeer(peer)
-
-	// Check if the pool's MaxPeerHeight has been lowered.
-	// This may happen if the tallest peer has been removed.
-	if oldMaxPeerHeight > pool.MaxPeerHeight {
-		// Remove any planned requests for heights over the new MaxPeerHeight.
-		for h := range pool.plannedRequests {
-			if h > pool.MaxPeerHeight {
-				delete(pool.plannedRequests, h)
-			}
-		}
-		// Adjust the nextRequestHeight to the new max plus one.
-		if pool.nextRequestHeight > pool.MaxPeerHeight {
-			pool.nextRequestHeight = pool.MaxPeerHeight + 1
-		}
-	}
-}
-
-func (pool *BlockPool) removeShortPeers() {
-	for _, peer := range pool.peers {
-		if peer.Height < pool.Height {
-			pool.RemovePeer(peer.ID, nil)
-		}
-	}
-}
-
-func (pool *BlockPool) removeBadPeers() {
-	pool.removeShortPeers()
-	for _, peer := range pool.peers {
-		if err := peer.CheckRate(); err != nil {
-			pool.RemovePeer(peer.ID, err)
-			pool.toBcR.sendPeerError(err, peer.ID)
-		}
-	}
-}
-
-// MakeNextRequests creates more requests if the block pool is running low.
-func (pool *BlockPool) MakeNextRequests(maxNumRequests int) {
-	heights := pool.makeRequestBatch(maxNumRequests)
-	if len(heights) != 0 {
-		pool.logger.Info("makeNextRequests will make following requests",
-			"number", len(heights), "heights", heights)
-	}
-
-	for _, height := range heights {
-		h := int64(height)
-		if !pool.sendRequest(h) {
-			// If a good peer was not found for sending the request at height h then return,
-			// as it shouldn't be possible to find a peer for h+1.
-			return
-		}
-		delete(pool.plannedRequests, h)
-	}
-}
-
-// Makes a batch of requests sorted by height such that the block pool has up to maxNumRequests entries.
-func (pool *BlockPool) makeRequestBatch(maxNumRequests int) []int {
-	pool.removeBadPeers()
-	// At this point pool.requests may include heights for requests to be redone due to removal of peers:
-	// - peers timed out or were removed by switch
-	// - FSM timed out on waiting to advance the block execution due to missing blocks at h or h+1
-	// Determine the number of requests needed by subtracting the number of requests already made from the maximum
-	// allowed
-	numNeeded := maxNumRequests - len(pool.blocks)
-	for len(pool.plannedRequests) < numNeeded {
-		if pool.nextRequestHeight > pool.MaxPeerHeight {
-			break
-		}
-		pool.plannedRequests[pool.nextRequestHeight] = struct{}{}
-		pool.nextRequestHeight++
-	}
-
-	heights := make([]int, 0, len(pool.plannedRequests))
-	for k := range pool.plannedRequests {
-		heights = append(heights, int(k))
-	}
-	sort.Ints(heights)
-	return heights
-}
-
-func (pool *BlockPool) sendRequest(height int64) bool {
-	for _, peer := range pool.peers {
-		if peer.NumPendingBlockRequests >= maxRequestsPerPeer {
-			continue
-		}
-		if peer.Base > height || peer.Height < height {
-			continue
-		}
-
-		err := pool.toBcR.sendBlockRequest(peer.ID, height)
-		if err == errNilPeerForBlockRequest {
-			// Switch does not have this peer, remove it and continue to look for another peer.
-			pool.logger.Error("switch does not have peer..removing peer selected for height", "peer",
-				peer.ID, "height", height)
-			pool.RemovePeer(peer.ID, err)
-			continue
-		}
-
-		if err == errSendQueueFull {
-			pool.logger.Error("peer queue is full", "peer", peer.ID, "height", height)
-			continue
-		}
-
-		pool.logger.Info("assigned request to peer", "peer", peer.ID, "height", height)
-
-		pool.blocks[height] = peer.ID
-		peer.RequestSent(height)
-
-		return true
-	}
-	pool.logger.Error("could not find peer to send request for block at height", "height", height)
-	return false
-}
-
-// AddBlock validates that the block comes from the peer it was expected from and stores it in the 'blocks' map.
-func (pool *BlockPool) AddBlock(peerID p2p.ID, block *types.Block, blockSize int) error {
-	peer, ok := pool.peers[peerID]
-	if !ok {
-		pool.logger.Error("block from unknown peer", "height", block.Height, "peer", peerID)
-		return errBadDataFromPeer
-	}
-	if wantPeerID, ok := pool.blocks[block.Height]; ok && wantPeerID != peerID {
-		pool.logger.Error("block received from wrong peer", "height", block.Height,
-			"peer", peerID, "expected_peer", wantPeerID)
-		return errBadDataFromPeer
-	}
-
-	return peer.AddBlock(block, blockSize)
-}
-
-// BlockData stores the peer responsible to deliver a block and the actual block if delivered.
-type BlockData struct {
-	block *types.Block
-	peer  *BpPeer
-}
-
-// BlockAndPeerAtHeight retrieves the block and delivery peer at specified height.
-// Returns errMissingBlock if a block was not found
-func (pool *BlockPool) BlockAndPeerAtHeight(height int64) (bData *BlockData, err error) {
-	peerID := pool.blocks[height]
-	peer := pool.peers[peerID]
-	if peer == nil {
-		return nil, errMissingBlock
-	}
-
-	block, err := peer.BlockAtHeight(height)
-	if err != nil {
-		return nil, err
-	}
-
-	return &BlockData{peer: peer, block: block}, nil
-
-}
-
-// FirstTwoBlocksAndPeers returns the blocks and the delivery peers at pool's height H and H+1.
-func (pool *BlockPool) FirstTwoBlocksAndPeers() (first, second *BlockData, err error) {
-	first, err = pool.BlockAndPeerAtHeight(pool.Height)
-	second, err2 := pool.BlockAndPeerAtHeight(pool.Height + 1)
-	if err == nil {
-		err = err2
-	}
-	return
-}
-
-// InvalidateFirstTwoBlocks removes the peers that sent us the first two blocks, blocks are removed by RemovePeer().
-func (pool *BlockPool) InvalidateFirstTwoBlocks(err error) {
-	first, err1 := pool.BlockAndPeerAtHeight(pool.Height)
-	second, err2 := pool.BlockAndPeerAtHeight(pool.Height + 1)
-
-	if err1 == nil {
-		pool.RemovePeer(first.peer.ID, err)
-	}
-	if err2 == nil {
-		pool.RemovePeer(second.peer.ID, err)
-	}
-}
-
-// ProcessedCurrentHeightBlock performs cleanup after a block is processed. It removes block at pool height and
-// the peers that are now short.
-func (pool *BlockPool) ProcessedCurrentHeightBlock() {
-	peerID, peerOk := pool.blocks[pool.Height]
-	if peerOk {
-		pool.peers[peerID].RemoveBlock(pool.Height)
-	}
-	delete(pool.blocks, pool.Height)
-	pool.logger.Debug("removed block at height", "height", pool.Height)
-	pool.Height++
-	pool.removeShortPeers()
-}
-
-// RemovePeerAtCurrentHeights checks if a block at pool's height H exists and if not, it removes the
-// delivery peer and returns. If a block at height H exists then the check and peer removal is done for H+1.
-// This function is called when the FSM is not able to make progress for some time.
-// This happens if either the block H or H+1 have not been delivered.
-func (pool *BlockPool) RemovePeerAtCurrentHeights(err error) {
-	peerID := pool.blocks[pool.Height]
-	peer, ok := pool.peers[peerID]
-	if ok {
-		if _, err := peer.BlockAtHeight(pool.Height); err != nil {
-			pool.logger.Info("remove peer that hasn't sent block at pool.Height",
-				"peer", peerID, "height", pool.Height)
-			pool.RemovePeer(peerID, err)
-			return
-		}
-	}
-	peerID = pool.blocks[pool.Height+1]
-	peer, ok = pool.peers[peerID]
-	if ok {
-		if _, err := peer.BlockAtHeight(pool.Height + 1); err != nil {
-			pool.logger.Info("remove peer that hasn't sent block at pool.Height+1",
-				"peer", peerID, "height", pool.Height+1)
-			pool.RemovePeer(peerID, err)
-			return
-		}
-	}
-}
-
-// Cleanup performs pool and peer cleanup
-func (pool *BlockPool) Cleanup() {
-	for id, peer := range pool.peers {
-		peer.Cleanup()
-		delete(pool.peers, id)
-	}
-	pool.plannedRequests = make(map[int64]struct{})
-	pool.blocks = make(map[int64]p2p.ID)
-	pool.nextRequestHeight = 0
-	pool.Height = 0
-	pool.MaxPeerHeight = 0
-}
-
-// NumPeers returns the number of peers in the pool
-func (pool *BlockPool) NumPeers() int {
-	return len(pool.peers)
-}
-
-// NeedsBlocks returns true if more blocks are required.
-func (pool *BlockPool) NeedsBlocks() bool {
-	return len(pool.blocks) < maxNumRequests
-}

blockchain/v1/pool_test.go

@@ -1,691 +0,0 @@
-package v1
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
-)
-
-type testPeer struct {
-	id     p2p.ID
-	base   int64
-	height int64
-}
-
-type testBcR struct {
-	logger log.Logger
-}
-
-type testValues struct {
-	numRequestsSent int
-}
-
-var testResults testValues
-
-func resetPoolTestResults() {
-	testResults.numRequestsSent = 0
-}
-
-func (testR *testBcR) sendPeerError(err error, peerID p2p.ID) {
-}
-
-func (testR *testBcR) sendStatusRequest() {
-}
-
-func (testR *testBcR) sendBlockRequest(peerID p2p.ID, height int64) error {
-	testResults.numRequestsSent++
-	return nil
-}
-
-func (testR *testBcR) resetStateTimer(name string, timer **time.Timer, timeout time.Duration) {
-}
-
-func (testR *testBcR) switchToConsensus() {
-
-}
-
-func newTestBcR() *testBcR {
-	testBcR := &testBcR{logger: log.TestingLogger()}
-	return testBcR
-}
-
-type tPBlocks struct {
-	id     p2p.ID
-	create bool
-}
-
-// Makes a block pool with specified current height, list of peers, block requests and block responses
-func makeBlockPool(bcr *testBcR, height int64, peers []BpPeer, blocks map[int64]tPBlocks) *BlockPool {
-	bPool := NewBlockPool(height, bcr)
-	bPool.SetLogger(bcr.logger)
-
-	txs := []types.Tx{types.Tx("foo"), types.Tx("bar")}
-
-	var maxH int64
-	for _, p := range peers {
-		if p.Height > maxH {
-			maxH = p.Height
-		}
-		bPool.peers[p.ID] = NewBpPeer(p.ID, p.Base, p.Height, bcr.sendPeerError, nil)
-		bPool.peers[p.ID].SetLogger(bcr.logger)
-
-	}
-	bPool.MaxPeerHeight = maxH
-	for h, p := range blocks {
-		bPool.blocks[h] = p.id
-		bPool.peers[p.id].RequestSent(h)
-		if p.create {
-			// simulate that a block at height h has been received
-			_ = bPool.peers[p.id].AddBlock(types.MakeBlock(h, txs, nil, nil), 100)
-		}
-	}
-	return bPool
-}
-
-func assertPeerSetsEquivalent(t *testing.T, set1 map[p2p.ID]*BpPeer, set2 map[p2p.ID]*BpPeer) {
-	assert.Equal(t, len(set1), len(set2))
-	for peerID, peer1 := range set1 {
-		peer2 := set2[peerID]
-		assert.NotNil(t, peer2)
-		assert.Equal(t, peer1.NumPendingBlockRequests, peer2.NumPendingBlockRequests)
-		assert.Equal(t, peer1.Height, peer2.Height)
-		assert.Equal(t, peer1.Base, peer2.Base)
-		assert.Equal(t, len(peer1.blocks), len(peer2.blocks))
-		for h, block1 := range peer1.blocks {
-			block2 := peer2.blocks[h]
-			// block1 and block2 could be nil if a request was made but no block was received
-			assert.Equal(t, block1, block2)
-		}
-	}
-}
-
-func assertBlockPoolEquivalent(t *testing.T, poolWanted, pool *BlockPool) {
-	assert.Equal(t, poolWanted.blocks, pool.blocks)
-	assertPeerSetsEquivalent(t, poolWanted.peers, pool.peers)
-	assert.Equal(t, poolWanted.MaxPeerHeight, pool.MaxPeerHeight)
-	assert.Equal(t, poolWanted.Height, pool.Height)
-
-}
-
-func TestBlockPoolUpdatePeer(t *testing.T) {
-	testBcR := newTestBcR()
-
-	tests := []struct {
-		name       string
-		pool       *BlockPool
-		args       testPeer
-		poolWanted *BlockPool
-		errWanted  error
-	}{
-		{
-			name:       "add a first short peer",
-			pool:       makeBlockPool(testBcR, 100, []BpPeer{}, map[int64]tPBlocks{}),
-			args:       testPeer{"P1", 0, 50},
-			errWanted:  errPeerTooShort,
-			poolWanted: makeBlockPool(testBcR, 100, []BpPeer{}, map[int64]tPBlocks{}),
-		},
-		{
-			name:       "add a first good peer",
-			pool:       makeBlockPool(testBcR, 100, []BpPeer{}, map[int64]tPBlocks{}),
-			args:       testPeer{"P1", 0, 101},
-			poolWanted: makeBlockPool(testBcR, 100, []BpPeer{{ID: "P1", Height: 101}}, map[int64]tPBlocks{}),
-		},
-		{
-			name:       "add a first good peer with base",
-			pool:       makeBlockPool(testBcR, 100, []BpPeer{}, map[int64]tPBlocks{}),
-			args:       testPeer{"P1", 10, 101},
-			poolWanted: makeBlockPool(testBcR, 100, []BpPeer{{ID: "P1", Base: 10, Height: 101}}, map[int64]tPBlocks{}),
-		},
-		{
-			name:       "increase the height of P1 from 120 to 123",
-			pool:       makeBlockPool(testBcR, 100, []BpPeer{{ID: "P1", Height: 120}}, map[int64]tPBlocks{}),
-			args:       testPeer{"P1", 0, 123},
-			poolWanted: makeBlockPool(testBcR, 100, []BpPeer{{ID: "P1", Height: 123}}, map[int64]tPBlocks{}),
-		},
-		{
-			name:       "decrease the height of P1 from 120 to 110",
-			pool:       makeBlockPool(testBcR, 100, []BpPeer{{ID: "P1", Height: 120}}, map[int64]tPBlocks{}),
-			args:       testPeer{"P1", 0, 110},
-			errWanted:  errPeerLowersItsHeight,
-			poolWanted: makeBlockPool(testBcR, 100, []BpPeer{}, map[int64]tPBlocks{}),
-		},
-		{
-			name: "decrease the height of P1 from 105 to 102 with blocks",
-			pool: makeBlockPool(testBcR, 100, []BpPeer{{ID: "P1", Height: 105}},
-				map[int64]tPBlocks{
-					100: {"P1", true}, 101: {"P1", true}, 102: {"P1", true}}),
-			args:      testPeer{"P1", 0, 102},
-			errWanted: errPeerLowersItsHeight,
-			poolWanted: makeBlockPool(testBcR, 100, []BpPeer{},
-				map[int64]tPBlocks{}),
-		},
-	}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			pool := tt.pool
-			err := pool.UpdatePeer(tt.args.id, tt.args.base, tt.args.height)
-			assert.Equal(t, tt.errWanted, err)
-			assert.Equal(t, tt.poolWanted.blocks, tt.pool.blocks)
-			assertPeerSetsEquivalent(t, tt.poolWanted.peers, tt.pool.peers)
-			assert.Equal(t, tt.poolWanted.MaxPeerHeight, tt.pool.MaxPeerHeight)
-		})
-	}
-}
-
-func TestBlockPoolRemovePeer(t *testing.T) {
-	testBcR := newTestBcR()
-
-	type args struct {
-		peerID p2p.ID
-		err    error
-	}
-
-	tests := []struct {
-		name       string
-		pool       *BlockPool
-		args       args
-		poolWanted *BlockPool
-	}{
-		{
-			name:       "attempt to delete non-existing peer",
-			pool:       makeBlockPool(testBcR, 100, []BpPeer{{ID: "P1", Height: 120}}, map[int64]tPBlocks{}),
-			args:       args{"P99", nil},
-			poolWanted: makeBlockPool(testBcR, 100, []BpPeer{{ID: "P1", Height: 120}}, map[int64]tPBlocks{}),
-		},
-		{
-			name:       "delete the only peer without blocks",
-			pool:       makeBlockPool(testBcR, 100, []BpPeer{{ID: "P1", Height: 120}}, map[int64]tPBlocks{}),
-			args:       args{"P1", nil},
-			poolWanted: makeBlockPool(testBcR, 100, []BpPeer{}, map[int64]tPBlocks{}),
-		},
-		{
-			name: "delete the shortest of two peers without blocks",
-			pool: makeBlockPool(
-				testBcR,
-				100,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 120}},
-				map[int64]tPBlocks{}),
-			args:       args{"P1", nil},
-			poolWanted: makeBlockPool(testBcR, 100, []BpPeer{{ID: "P2", Height: 120}}, map[int64]tPBlocks{}),
-		},
-		{
-			name: "delete the tallest of two peers without blocks",
-			pool: makeBlockPool(
-				testBcR,
-				100,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 120}},
-				map[int64]tPBlocks{}),
-			args:       args{"P2", nil},
-			poolWanted: makeBlockPool(testBcR, 100, []BpPeer{{ID: "P1", Height: 100}}, map[int64]tPBlocks{}),
-		},
-		{
-			name: "delete the only peer with block requests sent and blocks received",
-			pool: makeBlockPool(testBcR, 100, []BpPeer{{ID: "P1", Height: 120}},
-				map[int64]tPBlocks{100: {"P1", true}, 101: {"P1", false}}),
-			args:       args{"P1", nil},
-			poolWanted: makeBlockPool(testBcR, 100, []BpPeer{}, map[int64]tPBlocks{}),
-		},
-		{
-			name: "delete the shortest of two peers with block requests sent and blocks received",
-			pool: makeBlockPool(testBcR, 100, []BpPeer{{ID: "P1", Height: 120}, {ID: "P2", Height: 200}},
-				map[int64]tPBlocks{100: {"P1", true}, 101: {"P1", false}}),
-			args:       args{"P1", nil},
-			poolWanted: makeBlockPool(testBcR, 100, []BpPeer{{ID: "P2", Height: 200}}, map[int64]tPBlocks{}),
-		},
-		{
-			name: "delete the tallest of two peers with block requests sent and blocks received",
-			pool: makeBlockPool(testBcR, 100, []BpPeer{{ID: "P1", Height: 120}, {ID: "P2", Height: 110}},
-				map[int64]tPBlocks{100: {"P1", true}, 101: {"P1", false}}),
-			args:       args{"P1", nil},
-			poolWanted: makeBlockPool(testBcR, 100, []BpPeer{{ID: "P2", Height: 110}}, map[int64]tPBlocks{}),
-		},
-	}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			tt.pool.RemovePeer(tt.args.peerID, tt.args.err)
-			assertBlockPoolEquivalent(t, tt.poolWanted, tt.pool)
-		})
-	}
-}
-
-func TestBlockPoolRemoveShortPeers(t *testing.T) {
-	testBcR := newTestBcR()
-
-	tests := []struct {
-		name       string
-		pool       *BlockPool
-		poolWanted *BlockPool
-	}{
-		{
-			name: "no short peers",
-			pool: makeBlockPool(testBcR, 100,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 110}, {ID: "P3", Height: 120}}, map[int64]tPBlocks{}),
-			poolWanted: makeBlockPool(testBcR, 100,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 110}, {ID: "P3", Height: 120}}, map[int64]tPBlocks{}),
-		},
-
-		{
-			name: "one short peer",
-			pool: makeBlockPool(testBcR, 100,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 90}, {ID: "P3", Height: 120}}, map[int64]tPBlocks{}),
-			poolWanted: makeBlockPool(testBcR, 100,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P3", Height: 120}}, map[int64]tPBlocks{}),
-		},
-
-		{
-			name: "all short peers",
-			pool: makeBlockPool(testBcR, 100,
-				[]BpPeer{{ID: "P1", Height: 90}, {ID: "P2", Height: 91}, {ID: "P3", Height: 92}}, map[int64]tPBlocks{}),
-			poolWanted: makeBlockPool(testBcR, 100, []BpPeer{}, map[int64]tPBlocks{}),
-		},
-	}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			pool := tt.pool
-			pool.removeShortPeers()
-			assertBlockPoolEquivalent(t, tt.poolWanted, tt.pool)
-		})
-	}
-}
-
-func TestBlockPoolSendRequestBatch(t *testing.T) {
-	type testPeerResult struct {
-		id                      p2p.ID
-		numPendingBlockRequests int
-	}
-
-	testBcR := newTestBcR()
-
-	tests := []struct {
-		name               string
-		pool               *BlockPool
-		maxRequestsPerPeer int
-		expRequests        map[int64]bool
-		expRequestsSent    int
-		expPeerResults     []testPeerResult
-	}{
-		{
-			name:               "one peer - send up to maxRequestsPerPeer block requests",
-			pool:               makeBlockPool(testBcR, 10, []BpPeer{{ID: "P1", Height: 100}}, map[int64]tPBlocks{}),
-			maxRequestsPerPeer: 2,
-			expRequests:        map[int64]bool{10: true, 11: true},
-			expRequestsSent:    2,
-			expPeerResults:     []testPeerResult{{id: "P1", numPendingBlockRequests: 2}},
-		},
-		{
-			name: "multiple peers - stops at gap between height and base",
-			pool: makeBlockPool(testBcR, 10, []BpPeer{
-				{ID: "P1", Base: 1, Height: 12},
-				{ID: "P2", Base: 15, Height: 100},
-			}, map[int64]tPBlocks{}),
-			maxRequestsPerPeer: 10,
-			expRequests:        map[int64]bool{10: true, 11: true, 12: true},
-			expRequestsSent:    3,
-			expPeerResults: []testPeerResult{
-				{id: "P1", numPendingBlockRequests: 3},
-				{id: "P2", numPendingBlockRequests: 0},
-			},
-		},
-		{
-			name: "n peers - send n*maxRequestsPerPeer block requests",
-			pool: makeBlockPool(
-				testBcR,
-				10,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 100}},
-				map[int64]tPBlocks{}),
-			maxRequestsPerPeer: 2,
-			expRequests:        map[int64]bool{10: true, 11: true},
-			expRequestsSent:    4,
-			expPeerResults: []testPeerResult{
-				{id: "P1", numPendingBlockRequests: 2},
-				{id: "P2", numPendingBlockRequests: 2}},
-		},
-	}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			resetPoolTestResults()
-
-			var pool = tt.pool
-			maxRequestsPerPeer = tt.maxRequestsPerPeer
-			pool.MakeNextRequests(10)
-
-			assert.Equal(t, tt.expRequestsSent, testResults.numRequestsSent)
-			for _, tPeer := range tt.expPeerResults {
-				var peer = pool.peers[tPeer.id]
-				assert.NotNil(t, peer)
-				assert.Equal(t, tPeer.numPendingBlockRequests, peer.NumPendingBlockRequests)
-			}
-		})
-	}
-}
-
-func TestBlockPoolAddBlock(t *testing.T) {
-	testBcR := newTestBcR()
-	txs := []types.Tx{types.Tx("foo"), types.Tx("bar")}
-
-	type args struct {
-		peerID    p2p.ID
-		block     *types.Block
-		blockSize int
-	}
-	tests := []struct {
-		name       string
-		pool       *BlockPool
-		args       args
-		poolWanted *BlockPool
-		errWanted  error
-	}{
-		{name: "block from unknown peer",
-			pool: makeBlockPool(testBcR, 10, []BpPeer{{ID: "P1", Height: 100}}, map[int64]tPBlocks{}),
-			args: args{
-				peerID:    "P2",
-				block:     types.MakeBlock(int64(10), txs, nil, nil),
-				blockSize: 100,
-			},
-			poolWanted: makeBlockPool(testBcR, 10, []BpPeer{{ID: "P1", Height: 100}}, map[int64]tPBlocks{}),
-			errWanted:  errBadDataFromPeer,
-		},
-		{name: "unexpected block 11 from known peer - waiting for 10",
-			pool: makeBlockPool(testBcR, 10,
-				[]BpPeer{{ID: "P1", Height: 100}},
-				map[int64]tPBlocks{10: {"P1", false}}),
-			args: args{
-				peerID:    "P1",
-				block:     types.MakeBlock(int64(11), txs, nil, nil),
-				blockSize: 100,
-			},
-			poolWanted: makeBlockPool(testBcR, 10,
-				[]BpPeer{{ID: "P1", Height: 100}},
-				map[int64]tPBlocks{10: {"P1", false}}),
-			errWanted: errMissingBlock,
-		},
-		{name: "unexpected block 10 from known peer - already have 10",
-			pool: makeBlockPool(testBcR, 10,
-				[]BpPeer{{ID: "P1", Height: 100}},
-				map[int64]tPBlocks{10: {"P1", true}, 11: {"P1", false}}),
-			args: args{
-				peerID:    "P1",
-				block:     types.MakeBlock(int64(10), txs, nil, nil),
-				blockSize: 100,
-			},
-			poolWanted: makeBlockPool(testBcR, 10,
-				[]BpPeer{{ID: "P1", Height: 100}},
-				map[int64]tPBlocks{10: {"P1", true}, 11: {"P1", false}}),
-			errWanted: errDuplicateBlock,
-		},
-		{name: "unexpected block 10 from known peer P2 - expected 10 to come from P1",
-			pool: makeBlockPool(testBcR, 10,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 100}},
-				map[int64]tPBlocks{10: {"P1", false}}),
-			args: args{
-				peerID:    "P2",
-				block:     types.MakeBlock(int64(10), txs, nil, nil),
-				blockSize: 100,
-			},
-			poolWanted: makeBlockPool(testBcR, 10,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 100}},
-				map[int64]tPBlocks{10: {"P1", false}}),
-			errWanted: errBadDataFromPeer,
-		},
-		{name: "expected block from known peer",
-			pool: makeBlockPool(testBcR, 10,
-				[]BpPeer{{ID: "P1", Height: 100}},
-				map[int64]tPBlocks{10: {"P1", false}}),
-			args: args{
-				peerID:    "P1",
-				block:     types.MakeBlock(int64(10), txs, nil, nil),
-				blockSize: 100,
-			},
-			poolWanted: makeBlockPool(testBcR, 10,
-				[]BpPeer{{ID: "P1", Height: 100}},
-				map[int64]tPBlocks{10: {"P1", true}}),
-			errWanted: nil,
-		},
-	}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			err := tt.pool.AddBlock(tt.args.peerID, tt.args.block, tt.args.blockSize)
-			assert.Equal(t, tt.errWanted, err)
-			assertBlockPoolEquivalent(t, tt.poolWanted, tt.pool)
-		})
-	}
-}
-
-func TestBlockPoolFirstTwoBlocksAndPeers(t *testing.T) {
-	testBcR := newTestBcR()
-
-	tests := []struct {
-		name         string
-		pool         *BlockPool
-		firstWanted  int64
-		secondWanted int64
-		errWanted    error
-	}{
-		{
-			name: "both blocks missing",
-			pool: makeBlockPool(testBcR, 10,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 100}},
-				map[int64]tPBlocks{15: {"P1", true}, 16: {"P2", true}}),
-			errWanted: errMissingBlock,
-		},
-		{
-			name: "second block missing",
-			pool: makeBlockPool(testBcR, 15,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 100}},
-				map[int64]tPBlocks{15: {"P1", true}, 18: {"P2", true}}),
-			firstWanted: 15,
-			errWanted:   errMissingBlock,
-		},
-		{
-			name: "first block missing",
-			pool: makeBlockPool(testBcR, 15,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 100}},
-				map[int64]tPBlocks{16: {"P2", true}, 18: {"P2", true}}),
-			secondWanted: 16,
-			errWanted:    errMissingBlock,
-		},
-		{
-			name: "both blocks present",
-			pool: makeBlockPool(testBcR, 10,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 100}},
-				map[int64]tPBlocks{10: {"P1", true}, 11: {"P2", true}}),
-			firstWanted:  10,
-			secondWanted: 11,
-		},
-	}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			pool := tt.pool
-			gotFirst, gotSecond, err := pool.FirstTwoBlocksAndPeers()
-			assert.Equal(t, tt.errWanted, err)
-
-			if tt.firstWanted != 0 {
-				peer := pool.blocks[tt.firstWanted]
-				block := pool.peers[peer].blocks[tt.firstWanted]
-				assert.Equal(t, block, gotFirst.block,
-					"BlockPool.FirstTwoBlocksAndPeers() gotFirst = %v, want %v",
-					tt.firstWanted, gotFirst.block.Height)
-			}
-
-			if tt.secondWanted != 0 {
-				peer := pool.blocks[tt.secondWanted]
-				block := pool.peers[peer].blocks[tt.secondWanted]
-				assert.Equal(t, block, gotSecond.block,
-					"BlockPool.FirstTwoBlocksAndPeers() gotFirst = %v, want %v",
-					tt.secondWanted, gotSecond.block.Height)
-			}
-		})
-	}
-}
-
-func TestBlockPoolInvalidateFirstTwoBlocks(t *testing.T) {
-	testBcR := newTestBcR()
-
-	tests := []struct {
-		name       string
-		pool       *BlockPool
-		poolWanted *BlockPool
-	}{
-		{
-			name: "both blocks missing",
-			pool: makeBlockPool(testBcR, 10,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 100}},
-				map[int64]tPBlocks{15: {"P1", true}, 16: {"P2", true}}),
-			poolWanted: makeBlockPool(testBcR, 10,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 100}},
-				map[int64]tPBlocks{15: {"P1", true}, 16: {"P2", true}}),
-		},
-		{
-			name: "second block missing",
-			pool: makeBlockPool(testBcR, 15,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 100}},
-				map[int64]tPBlocks{15: {"P1", true}, 18: {"P2", true}}),
-			poolWanted: makeBlockPool(testBcR, 15,
-				[]BpPeer{{ID: "P2", Height: 100}},
-				map[int64]tPBlocks{18: {"P2", true}}),
-		},
-		{
-			name: "first block missing",
-			pool: makeBlockPool(testBcR, 15,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 100}},
-				map[int64]tPBlocks{18: {"P1", true}, 16: {"P2", true}}),
-			poolWanted: makeBlockPool(testBcR, 15,
-				[]BpPeer{{ID: "P1", Height: 100}},
-				map[int64]tPBlocks{18: {"P1", true}}),
-		},
-		{
-			name: "both blocks present",
-			pool: makeBlockPool(testBcR, 10,
-				[]BpPeer{{ID: "P1", Height: 100}, {ID: "P2", Height: 100}},
-				map[int64]tPBlocks{10: {"P1", true}, 11: {"P2", true}}),
-			poolWanted: makeBlockPool(testBcR, 10,
-				[]BpPeer{},
-				map[int64]tPBlocks{}),
-		},
-	}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			tt.pool.InvalidateFirstTwoBlocks(errNoPeerResponse)
-			assertBlockPoolEquivalent(t, tt.poolWanted, tt.pool)
-		})
-	}
-}
-
-func TestProcessedCurrentHeightBlock(t *testing.T) {
-	testBcR := newTestBcR()
-
-	tests := []struct {
-		name       string
-		pool       *BlockPool
-		poolWanted *BlockPool
-	}{
-		{
-			name: "one peer",
-			pool: makeBlockPool(testBcR, 100, []BpPeer{{ID: "P1", Height: 120}},
-				map[int64]tPBlocks{100: {"P1", true}, 101: {"P1", true}}),
-			poolWanted: makeBlockPool(testBcR, 101, []BpPeer{{ID: "P1", Height: 120}},
-				map[int64]tPBlocks{101: {"P1", true}}),
-		},
-		{
-			name: "multiple peers",
-			pool: makeBlockPool(testBcR, 100,
-				[]BpPeer{{ID: "P1", Height: 120}, {ID: "P2", Height: 120}, {ID: "P3", Height: 130}},
-				map[int64]tPBlocks{
-					100: {"P1", true}, 104: {"P1", true}, 105: {"P1", false},
-					101: {"P2", true}, 103: {"P2", false},
-					102: {"P3", true}, 106: {"P3", true}}),
-			poolWanted: makeBlockPool(testBcR, 101,
-				[]BpPeer{{ID: "P1", Height: 120}, {ID: "P2", Height: 120}, {ID: "P3", Height: 130}},
-				map[int64]tPBlocks{
-					104: {"P1", true}, 105: {"P1", false},
-					101: {"P2", true}, 103: {"P2", false},
-					102: {"P3", true}, 106: {"P3", true}}),
-		},
-	}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			tt.pool.ProcessedCurrentHeightBlock()
-			assertBlockPoolEquivalent(t, tt.poolWanted, tt.pool)
-		})
-	}
-}
-
-func TestRemovePeerAtCurrentHeight(t *testing.T) {
-	testBcR := newTestBcR()
-
-	tests := []struct {
-		name       string
-		pool       *BlockPool
-		poolWanted *BlockPool
-	}{
-		{
-			name: "one peer, remove peer for block at H",
-			pool: makeBlockPool(testBcR, 100, []BpPeer{{ID: "P1", Height: 120}},
-				map[int64]tPBlocks{100: {"P1", false}, 101: {"P1", true}}),
-			poolWanted: makeBlockPool(testBcR, 100, []BpPeer{}, map[int64]tPBlocks{}),
-		},
-		{
-			name: "one peer, remove peer for block at H+1",
-			pool: makeBlockPool(testBcR, 100, []BpPeer{{ID: "P1", Height: 120}},
-				map[int64]tPBlocks{100: {"P1", true}, 101: {"P1", false}}),
-			poolWanted: makeBlockPool(testBcR, 100, []BpPeer{}, map[int64]tPBlocks{}),
-		},
-		{
-			name: "multiple peers, remove peer for block at H",
-			pool: makeBlockPool(testBcR, 100,
-				[]BpPeer{{ID: "P1", Height: 120}, {ID: "P2", Height: 120}, {ID: "P3", Height: 130}},
-				map[int64]tPBlocks{
-					100: {"P1", false}, 104: {"P1", true}, 105: {"P1", false},
-					101: {"P2", true}, 103: {"P2", false},
-					102: {"P3", true}, 106: {"P3", true}}),
-			poolWanted: makeBlockPool(testBcR, 100,
-				[]BpPeer{{ID: "P2", Height: 120}, {ID: "P3", Height: 130}},
-				map[int64]tPBlocks{
-					101: {"P2", true}, 103: {"P2", false},
-					102: {"P3", true}, 106: {"P3", true}}),
-		},
-		{
-			name: "multiple peers, remove peer for block at H+1",
-			pool: makeBlockPool(testBcR, 100,
-				[]BpPeer{{ID: "P1", Height: 120}, {ID: "P2", Height: 120}, {ID: "P3", Height: 130}},
-				map[int64]tPBlocks{
-					100: {"P1", true}, 104: {"P1", true}, 105: {"P1", false},
-					101: {"P2", false}, 103: {"P2", false},
-					102: {"P3", true}, 106: {"P3", true}}),
-			poolWanted: makeBlockPool(testBcR, 100,
-				[]BpPeer{{ID: "P1", Height: 120}, {ID: "P3", Height: 130}},
-				map[int64]tPBlocks{
-					100: {"P1", true}, 104: {"P1", true}, 105: {"P1", false},
-					102: {"P3", true}, 106: {"P3", true}}),
-		},
-	}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			tt.pool.RemovePeerAtCurrentHeights(errNoPeerResponse)
-			assertBlockPoolEquivalent(t, tt.poolWanted, tt.pool)
-		})
-	}
-}

blockchain/v1/reactor.go

@@ -1,569 +0,0 @@
-package v1
-
-import (
-	"fmt"
-	"reflect"
-	"time"
-
-	"github.com/tendermint/tendermint/behaviour"
-	bc "github.com/tendermint/tendermint/blockchain"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/p2p"
-	bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain"
-	sm "github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/store"
-	"github.com/tendermint/tendermint/types"
-)
-
-const (
-	// BlockchainChannel is a channel for blocks and status updates (`BlockStore` height)
-	BlockchainChannel = byte(0x40)
-	trySyncIntervalMS = 10
-	trySendIntervalMS = 10
-
-	// ask for best height every 10s
-	statusUpdateIntervalSeconds = 10
-)
-
-var (
-	// Maximum number of requests that can be pending per peer, i.e. for which requests have been sent but blocks
-	// have not been received.
-	maxRequestsPerPeer = 20
-	// Maximum number of block requests for the reactor, pending or for which blocks have been received.
-	maxNumRequests = 64
-)
-
-type consensusReactor interface {
-	// for when we switch from blockchain reactor and fast sync to
-	// the consensus machine
-	SwitchToConsensus(state sm.State, skipWAL bool)
-}
-
-// BlockchainReactor handles long-term catchup syncing.
-type BlockchainReactor struct {
-	p2p.BaseReactor
-
-	initialState sm.State // immutable
-	state        sm.State
-
-	blockExec *sm.BlockExecutor
-	store     *store.BlockStore
-
-	fastSync    bool
-	stateSynced bool
-
-	fsm          *BcReactorFSM
-	blocksSynced uint64
-
-	// Receive goroutine forwards messages to this channel to be processed in the context of the poolRoutine.
-	messagesForFSMCh chan bcReactorMessage
-
-	// Switch goroutine may send RemovePeer to the blockchain reactor. This is an error message that is relayed
-	// to this channel to be processed in the context of the poolRoutine.
-	errorsForFSMCh chan bcReactorMessage
-
-	// This channel is used by the FSM and indirectly the block pool to report errors to the blockchain reactor and
-	// the switch.
-	eventsFromFSMCh chan bcFsmMessage
-
-	swReporter *behaviour.SwitchReporter
-}
-
-// NewBlockchainReactor returns new reactor instance.
-func NewBlockchainReactor(state sm.State, blockExec *sm.BlockExecutor, store *store.BlockStore,
-	fastSync bool) *BlockchainReactor {
-
-	if state.LastBlockHeight != store.Height() {
-		panic(fmt.Sprintf("state (%v) and store (%v) height mismatch", state.LastBlockHeight,
-			store.Height()))
-	}
-
-	const capacity = 1000
-	eventsFromFSMCh := make(chan bcFsmMessage, capacity)
-	messagesForFSMCh := make(chan bcReactorMessage, capacity)
-	errorsForFSMCh := make(chan bcReactorMessage, capacity)
-
-	startHeight := store.Height() + 1
-	if startHeight == 1 {
-		startHeight = state.InitialHeight
-	}
-	bcR := &BlockchainReactor{
-		initialState:     state,
-		state:            state,
-		blockExec:        blockExec,
-		fastSync:         fastSync,
-		store:            store,
-		messagesForFSMCh: messagesForFSMCh,
-		eventsFromFSMCh:  eventsFromFSMCh,
-		errorsForFSMCh:   errorsForFSMCh,
-	}
-	fsm := NewFSM(startHeight, bcR)
-	bcR.fsm = fsm
-	bcR.BaseReactor = *p2p.NewBaseReactor("BlockchainReactor", bcR)
-	// bcR.swReporter = behaviour.NewSwitchReporter(bcR.BaseReactor.Switch)
-
-	return bcR
-}
-
-// bcReactorMessage is used by the reactor to send messages to the FSM.
-type bcReactorMessage struct {
-	event bReactorEvent
-	data  bReactorEventData
-}
-
-type bFsmEvent uint
-
-const (
-	// message type events
-	peerErrorEv = iota + 1
-	syncFinishedEv
-)
-
-type bFsmEventData struct {
-	peerID p2p.ID
-	err    error
-}
-
-// bcFsmMessage is used by the FSM to send messages to the reactor
-type bcFsmMessage struct {
-	event bFsmEvent
-	data  bFsmEventData
-}
-
-// SetLogger implements service.Service by setting the logger on reactor and pool.
-func (bcR *BlockchainReactor) SetLogger(l log.Logger) {
-	bcR.BaseService.Logger = l
-	bcR.fsm.SetLogger(l)
-}
-
-// OnStart implements service.Service.
-func (bcR *BlockchainReactor) OnStart() error {
-	bcR.swReporter = behaviour.NewSwitchReporter(bcR.BaseReactor.Switch)
-	if bcR.fastSync {
-		go bcR.poolRoutine()
-	}
-	return nil
-}
-
-// OnStop implements service.Service.
-func (bcR *BlockchainReactor) OnStop() {
-	_ = bcR.Stop()
-}
-
-// SwitchToFastSync is called by the state sync reactor when switching to fast sync.
-func (bcR *BlockchainReactor) SwitchToFastSync(state sm.State) error {
-	bcR.fastSync = true
-	bcR.initialState = state
-	bcR.state = state
-	bcR.stateSynced = true
-
-	bcR.fsm = NewFSM(state.LastBlockHeight+1, bcR)
-	bcR.fsm.SetLogger(bcR.Logger)
-	go bcR.poolRoutine()
-	return nil
-}
-
-// GetChannels implements Reactor
-func (bcR *BlockchainReactor) GetChannels() []*p2p.ChannelDescriptor {
-	return []*p2p.ChannelDescriptor{
-		{
-			ID:                  BlockchainChannel,
-			Priority:            10,
-			SendQueueCapacity:   2000,
-			RecvBufferCapacity:  50 * 4096,
-			RecvMessageCapacity: bc.MaxMsgSize,
-		},
-	}
-}
-
-// AddPeer implements Reactor by sending our state to peer.
-func (bcR *BlockchainReactor) AddPeer(peer p2p.Peer) {
-	msgBytes, err := bc.EncodeMsg(&bcproto.StatusResponse{
-		Base:   bcR.store.Base(),
-		Height: bcR.store.Height(),
-	})
-	if err != nil {
-		bcR.Logger.Error("could not convert msg to protobuf", "err", err)
-		return
-	}
-	peer.Send(BlockchainChannel, msgBytes)
-	// it's OK if send fails. will try later in poolRoutine
-
-	// peer is added to the pool once we receive the first
-	// bcStatusResponseMessage from the peer and call pool.updatePeer()
-}
-
-// sendBlockToPeer loads a block and sends it to the requesting peer.
-// If the block doesn't exist a bcNoBlockResponseMessage is sent.
-// If all nodes are honest, no node should be requesting for a block that doesn't exist.
-func (bcR *BlockchainReactor) sendBlockToPeer(msg *bcproto.BlockRequest,
-	src p2p.Peer) (queued bool) {
-
-	block := bcR.store.LoadBlock(msg.Height)
-	if block != nil {
-		pbbi, err := block.ToProto()
-		if err != nil {
-			bcR.Logger.Error("Could not send block message to peer", "err", err)
-			return false
-		}
-		msgBytes, err := bc.EncodeMsg(&bcproto.BlockResponse{Block: pbbi})
-		if err != nil {
-			bcR.Logger.Error("unable to marshal msg", "err", err)
-			return false
-		}
-		return src.TrySend(BlockchainChannel, msgBytes)
-	}
-
-	bcR.Logger.Info("peer asking for a block we don't have", "src", src, "height", msg.Height)
-
-	msgBytes, err := bc.EncodeMsg(&bcproto.NoBlockResponse{Height: msg.Height})
-	if err != nil {
-		bcR.Logger.Error("unable to marshal msg", "err", err)
-		return false
-	}
-	return src.TrySend(BlockchainChannel, msgBytes)
-}
-
-func (bcR *BlockchainReactor) sendStatusResponseToPeer(msg *bcproto.StatusRequest, src p2p.Peer) (queued bool) {
-	msgBytes, err := bc.EncodeMsg(&bcproto.StatusResponse{
-		Base:   bcR.store.Base(),
-		Height: bcR.store.Height(),
-	})
-	if err != nil {
-		bcR.Logger.Error("unable to marshal msg", "err", err)
-		return false
-	}
-
-	return src.TrySend(BlockchainChannel, msgBytes)
-}
-
-// RemovePeer implements Reactor by removing peer from the pool.
-func (bcR *BlockchainReactor) RemovePeer(peer p2p.Peer, reason interface{}) {
-	msgData := bcReactorMessage{
-		event: peerRemoveEv,
-		data: bReactorEventData{
-			peerID: peer.ID(),
-			err:    errSwitchRemovesPeer,
-		},
-	}
-	bcR.errorsForFSMCh <- msgData
-}
-
-// Receive implements Reactor by handling 4 types of messages (look below).
-func (bcR *BlockchainReactor) Receive(chID byte, src p2p.Peer, msgBytes []byte) {
-	msg, err := bc.DecodeMsg(msgBytes)
-	if err != nil {
-		bcR.Logger.Error("error decoding message", "src", src, "chId", chID, "err", err)
-		_ = bcR.swReporter.Report(behaviour.BadMessage(src.ID(), err.Error()))
-		return
-	}
-
-	if err = bc.ValidateMsg(msg); err != nil {
-		bcR.Logger.Error("peer sent us invalid msg", "peer", src, "msg", msg, "err", err)
-		_ = bcR.swReporter.Report(behaviour.BadMessage(src.ID(), err.Error()))
-		return
-	}
-
-	bcR.Logger.Debug("Receive", "src", src, "chID", chID, "msg", msg)
-
-	switch msg := msg.(type) {
-	case *bcproto.BlockRequest:
-		if queued := bcR.sendBlockToPeer(msg, src); !queued {
-			// Unfortunately not queued since the queue is full.
-			bcR.Logger.Error("Could not send block message to peer", "src", src, "height", msg.Height)
-		}
-
-	case *bcproto.StatusRequest:
-		// Send peer our state.
-		if queued := bcR.sendStatusResponseToPeer(msg, src); !queued {
-			// Unfortunately not queued since the queue is full.
-			bcR.Logger.Error("Could not send status message to peer", "src", src)
-		}
-
-	case *bcproto.BlockResponse:
-		bi, err := types.BlockFromProto(msg.Block)
-		if err != nil {
-			bcR.Logger.Error("error transition block from protobuf", "err", err)
-			return
-		}
-		msgForFSM := bcReactorMessage{
-			event: blockResponseEv,
-			data: bReactorEventData{
-				peerID: src.ID(),
-				height: bi.Height,
-				block:  bi,
-				length: len(msgBytes),
-			},
-		}
-		bcR.Logger.Info("Received", "src", src, "height", bi.Height)
-		bcR.messagesForFSMCh <- msgForFSM
-	case *bcproto.NoBlockResponse:
-		msgForFSM := bcReactorMessage{
-			event: noBlockResponseEv,
-			data: bReactorEventData{
-				peerID: src.ID(),
-				height: msg.Height,
-			},
-		}
-		bcR.Logger.Debug("Peer does not have requested block", "peer", src, "height", msg.Height)
-		bcR.messagesForFSMCh <- msgForFSM
-
-	case *bcproto.StatusResponse:
-		// Got a peer status. Unverified.
-		msgForFSM := bcReactorMessage{
-			event: statusResponseEv,
-			data: bReactorEventData{
-				peerID: src.ID(),
-				height: msg.Height,
-				length: len(msgBytes),
-			},
-		}
-		bcR.messagesForFSMCh <- msgForFSM
-
-	default:
-		bcR.Logger.Error(fmt.Sprintf("unknown message type %v", reflect.TypeOf(msg)))
-	}
-}
-
-// processBlocksRoutine processes blocks until signlaed to stop over the stopProcessing channel
-func (bcR *BlockchainReactor) processBlocksRoutine(stopProcessing chan struct{}) {
-
-	processReceivedBlockTicker := time.NewTicker(trySyncIntervalMS * time.Millisecond)
-	doProcessBlockCh := make(chan struct{}, 1)
-
-	lastHundred := time.Now()
-	lastRate := 0.0
-
-ForLoop:
-	for {
-		select {
-		case <-stopProcessing:
-			bcR.Logger.Info("finishing block execution")
-			break ForLoop
-		case <-processReceivedBlockTicker.C: // try to execute blocks
-			select {
-			case doProcessBlockCh <- struct{}{}:
-			default:
-			}
-		case <-doProcessBlockCh:
-			for {
-				err := bcR.processBlock()
-				if err == errMissingBlock {
-					break
-				}
-				// Notify FSM of block processing result.
-				msgForFSM := bcReactorMessage{
-					event: processedBlockEv,
-					data: bReactorEventData{
-						err: err,
-					},
-				}
-				_ = bcR.fsm.Handle(&msgForFSM)
-
-				if err != nil {
-					break
-				}
-
-				bcR.blocksSynced++
-				if bcR.blocksSynced%100 == 0 {
-					lastRate = 0.9*lastRate + 0.1*(100/time.Since(lastHundred).Seconds())
-					height, maxPeerHeight := bcR.fsm.Status()
-					bcR.Logger.Info("Fast Sync Rate", "height", height,
-						"max_peer_height", maxPeerHeight, "blocks/s", lastRate)
-					lastHundred = time.Now()
-				}
-			}
-		}
-	}
-}
-
-// poolRoutine receives and handles messages from the Receive() routine and from the FSM.
-func (bcR *BlockchainReactor) poolRoutine() {
-
-	bcR.fsm.Start()
-
-	sendBlockRequestTicker := time.NewTicker(trySendIntervalMS * time.Millisecond)
-	statusUpdateTicker := time.NewTicker(statusUpdateIntervalSeconds * time.Second)
-
-	stopProcessing := make(chan struct{}, 1)
-	go bcR.processBlocksRoutine(stopProcessing)
-
-ForLoop:
-	for {
-		select {
-
-		case <-sendBlockRequestTicker.C:
-			if !bcR.fsm.NeedsBlocks() {
-				continue
-			}
-			_ = bcR.fsm.Handle(&bcReactorMessage{
-				event: makeRequestsEv,
-				data: bReactorEventData{
-					maxNumRequests: maxNumRequests}})
-
-		case <-statusUpdateTicker.C:
-			// Ask for status updates.
-			go bcR.sendStatusRequest()
-
-		case msg := <-bcR.messagesForFSMCh:
-			// Sent from the Receive() routine when status (statusResponseEv) and
-			// block (blockResponseEv) response events are received
-			_ = bcR.fsm.Handle(&msg)
-
-		case msg := <-bcR.errorsForFSMCh:
-			// Sent from the switch.RemovePeer() routine (RemovePeerEv) and
-			// FSM state timer expiry routine (stateTimeoutEv).
-			_ = bcR.fsm.Handle(&msg)
-
-		case msg := <-bcR.eventsFromFSMCh:
-			switch msg.event {
-			case syncFinishedEv:
-				stopProcessing <- struct{}{}
-				// Sent from the FSM when it enters finished state.
-				break ForLoop
-			case peerErrorEv:
-				// Sent from the FSM when it detects peer error
-				bcR.reportPeerErrorToSwitch(msg.data.err, msg.data.peerID)
-				if msg.data.err == errNoPeerResponse {
-					// Sent from the peer timeout handler routine
-					_ = bcR.fsm.Handle(&bcReactorMessage{
-						event: peerRemoveEv,
-						data: bReactorEventData{
-							peerID: msg.data.peerID,
-							err:    msg.data.err,
-						},
-					})
-				}
-				// else {
-				// For slow peers, or errors due to blocks received from wrong peer
-				// the FSM had already removed the peers
-				// }
-			default:
-				bcR.Logger.Error("Event from FSM not supported", "type", msg.event)
-			}
-
-		case <-bcR.Quit():
-			break ForLoop
-		}
-	}
-}
-
-func (bcR *BlockchainReactor) reportPeerErrorToSwitch(err error, peerID p2p.ID) {
-	peer := bcR.Switch.Peers().Get(peerID)
-	if peer != nil {
-		_ = bcR.swReporter.Report(behaviour.BadMessage(peerID, err.Error()))
-	}
-}
-
-func (bcR *BlockchainReactor) processBlock() error {
-
-	first, second, err := bcR.fsm.FirstTwoBlocks()
-	if err != nil {
-		// We need both to sync the first block.
-		return err
-	}
-
-	chainID := bcR.initialState.ChainID
-
-	firstParts := first.MakePartSet(types.BlockPartSizeBytes)
-	firstPartSetHeader := firstParts.Header()
-	firstID := types.BlockID{Hash: first.Hash(), PartSetHeader: firstPartSetHeader}
-	// Finally, verify the first block using the second's commit
-	// NOTE: we can probably make this more efficient, but note that calling
-	// first.Hash() doesn't verify the tx contents, so MakePartSet() is
-	// currently necessary.
-	err = bcR.state.Validators.VerifyCommitLight(chainID, firstID, first.Height, second.LastCommit)
-	if err != nil {
-		bcR.Logger.Error("error during commit verification", "err", err,
-			"first", first.Height, "second", second.Height)
-		return errBlockVerificationFailure
-	}
-
-	bcR.store.SaveBlock(first, firstParts, second.LastCommit)
-
-	bcR.state, _, err = bcR.blockExec.ApplyBlock(bcR.state, firstID, first)
-	if err != nil {
-		panic(fmt.Sprintf("failed to process committed block (%d:%X): %v", first.Height, first.Hash(), err))
-	}
-
-	return nil
-}
-
-// Implements bcRNotifier
-// sendStatusRequest broadcasts `BlockStore` height.
-func (bcR *BlockchainReactor) sendStatusRequest() {
-	msgBytes, err := bc.EncodeMsg(&bcproto.StatusRequest{})
-	if err != nil {
-		panic(err)
-	}
-	bcR.Switch.Broadcast(BlockchainChannel, msgBytes)
-}
-
-// Implements bcRNotifier
-// BlockRequest sends `BlockRequest` height.
-func (bcR *BlockchainReactor) sendBlockRequest(peerID p2p.ID, height int64) error {
-	peer := bcR.Switch.Peers().Get(peerID)
-	if peer == nil {
-		return errNilPeerForBlockRequest
-	}
-
-	msgBytes, err := bc.EncodeMsg(&bcproto.BlockRequest{Height: height})
-	if err != nil {
-		return err
-	}
-	queued := peer.TrySend(BlockchainChannel, msgBytes)
-	if !queued {
-		return errSendQueueFull
-	}
-	return nil
-}
-
-// Implements bcRNotifier
-func (bcR *BlockchainReactor) switchToConsensus() {
-	conR, ok := bcR.Switch.Reactor("CONSENSUS").(consensusReactor)
-	if ok {
-		conR.SwitchToConsensus(bcR.state, bcR.blocksSynced > 0 || bcR.stateSynced)
-		bcR.eventsFromFSMCh <- bcFsmMessage{event: syncFinishedEv}
-	}
-	// else {
-	// Should only happen during testing.
-	// }
-}
-
-// Implements bcRNotifier
-// Called by FSM and pool:
-// - pool calls when it detects slow peer or when peer times out
-// - FSM calls when:
-//    - adding a block (addBlock) fails
-//    - reactor processing of a block reports failure and FSM sends back the peers of first and second blocks
-func (bcR *BlockchainReactor) sendPeerError(err error, peerID p2p.ID) {
-	bcR.Logger.Info("sendPeerError:", "peer", peerID, "error", err)
-	msgData := bcFsmMessage{
-		event: peerErrorEv,
-		data: bFsmEventData{
-			peerID: peerID,
-			err:    err,
-		},
-	}
-	bcR.eventsFromFSMCh <- msgData
-}
-
-// Implements bcRNotifier
-func (bcR *BlockchainReactor) resetStateTimer(name string, timer **time.Timer, timeout time.Duration) {
-	if timer == nil {
-		panic("nil timer pointer parameter")
-	}
-	if *timer == nil {
-		*timer = time.AfterFunc(timeout, func() {
-			msg := bcReactorMessage{
-				event: stateTimeoutEv,
-				data: bReactorEventData{
-					stateName: name,
-				},
-			}
-			bcR.errorsForFSMCh <- msg
-		})
-	} else {
-		(*timer).Reset(timeout)
-	}
-}

blockchain/v1/reactor_fsm.go

@@ -1,462 +0,0 @@
-package v1
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-	"time"
-
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
-)
-
-// Blockchain Reactor State
-type bcReactorFSMState struct {
-	name string
-
-	// called when transitioning out of current state
-	handle func(*BcReactorFSM, bReactorEvent, bReactorEventData) (next *bcReactorFSMState, err error)
-	// called when entering the state
-	enter func(fsm *BcReactorFSM)
-
-	// timeout to ensure FSM is not stuck in a state forever
-	// the timer is owned and run by the fsm instance
-	timeout time.Duration
-}
-
-func (s *bcReactorFSMState) String() string {
-	return s.name
-}
-
-// BcReactorFSM is the datastructure for the Blockchain Reactor State Machine
-type BcReactorFSM struct {
-	logger log.Logger
-	mtx    sync.Mutex
-
-	startTime time.Time
-
-	state      *bcReactorFSMState
-	stateTimer *time.Timer
-	pool       *BlockPool
-
-	// interface used to call the Blockchain reactor to send StatusRequest, BlockRequest, reporting errors, etc.
-	toBcR bcReactor
-}
-
-// NewFSM creates a new reactor FSM.
-func NewFSM(height int64, toBcR bcReactor) *BcReactorFSM {
-	return &BcReactorFSM{
-		state:     unknown,
-		startTime: time.Now(),
-		pool:      NewBlockPool(height, toBcR),
-		toBcR:     toBcR,
-	}
-}
-
-// bReactorEventData is part of the message sent by the reactor to the FSM and used by the state handlers.
-type bReactorEventData struct {
-	peerID         p2p.ID
-	err            error        // for peer error: timeout, slow; for processed block event if error occurred
-	base           int64        // for status response
-	height         int64        // for status response; for processed block event
-	block          *types.Block // for block response
-	stateName      string       // for state timeout events
-	length         int          // for block response event, length of received block, used to detect slow peers
-	maxNumRequests int          // for request needed event, maximum number of pending requests
-}
-
-// Blockchain Reactor Events (the input to the state machine)
-type bReactorEvent uint
-
-const (
-	// message type events
-	startFSMEv = iota + 1
-	statusResponseEv
-	blockResponseEv
-	noBlockResponseEv
-	processedBlockEv
-	makeRequestsEv
-	stopFSMEv
-
-	// other events
-	peerRemoveEv = iota + 256
-	stateTimeoutEv
-)
-
-func (msg *bcReactorMessage) String() string {
-	var dataStr string
-
-	switch msg.event {
-	case startFSMEv:
-		dataStr = ""
-	case statusResponseEv:
-		dataStr = fmt.Sprintf("peer=%v base=%v height=%v", msg.data.peerID, msg.data.base, msg.data.height)
-	case blockResponseEv:
-		dataStr = fmt.Sprintf("peer=%v block.height=%v length=%v",
-			msg.data.peerID, msg.data.block.Height, msg.data.length)
-	case noBlockResponseEv:
-		dataStr = fmt.Sprintf("peer=%v requested height=%v",
-			msg.data.peerID, msg.data.height)
-	case processedBlockEv:
-		dataStr = fmt.Sprintf("error=%v", msg.data.err)
-	case makeRequestsEv:
-		dataStr = ""
-	case stopFSMEv:
-		dataStr = ""
-	case peerRemoveEv:
-		dataStr = fmt.Sprintf("peer: %v is being removed by the switch", msg.data.peerID)
-	case stateTimeoutEv:
-		dataStr = fmt.Sprintf("state=%v", msg.data.stateName)
-	default:
-		dataStr = "cannot interpret message data"
-	}
-
-	return fmt.Sprintf("%v: %v", msg.event, dataStr)
-}
-
-func (ev bReactorEvent) String() string {
-	switch ev {
-	case startFSMEv:
-		return "startFSMEv"
-	case statusResponseEv:
-		return "statusResponseEv"
-	case blockResponseEv:
-		return "blockResponseEv"
-	case noBlockResponseEv:
-		return "noBlockResponseEv"
-	case processedBlockEv:
-		return "processedBlockEv"
-	case makeRequestsEv:
-		return "makeRequestsEv"
-	case stopFSMEv:
-		return "stopFSMEv"
-	case peerRemoveEv:
-		return "peerRemoveEv"
-	case stateTimeoutEv:
-		return "stateTimeoutEv"
-	default:
-		return "event unknown"
-	}
-
-}
-
-// states
-var (
-	unknown      *bcReactorFSMState
-	waitForPeer  *bcReactorFSMState
-	waitForBlock *bcReactorFSMState
-	finished     *bcReactorFSMState
-)
-
-// timeouts for state timers
-const (
-	waitForPeerTimeout                 = 3 * time.Second
-	waitForBlockAtCurrentHeightTimeout = 10 * time.Second
-)
-
-// errors
-var (
-	// internal to the package
-	errNoErrorFinished        = errors.New("fast sync is finished")
-	errInvalidEvent           = errors.New("invalid event in current state")
-	errMissingBlock           = errors.New("missing blocks")
-	errNilPeerForBlockRequest = errors.New("peer for block request does not exist in the switch")
-	errSendQueueFull          = errors.New("block request not made, send-queue is full")
-	errPeerTooShort           = errors.New("peer height too low, old peer removed/ new peer not added")
-	errSwitchRemovesPeer      = errors.New("switch is removing peer")
-	errTimeoutEventWrongState = errors.New("timeout event for a state different than the current one")
-	errNoTallerPeer           = errors.New("fast sync timed out on waiting for a peer taller than this node")
-
-	// reported eventually to the switch
-	// handle return
-	errPeerLowersItsHeight = errors.New("fast sync peer reports a height lower than previous")
-	// handle return
-	errNoPeerResponseForCurrentHeights = errors.New("fast sync timed out on peer block response for current heights")
-	errNoPeerResponse                  = errors.New("fast sync timed out on peer block response")               // xx
-	errBadDataFromPeer                 = errors.New("fast sync received block from wrong peer or block is bad") // xx
-	errDuplicateBlock                  = errors.New("fast sync received duplicate block from peer")
-	errBlockVerificationFailure        = errors.New("fast sync block verification failure")              // xx
-	errSlowPeer                        = errors.New("fast sync peer is not sending us data fast enough") // xx
-
-)
-
-func init() {
-	unknown = &bcReactorFSMState{
-		name: "unknown",
-		handle: func(fsm *BcReactorFSM, ev bReactorEvent, data bReactorEventData) (*bcReactorFSMState, error) {
-			switch ev {
-			case startFSMEv:
-				// Broadcast Status message. Currently doesn't return non-nil error.
-				fsm.toBcR.sendStatusRequest()
-				return waitForPeer, nil
-
-			case stopFSMEv:
-				return finished, errNoErrorFinished
-
-			default:
-				return unknown, errInvalidEvent
-			}
-		},
-	}
-
-	waitForPeer = &bcReactorFSMState{
-		name:    "waitForPeer",
-		timeout: waitForPeerTimeout,
-		enter: func(fsm *BcReactorFSM) {
-			// Stop when leaving the state.
-			fsm.resetStateTimer()
-		},
-		handle: func(fsm *BcReactorFSM, ev bReactorEvent, data bReactorEventData) (*bcReactorFSMState, error) {
-			switch ev {
-			case stateTimeoutEv:
-				if data.stateName != "waitForPeer" {
-					fsm.logger.Error("received a state timeout event for different state",
-						"state", data.stateName)
-					return waitForPeer, errTimeoutEventWrongState
-				}
-				// There was no statusResponse received from any peer.
-				// Should we send status request again?
-				return finished, errNoTallerPeer
-
-			case statusResponseEv:
-				if err := fsm.pool.UpdatePeer(data.peerID, data.base, data.height); err != nil {
-					if fsm.pool.NumPeers() == 0 {
-						return waitForPeer, err
-					}
-				}
-				if fsm.stateTimer != nil {
-					fsm.stateTimer.Stop()
-				}
-				return waitForBlock, nil
-
-			case stopFSMEv:
-				if fsm.stateTimer != nil {
-					fsm.stateTimer.Stop()
-				}
-				return finished, errNoErrorFinished
-
-			default:
-				return waitForPeer, errInvalidEvent
-			}
-		},
-	}
-
-	waitForBlock = &bcReactorFSMState{
-		name:    "waitForBlock",
-		timeout: waitForBlockAtCurrentHeightTimeout,
-		enter: func(fsm *BcReactorFSM) {
-			// Stop when leaving the state.
-			fsm.resetStateTimer()
-		},
-		handle: func(fsm *BcReactorFSM, ev bReactorEvent, data bReactorEventData) (*bcReactorFSMState, error) {
-			switch ev {
-
-			case statusResponseEv:
-				err := fsm.pool.UpdatePeer(data.peerID, data.base, data.height)
-				if fsm.pool.NumPeers() == 0 {
-					return waitForPeer, err
-				}
-				if fsm.pool.ReachedMaxHeight() {
-					return finished, err
-				}
-				return waitForBlock, err
-
-			case blockResponseEv:
-				fsm.logger.Debug("blockResponseEv", "H", data.block.Height)
-				err := fsm.pool.AddBlock(data.peerID, data.block, data.length)
-				if err != nil {
-					// A block was received that was unsolicited, from unexpected peer, or that we already have it.
-					// Ignore block, remove peer and send error to switch.
-					fsm.pool.RemovePeer(data.peerID, err)
-					fsm.toBcR.sendPeerError(err, data.peerID)
-				}
-				if fsm.pool.NumPeers() == 0 {
-					return waitForPeer, err
-				}
-				return waitForBlock, err
-			case noBlockResponseEv:
-				fsm.logger.Error("peer does not have requested block", "peer", data.peerID)
-
-				return waitForBlock, nil
-			case processedBlockEv:
-				if data.err != nil {
-					first, second, _ := fsm.pool.FirstTwoBlocksAndPeers()
-					fsm.logger.Error("error processing block", "err", data.err,
-						"first", first.block.Height, "second", second.block.Height)
-					fsm.logger.Error("send peer error for", "peer", first.peer.ID)
-					fsm.toBcR.sendPeerError(data.err, first.peer.ID)
-					fsm.logger.Error("send peer error for", "peer", second.peer.ID)
-					fsm.toBcR.sendPeerError(data.err, second.peer.ID)
-					// Remove the first two blocks. This will also remove the peers
-					fsm.pool.InvalidateFirstTwoBlocks(data.err)
-				} else {
-					fsm.pool.ProcessedCurrentHeightBlock()
-					// Since we advanced one block reset the state timer
-					fsm.resetStateTimer()
-				}
-
-				// Both cases above may result in achieving maximum height.
-				if fsm.pool.ReachedMaxHeight() {
-					return finished, nil
-				}
-
-				return waitForBlock, data.err
-
-			case peerRemoveEv:
-				// This event is sent by the switch to remove disconnected and errored peers.
-				fsm.pool.RemovePeer(data.peerID, data.err)
-				if fsm.pool.NumPeers() == 0 {
-					return waitForPeer, nil
-				}
-				if fsm.pool.ReachedMaxHeight() {
-					return finished, nil
-				}
-				return waitForBlock, nil
-
-			case makeRequestsEv:
-				fsm.makeNextRequests(data.maxNumRequests)
-				return waitForBlock, nil
-
-			case stateTimeoutEv:
-				if data.stateName != "waitForBlock" {
-					fsm.logger.Error("received a state timeout event for different state",
-						"state", data.stateName)
-					return waitForBlock, errTimeoutEventWrongState
-				}
-				// We haven't received the block at current height or height+1. Remove peer.
-				fsm.pool.RemovePeerAtCurrentHeights(errNoPeerResponseForCurrentHeights)
-				fsm.resetStateTimer()
-				if fsm.pool.NumPeers() == 0 {
-					return waitForPeer, errNoPeerResponseForCurrentHeights
-				}
-				if fsm.pool.ReachedMaxHeight() {
-					return finished, nil
-				}
-				return waitForBlock, errNoPeerResponseForCurrentHeights
-
-			case stopFSMEv:
-				if fsm.stateTimer != nil {
-					fsm.stateTimer.Stop()
-				}
-				return finished, errNoErrorFinished
-
-			default:
-				return waitForBlock, errInvalidEvent
-			}
-		},
-	}
-
-	finished = &bcReactorFSMState{
-		name: "finished",
-		enter: func(fsm *BcReactorFSM) {
-			fsm.logger.Info("Time to switch to consensus reactor!", "height", fsm.pool.Height)
-			fsm.toBcR.switchToConsensus()
-			fsm.cleanup()
-		},
-		handle: func(fsm *BcReactorFSM, ev bReactorEvent, data bReactorEventData) (*bcReactorFSMState, error) {
-			return finished, nil
-		},
-	}
-}
-
-// Interface used by FSM for sending Block and Status requests,
-// informing of peer errors and state timeouts
-// Implemented by BlockchainReactor and tests
-type bcReactor interface {
-	sendStatusRequest()
-	sendBlockRequest(peerID p2p.ID, height int64) error
-	sendPeerError(err error, peerID p2p.ID)
-	resetStateTimer(name string, timer **time.Timer, timeout time.Duration)
-	switchToConsensus()
-}
-
-// SetLogger sets the FSM logger.
-func (fsm *BcReactorFSM) SetLogger(l log.Logger) {
-	fsm.logger = l
-	fsm.pool.SetLogger(l)
-}
-
-// Start starts the FSM.
-func (fsm *BcReactorFSM) Start() {
-	_ = fsm.Handle(&bcReactorMessage{event: startFSMEv})
-}
-
-// Handle processes messages and events sent to the FSM.
-func (fsm *BcReactorFSM) Handle(msg *bcReactorMessage) error {
-	fsm.mtx.Lock()
-	defer fsm.mtx.Unlock()
-	fsm.logger.Debug("FSM received", "event", msg, "state", fsm.state)
-
-	if fsm.state == nil {
-		fsm.state = unknown
-	}
-	next, err := fsm.state.handle(fsm, msg.event, msg.data)
-	if err != nil {
-		fsm.logger.Error("FSM event handler returned", "err", err,
-			"state", fsm.state, "event", msg.event)
-	}
-
-	oldState := fsm.state.name
-	fsm.transition(next)
-	if oldState != fsm.state.name {
-		fsm.logger.Info("FSM changed state", "new_state", fsm.state)
-	}
-	return err
-}
-
-func (fsm *BcReactorFSM) transition(next *bcReactorFSMState) {
-	if next == nil {
-		return
-	}
-	if fsm.state != next {
-		fsm.state = next
-		if next.enter != nil {
-			next.enter(fsm)
-		}
-	}
-}
-
-// Called when entering an FSM state in order to detect lack of progress in the state machine.
-// Note the use of the 'bcr' interface to facilitate testing without timer expiring.
-func (fsm *BcReactorFSM) resetStateTimer() {
-	fsm.toBcR.resetStateTimer(fsm.state.name, &fsm.stateTimer, fsm.state.timeout)
-}
-
-func (fsm *BcReactorFSM) isCaughtUp() bool {
-	return fsm.state == finished
-}
-
-func (fsm *BcReactorFSM) makeNextRequests(maxNumRequests int) {
-	fsm.pool.MakeNextRequests(maxNumRequests)
-}
-
-func (fsm *BcReactorFSM) cleanup() {
-	fsm.pool.Cleanup()
-}
-
-// NeedsBlocks checks if more block requests are required.
-func (fsm *BcReactorFSM) NeedsBlocks() bool {
-	fsm.mtx.Lock()
-	defer fsm.mtx.Unlock()
-	return fsm.state.name == "waitForBlock" && fsm.pool.NeedsBlocks()
-}
-
-// FirstTwoBlocks returns the two blocks at pool height and height+1
-func (fsm *BcReactorFSM) FirstTwoBlocks() (first, second *types.Block, err error) {
-	fsm.mtx.Lock()
-	defer fsm.mtx.Unlock()
-	firstBP, secondBP, err := fsm.pool.FirstTwoBlocksAndPeers()
-	if err == nil {
-		first = firstBP.block
-		second = secondBP.block
-	}
-	return
-}
-
-// Status returns the pool's height and the maximum peer height.
-func (fsm *BcReactorFSM) Status() (height, maxPeerHeight int64) {
-	fsm.mtx.Lock()
-	defer fsm.mtx.Unlock()
-	return fsm.pool.Height, fsm.pool.MaxPeerHeight
-}

blockchain/v1/reactor_fsm_test.go

@@ -1,944 +0,0 @@
-package v1
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/tendermint/tendermint/libs/log"
-	tmmath "github.com/tendermint/tendermint/libs/math"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	"github.com/tendermint/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
-)
-
-type lastBlockRequestT struct {
-	peerID p2p.ID
-	height int64
-}
-
-type lastPeerErrorT struct {
-	peerID p2p.ID
-	err    error
-}
-
-// reactor for FSM testing
-type testReactor struct {
-	logger            log.Logger
-	fsm               *BcReactorFSM
-	numStatusRequests int
-	numBlockRequests  int
-	lastBlockRequest  lastBlockRequestT
-	lastPeerError     lastPeerErrorT
-	stateTimerStarts  map[string]int
-}
-
-func sendEventToFSM(fsm *BcReactorFSM, ev bReactorEvent, data bReactorEventData) error {
-	return fsm.Handle(&bcReactorMessage{event: ev, data: data})
-}
-
-type fsmStepTestValues struct {
-	currentState string
-	event        bReactorEvent
-	data         bReactorEventData
-
-	wantErr           error
-	wantState         string
-	wantStatusReqSent bool
-	wantReqIncreased  bool
-	wantNewBlocks     []int64
-	wantRemovedPeers  []p2p.ID
-}
-
-// ---------------------------------------------------------------------------
-// helper test function for different FSM events, state and expected behavior
-func sStopFSMEv(current, expected string) fsmStepTestValues {
-	return fsmStepTestValues{
-		currentState: current,
-		event:        stopFSMEv,
-		wantState:    expected,
-		wantErr:      errNoErrorFinished}
-}
-
-func sUnknownFSMEv(current string) fsmStepTestValues {
-	return fsmStepTestValues{
-		currentState: current,
-		event:        1234,
-		wantState:    current,
-		wantErr:      errInvalidEvent}
-}
-
-func sStartFSMEv() fsmStepTestValues {
-	return fsmStepTestValues{
-		currentState:      "unknown",
-		event:             startFSMEv,
-		wantState:         "waitForPeer",
-		wantStatusReqSent: true}
-}
-
-func sStateTimeoutEv(current, expected string, timedoutState string, wantErr error) fsmStepTestValues {
-	return fsmStepTestValues{
-		currentState: current,
-		event:        stateTimeoutEv,
-		data: bReactorEventData{
-			stateName: timedoutState,
-		},
-		wantState: expected,
-		wantErr:   wantErr,
-	}
-}
-
-func sProcessedBlockEv(current, expected string, reactorError error) fsmStepTestValues {
-	return fsmStepTestValues{
-		currentState: current,
-		event:        processedBlockEv,
-		data: bReactorEventData{
-			err: reactorError,
-		},
-		wantState: expected,
-		wantErr:   reactorError,
-	}
-}
-
-func sStatusEv(current, expected string, peerID p2p.ID, height int64, err error) fsmStepTestValues {
-	return fsmStepTestValues{
-		currentState: current,
-		event:        statusResponseEv,
-		data:         bReactorEventData{peerID: peerID, height: height},
-		wantState:    expected,
-		wantErr:      err}
-}
-
-func sMakeRequestsEv(current, expected string, maxPendingRequests int) fsmStepTestValues {
-	return fsmStepTestValues{
-		currentState:     current,
-		event:            makeRequestsEv,
-		data:             bReactorEventData{maxNumRequests: maxPendingRequests},
-		wantState:        expected,
-		wantReqIncreased: true,
-	}
-}
-
-func sMakeRequestsEvErrored(current, expected string,
-	maxPendingRequests int, err error, peersRemoved []p2p.ID) fsmStepTestValues {
-	return fsmStepTestValues{
-		currentState:     current,
-		event:            makeRequestsEv,
-		data:             bReactorEventData{maxNumRequests: maxPendingRequests},
-		wantState:        expected,
-		wantErr:          err,
-		wantRemovedPeers: peersRemoved,
-		wantReqIncreased: true,
-	}
-}
-
-func sBlockRespEv(current, expected string, peerID p2p.ID, height int64, prevBlocks []int64) fsmStepTestValues {
-	txs := []types.Tx{types.Tx("foo"), types.Tx("bar")}
-	return fsmStepTestValues{
-		currentState: current,
-		event:        blockResponseEv,
-		data: bReactorEventData{
-			peerID: peerID,
-			height: height,
-			block:  types.MakeBlock(height, txs, nil, nil),
-			length: 100},
-		wantState:     expected,
-		wantNewBlocks: append(prevBlocks, height),
-	}
-}
-
-func sBlockRespEvErrored(current, expected string,
-	peerID p2p.ID, height int64, prevBlocks []int64, wantErr error, peersRemoved []p2p.ID) fsmStepTestValues {
-	txs := []types.Tx{types.Tx("foo"), types.Tx("bar")}
-
-	return fsmStepTestValues{
-		currentState: current,
-		event:        blockResponseEv,
-		data: bReactorEventData{
-			peerID: peerID,
-			height: height,
-			block:  types.MakeBlock(height, txs, nil, nil),
-			length: 100},
-		wantState:        expected,
-		wantErr:          wantErr,
-		wantRemovedPeers: peersRemoved,
-		wantNewBlocks:    prevBlocks,
-	}
-}
-
-func sPeerRemoveEv(current, expected string, peerID p2p.ID, err error, peersRemoved []p2p.ID) fsmStepTestValues {
-	return fsmStepTestValues{
-		currentState: current,
-		event:        peerRemoveEv,
-		data: bReactorEventData{
-			peerID: peerID,
-			err:    err,
-		},
-		wantState:        expected,
-		wantRemovedPeers: peersRemoved,
-	}
-}
-
-// --------------------------------------------
-
-func newTestReactor(height int64) *testReactor {
-	testBcR := &testReactor{logger: log.TestingLogger(), stateTimerStarts: make(map[string]int)}
-	testBcR.fsm = NewFSM(height, testBcR)
-	testBcR.fsm.SetLogger(testBcR.logger)
-	return testBcR
-}
-
-func fixBlockResponseEvStep(step *fsmStepTestValues, testBcR *testReactor) {
-	// There is currently no good way to know to which peer a block request was sent.
-	// So in some cases where it does not matter, before we simulate a block response
-	// we cheat and look where it is expected from.
-	if step.event == blockResponseEv {
-		height := step.data.height
-		peerID, ok := testBcR.fsm.pool.blocks[height]
-		if ok {
-			step.data.peerID = peerID
-		}
-	}
-}
-
-type testFields struct {
-	name               string
-	startingHeight     int64
-	maxRequestsPerPeer int
-	maxPendingRequests int
-	steps              []fsmStepTestValues
-}
-
-func executeFSMTests(t *testing.T, tests []testFields, matchRespToReq bool) {
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			// Create test reactor
-			testBcR := newTestReactor(tt.startingHeight)
-
-			if tt.maxRequestsPerPeer != 0 {
-				maxRequestsPerPeer = tt.maxRequestsPerPeer
-			}
-
-			for _, step := range tt.steps {
-				step := step
-				assert.Equal(t, step.currentState, testBcR.fsm.state.name)
-
-				var heightBefore int64
-				if step.event == processedBlockEv && step.data.err == errBlockVerificationFailure {
-					heightBefore = testBcR.fsm.pool.Height
-				}
-				oldNumStatusRequests := testBcR.numStatusRequests
-				oldNumBlockRequests := testBcR.numBlockRequests
-				if matchRespToReq {
-					fixBlockResponseEvStep(&step, testBcR)
-				}
-
-				fsmErr := sendEventToFSM(testBcR.fsm, step.event, step.data)
-				assert.Equal(t, step.wantErr, fsmErr)
-
-				if step.wantStatusReqSent {
-					assert.Equal(t, oldNumStatusRequests+1, testBcR.numStatusRequests)
-				} else {
-					assert.Equal(t, oldNumStatusRequests, testBcR.numStatusRequests)
-				}
-
-				if step.wantReqIncreased {
-					assert.True(t, oldNumBlockRequests < testBcR.numBlockRequests)
-				} else {
-					assert.Equal(t, oldNumBlockRequests, testBcR.numBlockRequests)
-				}
-
-				for _, height := range step.wantNewBlocks {
-					_, err := testBcR.fsm.pool.BlockAndPeerAtHeight(height)
-					assert.Nil(t, err)
-				}
-				if step.event == processedBlockEv && step.data.err == errBlockVerificationFailure {
-					heightAfter := testBcR.fsm.pool.Height
-					assert.Equal(t, heightBefore, heightAfter)
-					firstAfter, err1 := testBcR.fsm.pool.BlockAndPeerAtHeight(testBcR.fsm.pool.Height)
-					secondAfter, err2 := testBcR.fsm.pool.BlockAndPeerAtHeight(testBcR.fsm.pool.Height + 1)
-					assert.NotNil(t, err1)
-					assert.NotNil(t, err2)
-					assert.Nil(t, firstAfter)
-					assert.Nil(t, secondAfter)
-				}
-
-				assert.Equal(t, step.wantState, testBcR.fsm.state.name)
-
-				if step.wantState == "finished" {
-					assert.True(t, testBcR.fsm.isCaughtUp())
-				}
-			}
-		})
-	}
-}
-
-func TestFSMBasic(t *testing.T) {
-	tests := []testFields{
-		{
-			name:               "one block, one peer - TS2",
-			startingHeight:     1,
-			maxRequestsPerPeer: 2,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 2, nil),
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P1", 1, []int64{}),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P2", 2, []int64{1}),
-				sProcessedBlockEv("waitForBlock", "finished", nil),
-			},
-		},
-		{
-			name:               "multi block, multi peer - TS2",
-			startingHeight:     1,
-			maxRequestsPerPeer: 2,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 4, nil),
-				sStatusEv("waitForBlock", "waitForBlock", "P2", 4, nil),
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-
-				sBlockRespEv("waitForBlock", "waitForBlock", "P1", 1, []int64{}),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P1", 2, []int64{1}),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P2", 3, []int64{1, 2}),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P2", 4, []int64{1, 2, 3}),
-
-				sProcessedBlockEv("waitForBlock", "waitForBlock", nil),
-				sProcessedBlockEv("waitForBlock", "waitForBlock", nil),
-				sProcessedBlockEv("waitForBlock", "finished", nil),
-			},
-		},
-	}
-
-	executeFSMTests(t, tests, true)
-}
-
-func TestFSMBlockVerificationFailure(t *testing.T) {
-	tests := []testFields{
-		{
-			name:               "block verification failure - TS2 variant",
-			startingHeight:     1,
-			maxRequestsPerPeer: 3,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-
-				// add P1 and get blocks 1-3 from it
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 3, nil),
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P1", 1, []int64{}),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P1", 2, []int64{1}),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P1", 3, []int64{1, 2}),
-
-				// add P2
-				sStatusEv("waitForBlock", "waitForBlock", "P2", 3, nil),
-
-				// process block failure, should remove P1 and all blocks
-				sProcessedBlockEv("waitForBlock", "waitForBlock", errBlockVerificationFailure),
-
-				// get blocks 1-3 from P2
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P2", 1, []int64{}),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P2", 2, []int64{1}),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P2", 3, []int64{1, 2}),
-
-				// finish after processing blocks 1 and 2
-				sProcessedBlockEv("waitForBlock", "waitForBlock", nil),
-				sProcessedBlockEv("waitForBlock", "finished", nil),
-			},
-		},
-	}
-
-	executeFSMTests(t, tests, false)
-}
-
-func TestFSMBadBlockFromPeer(t *testing.T) {
-	tests := []testFields{
-		{
-			name:               "block we haven't asked for",
-			startingHeight:     1,
-			maxRequestsPerPeer: 3,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				// add P1 and ask for blocks 1-3
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 300, nil),
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-
-				// blockResponseEv for height 100 should cause an error
-				sBlockRespEvErrored("waitForBlock", "waitForPeer",
-					"P1", 100, []int64{}, errMissingBlock, []p2p.ID{}),
-			},
-		},
-		{
-			name:               "block we already have",
-			startingHeight:     1,
-			maxRequestsPerPeer: 3,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				// add P1 and get block 1
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 100, nil),
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-				sBlockRespEv("waitForBlock", "waitForBlock",
-					"P1", 1, []int64{}),
-
-				// Get block 1 again. Since peer is removed together with block 1,
-				// the blocks present in the pool should be {}
-				sBlockRespEvErrored("waitForBlock", "waitForPeer",
-					"P1", 1, []int64{}, errDuplicateBlock, []p2p.ID{"P1"}),
-			},
-		},
-		{
-			name:               "block from unknown peer",
-			startingHeight:     1,
-			maxRequestsPerPeer: 3,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				// add P1 and get block 1
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 3, nil),
-
-				// get block 1 from unknown peer P2
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-				sBlockRespEvErrored("waitForBlock", "waitForBlock",
-					"P2", 1, []int64{}, errBadDataFromPeer, []p2p.ID{"P2"}),
-			},
-		},
-		{
-			name:               "block from wrong peer",
-			startingHeight:     1,
-			maxRequestsPerPeer: 3,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				// add P1, make requests for blocks 1-3 to P1
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 3, nil),
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-
-				// add P2
-				sStatusEv("waitForBlock", "waitForBlock", "P2", 3, nil),
-
-				// receive block 1 from P2
-				sBlockRespEvErrored("waitForBlock", "waitForBlock",
-					"P2", 1, []int64{}, errBadDataFromPeer, []p2p.ID{"P2"}),
-			},
-		},
-	}
-
-	executeFSMTests(t, tests, false)
-}
-
-func TestFSMBlockAtCurrentHeightDoesNotArriveInTime(t *testing.T) {
-	tests := []testFields{
-		{
-			name:               "block at current height undelivered - TS5",
-			startingHeight:     1,
-			maxRequestsPerPeer: 3,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				// add P1, get blocks 1 and 2, process block 1
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 3, nil),
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-				sBlockRespEv("waitForBlock", "waitForBlock",
-					"P1", 1, []int64{}),
-				sBlockRespEv("waitForBlock", "waitForBlock",
-					"P1", 2, []int64{1}),
-				sProcessedBlockEv("waitForBlock", "waitForBlock", nil),
-
-				// add P2
-				sStatusEv("waitForBlock", "waitForBlock", "P2", 3, nil),
-
-				// timeout on block 3, P1 should be removed
-				sStateTimeoutEv("waitForBlock", "waitForBlock", "waitForBlock", errNoPeerResponseForCurrentHeights),
-
-				// make requests and finish by receiving blocks 2 and 3 from P2
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P2", 2, []int64{}),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P2", 3, []int64{2}),
-				sProcessedBlockEv("waitForBlock", "finished", nil),
-			},
-		},
-		{
-			name:               "block at current height undelivered, at maxPeerHeight after peer removal - TS3",
-			startingHeight:     1,
-			maxRequestsPerPeer: 3,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				// add P1, request blocks 1-3 from P1
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 3, nil),
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-
-				// add P2 (tallest)
-				sStatusEv("waitForBlock", "waitForBlock", "P2", 30, nil),
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-
-				// receive blocks 1-3 from P1
-				sBlockRespEv("waitForBlock", "waitForBlock", "P1", 1, []int64{}),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P1", 2, []int64{1}),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P1", 3, []int64{1, 2}),
-
-				// process blocks at heights 1 and 2
-				sProcessedBlockEv("waitForBlock", "waitForBlock", nil),
-				sProcessedBlockEv("waitForBlock", "waitForBlock", nil),
-
-				// timeout on block at height 4
-				sStateTimeoutEv("waitForBlock", "finished", "waitForBlock", nil),
-			},
-		},
-	}
-
-	executeFSMTests(t, tests, true)
-}
-
-func TestFSMPeerRelatedEvents(t *testing.T) {
-	tests := []testFields{
-		{
-			name:           "peer remove event with no blocks",
-			startingHeight: 1,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				// add P1, P2, P3
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 3, nil),
-				sStatusEv("waitForBlock", "waitForBlock", "P2", 3, nil),
-				sStatusEv("waitForBlock", "waitForBlock", "P3", 3, nil),
-
-				// switch removes P2
-				sPeerRemoveEv("waitForBlock", "waitForBlock", "P2", errSwitchRemovesPeer, []p2p.ID{"P2"}),
-			},
-		},
-		{
-			name:           "only peer removed while in waitForBlock state",
-			startingHeight: 100,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				// add P1
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 200, nil),
-
-				// switch removes P1
-				sPeerRemoveEv("waitForBlock", "waitForPeer", "P1", errSwitchRemovesPeer, []p2p.ID{"P1"}),
-			},
-		},
-		{
-			name:               "highest peer removed while in waitForBlock state, node reaches maxPeerHeight - TS4 ",
-			startingHeight:     100,
-			maxRequestsPerPeer: 3,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				// add P1 and make requests
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 101, nil),
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-				// add P2
-				sStatusEv("waitForBlock", "waitForBlock", "P2", 200, nil),
-
-				// get blocks 100 and 101 from P1 and process block at height 100
-				sBlockRespEv("waitForBlock", "waitForBlock", "P1", 100, []int64{}),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P1", 101, []int64{100}),
-				sProcessedBlockEv("waitForBlock", "waitForBlock", nil),
-
-				// switch removes peer P1, should be finished
-				sPeerRemoveEv("waitForBlock", "finished", "P2", errSwitchRemovesPeer, []p2p.ID{"P2"}),
-			},
-		},
-		{
-			name:               "highest peer lowers its height in waitForBlock state, node reaches maxPeerHeight - TS4",
-			startingHeight:     100,
-			maxRequestsPerPeer: 3,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				// add P1 and make requests
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 101, nil),
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-
-				// add P2
-				sStatusEv("waitForBlock", "waitForBlock", "P2", 200, nil),
-
-				// get blocks 100 and 101 from P1
-				sBlockRespEv("waitForBlock", "waitForBlock", "P1", 100, []int64{}),
-				sBlockRespEv("waitForBlock", "waitForBlock", "P1", 101, []int64{100}),
-
-				// processed block at heights 100
-				sProcessedBlockEv("waitForBlock", "waitForBlock", nil),
-
-				// P2 becomes short
-				sStatusEv("waitForBlock", "finished", "P2", 100, errPeerLowersItsHeight),
-			},
-		},
-		{
-			name:           "new short peer while in waitForPeer state",
-			startingHeight: 100,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				sStatusEv("waitForPeer", "waitForPeer", "P1", 3, errPeerTooShort),
-			},
-		},
-		{
-			name:           "new short peer while in waitForBlock state",
-			startingHeight: 100,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 200, nil),
-				sStatusEv("waitForBlock", "waitForBlock", "P2", 3, errPeerTooShort),
-			},
-		},
-		{
-			name:           "only peer updated with low height while in waitForBlock state",
-			startingHeight: 100,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 200, nil),
-				sStatusEv("waitForBlock", "waitForPeer", "P1", 3, errPeerLowersItsHeight),
-			},
-		},
-		{
-			name:               "peer does not exist in the switch",
-			startingHeight:     9999999,
-			maxRequestsPerPeer: 3,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				// add P1
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 20000000, nil),
-				// send request for block 9999999
-				// Note: For this block request the "switch missing the peer" error is simulated,
-				// see implementation of bcReactor interface, sendBlockRequest(), in this file.
-				sMakeRequestsEvErrored("waitForBlock", "waitForBlock",
-					maxNumRequests, nil, []p2p.ID{"P1"}),
-			},
-		},
-	}
-
-	executeFSMTests(t, tests, true)
-}
-
-func TestFSMStopFSM(t *testing.T) {
-	tests := []testFields{
-		{
-			name: "stopFSMEv in unknown",
-			steps: []fsmStepTestValues{
-				sStopFSMEv("unknown", "finished"),
-			},
-		},
-		{
-			name:           "stopFSMEv in waitForPeer",
-			startingHeight: 1,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				sStopFSMEv("waitForPeer", "finished"),
-			},
-		},
-		{
-			name:           "stopFSMEv in waitForBlock",
-			startingHeight: 1,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 3, nil),
-				sStopFSMEv("waitForBlock", "finished"),
-			},
-		},
-	}
-
-	executeFSMTests(t, tests, false)
-}
-
-func TestFSMUnknownElements(t *testing.T) {
-	tests := []testFields{
-		{
-			name: "unknown event for state unknown",
-			steps: []fsmStepTestValues{
-				sUnknownFSMEv("unknown"),
-			},
-		},
-		{
-			name: "unknown event for state waitForPeer",
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				sUnknownFSMEv("waitForPeer"),
-			},
-		},
-		{
-			name:           "unknown event for state waitForBlock",
-			startingHeight: 1,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 3, nil),
-				sUnknownFSMEv("waitForBlock"),
-			},
-		},
-	}
-
-	executeFSMTests(t, tests, false)
-}
-
-func TestFSMPeerStateTimeoutEvent(t *testing.T) {
-	tests := []testFields{
-		{
-			name:               "timeout event for state waitForPeer while in state waitForPeer - TS1",
-			startingHeight:     1,
-			maxRequestsPerPeer: 3,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				sStateTimeoutEv("waitForPeer", "finished", "waitForPeer", errNoTallerPeer),
-			},
-		},
-		{
-			name:               "timeout event for state waitForPeer while in a state != waitForPeer",
-			startingHeight:     1,
-			maxRequestsPerPeer: 3,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				sStateTimeoutEv("waitForPeer", "waitForPeer", "waitForBlock", errTimeoutEventWrongState),
-			},
-		},
-		{
-			name:               "timeout event for state waitForBlock while in state waitForBlock ",
-			startingHeight:     1,
-			maxRequestsPerPeer: 3,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 3, nil),
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-				sStateTimeoutEv("waitForBlock", "waitForPeer", "waitForBlock", errNoPeerResponseForCurrentHeights),
-			},
-		},
-		{
-			name:               "timeout event for state waitForBlock while in a state != waitForBlock",
-			startingHeight:     1,
-			maxRequestsPerPeer: 3,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 3, nil),
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-				sStateTimeoutEv("waitForBlock", "waitForBlock", "waitForPeer", errTimeoutEventWrongState),
-			},
-		},
-		{
-			name:               "timeout event for state waitForBlock with multiple peers",
-			startingHeight:     1,
-			maxRequestsPerPeer: 3,
-			steps: []fsmStepTestValues{
-				sStartFSMEv(),
-				sStatusEv("waitForPeer", "waitForBlock", "P1", 3, nil),
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-				sStatusEv("waitForBlock", "waitForBlock", "P2", 3, nil),
-				sStateTimeoutEv("waitForBlock", "waitForBlock", "waitForBlock", errNoPeerResponseForCurrentHeights),
-			},
-		},
-	}
-
-	executeFSMTests(t, tests, false)
-}
-
-func makeCorrectTransitionSequence(startingHeight int64, numBlocks int64, numPeers int, randomPeerHeights bool,
-	maxRequestsPerPeer int, maxPendingRequests int) testFields {
-
-	// Generate numPeers peers with random or numBlocks heights according to the randomPeerHeights flag.
-	peerHeights := make([]int64, numPeers)
-	for i := 0; i < numPeers; i++ {
-		if i == 0 {
-			peerHeights[0] = numBlocks
-			continue
-		}
-		if randomPeerHeights {
-			peerHeights[i] = int64(tmmath.MaxInt(tmrand.Intn(int(numBlocks)), int(startingHeight)+1))
-		} else {
-			peerHeights[i] = numBlocks
-		}
-	}
-
-	// Approximate the slice capacity to save time for appends.
-	testSteps := make([]fsmStepTestValues, 0, 3*numBlocks+int64(numPeers))
-
-	testName := fmt.Sprintf("%v-blocks %v-startingHeight %v-peers %v-maxRequestsPerPeer %v-maxNumRequests",
-		numBlocks, startingHeight, numPeers, maxRequestsPerPeer, maxPendingRequests)
-
-	// Add startFSMEv step.
-	testSteps = append(testSteps, sStartFSMEv())
-
-	// For each peer, add statusResponseEv step.
-	for i := 0; i < numPeers; i++ {
-		peerName := fmt.Sprintf("P%d", i)
-		if i == 0 {
-			testSteps = append(
-				testSteps,
-				sStatusEv("waitForPeer", "waitForBlock", p2p.ID(peerName), peerHeights[i], nil))
-		} else {
-			testSteps = append(testSteps,
-				sStatusEv("waitForBlock", "waitForBlock", p2p.ID(peerName), peerHeights[i], nil))
-		}
-	}
-
-	height := startingHeight
-	numBlocksReceived := 0
-	prevBlocks := make([]int64, 0, maxPendingRequests)
-
-forLoop:
-	for i := 0; i < int(numBlocks); i++ {
-
-		// Add the makeRequestEv step periodically.
-		if i%maxRequestsPerPeer == 0 {
-			testSteps = append(
-				testSteps,
-				sMakeRequestsEv("waitForBlock", "waitForBlock", maxNumRequests),
-			)
-		}
-
-		// Add the blockRespEv step
-		testSteps = append(
-			testSteps,
-			sBlockRespEv("waitForBlock", "waitForBlock",
-				"P0", height, prevBlocks))
-		prevBlocks = append(prevBlocks, height)
-		height++
-		numBlocksReceived++
-
-		// Add the processedBlockEv step periodically.
-		if numBlocksReceived >= maxRequestsPerPeer || height >= numBlocks {
-			for j := int(height) - numBlocksReceived; j < int(height); j++ {
-				if j >= int(numBlocks) {
-					// This is the last block that is processed, we should be in "finished" state.
-					testSteps = append(
-						testSteps,
-						sProcessedBlockEv("waitForBlock", "finished", nil))
-					break forLoop
-				}
-				testSteps = append(
-					testSteps,
-					sProcessedBlockEv("waitForBlock", "waitForBlock", nil))
-			}
-			numBlocksReceived = 0
-			prevBlocks = make([]int64, 0, maxPendingRequests)
-		}
-	}
-
-	return testFields{
-		name:               testName,
-		startingHeight:     startingHeight,
-		maxRequestsPerPeer: maxRequestsPerPeer,
-		maxPendingRequests: maxPendingRequests,
-		steps:              testSteps,
-	}
-}
-
-const (
-	maxStartingHeightTest       = 100
-	maxRequestsPerPeerTest      = 20
-	maxTotalPendingRequestsTest = 600
-	maxNumPeersTest             = 1000
-	maxNumBlocksInChainTest     = 10000 // should be smaller than 9999999
-)
-
-func makeCorrectTransitionSequenceWithRandomParameters() testFields {
-	// Generate a starting height for fast sync.
-	startingHeight := int64(tmrand.Intn(maxStartingHeightTest) + 1)
-
-	// Generate the number of requests per peer.
-	maxRequestsPerPeer := tmrand.Intn(maxRequestsPerPeerTest) + 1
-
-	// Generate the maximum number of total pending requests, >= maxRequestsPerPeer.
-	maxPendingRequests := tmrand.Intn(maxTotalPendingRequestsTest-maxRequestsPerPeer) + maxRequestsPerPeer
-
-	// Generate the number of blocks to be synced.
-	numBlocks := int64(tmrand.Intn(maxNumBlocksInChainTest)) + startingHeight
-
-	// Generate a number of peers.
-	numPeers := tmrand.Intn(maxNumPeersTest) + 1
-
-	return makeCorrectTransitionSequence(startingHeight, numBlocks, numPeers, true, maxRequestsPerPeer, maxPendingRequests)
-}
-
-func shouldApplyProcessedBlockEvStep(step *fsmStepTestValues, testBcR *testReactor) bool {
-	if step.event == processedBlockEv {
-		_, err := testBcR.fsm.pool.BlockAndPeerAtHeight(testBcR.fsm.pool.Height)
-		if err == errMissingBlock {
-			return false
-		}
-		_, err = testBcR.fsm.pool.BlockAndPeerAtHeight(testBcR.fsm.pool.Height + 1)
-		if err == errMissingBlock {
-			return false
-		}
-	}
-	return true
-}
-
-func TestFSMCorrectTransitionSequences(t *testing.T) {
-
-	tests := []testFields{
-		makeCorrectTransitionSequence(1, 100, 10, true, 10, 40),
-		makeCorrectTransitionSequenceWithRandomParameters(),
-	}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			// Create test reactor
-			testBcR := newTestReactor(tt.startingHeight)
-
-			if tt.maxRequestsPerPeer != 0 {
-				maxRequestsPerPeer = tt.maxRequestsPerPeer
-			}
-
-			for _, step := range tt.steps {
-				step := step
-				assert.Equal(t, step.currentState, testBcR.fsm.state.name)
-
-				oldNumStatusRequests := testBcR.numStatusRequests
-				fixBlockResponseEvStep(&step, testBcR)
-				if !shouldApplyProcessedBlockEvStep(&step, testBcR) {
-					continue
-				}
-
-				fsmErr := sendEventToFSM(testBcR.fsm, step.event, step.data)
-				assert.Equal(t, step.wantErr, fsmErr)
-
-				if step.wantStatusReqSent {
-					assert.Equal(t, oldNumStatusRequests+1, testBcR.numStatusRequests)
-				} else {
-					assert.Equal(t, oldNumStatusRequests, testBcR.numStatusRequests)
-				}
-
-				assert.Equal(t, step.wantState, testBcR.fsm.state.name)
-				if step.wantState == "finished" {
-					assert.True(t, testBcR.fsm.isCaughtUp())
-				}
-			}
-
-		})
-	}
-}
-
-// ----------------------------------------
-// implements the bcRNotifier
-func (testR *testReactor) sendPeerError(err error, peerID p2p.ID) {
-	testR.logger.Info("Reactor received sendPeerError call from FSM", "peer", peerID, "err", err)
-	testR.lastPeerError.peerID = peerID
-	testR.lastPeerError.err = err
-}
-
-func (testR *testReactor) sendStatusRequest() {
-	testR.logger.Info("Reactor received sendStatusRequest call from FSM")
-	testR.numStatusRequests++
-}
-
-func (testR *testReactor) sendBlockRequest(peerID p2p.ID, height int64) error {
-	testR.logger.Info("Reactor received sendBlockRequest call from FSM", "peer", peerID, "height", height)
-	testR.numBlockRequests++
-	testR.lastBlockRequest.peerID = peerID
-	testR.lastBlockRequest.height = height
-	if height == 9999999 {
-		// simulate switch does not have peer
-		return errNilPeerForBlockRequest
-	}
-	return nil
-}
-
-func (testR *testReactor) resetStateTimer(name string, timer **time.Timer, timeout time.Duration) {
-	testR.logger.Info("Reactor received resetStateTimer call from FSM", "state", name, "timeout", timeout)
-	if _, ok := testR.stateTimerStarts[name]; !ok {
-		testR.stateTimerStarts[name] = 1
-	} else {
-		testR.stateTimerStarts[name]++
-	}
-}
-
-func (testR *testReactor) switchToConsensus() {
-}
-
-// ----------------------------------------

blockchain/v1/reactor_test.go

@@ -1,365 +0,0 @@
-package v1
-
-import (
-	"fmt"
-	"os"
-	"sort"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	dbm "github.com/tendermint/tm-db"
-
-	abci "github.com/tendermint/tendermint/abci/types"
-	cfg "github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/mempool/mock"
-	"github.com/tendermint/tendermint/p2p"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/proxy"
-	sm "github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/store"
-	"github.com/tendermint/tendermint/types"
-	tmtime "github.com/tendermint/tendermint/types/time"
-)
-
-var config *cfg.Config
-
-func randGenesisDoc(numValidators int, randPower bool, minPower int64) (*types.GenesisDoc, []types.PrivValidator) {
-	validators := make([]types.GenesisValidator, numValidators)
-	privValidators := make([]types.PrivValidator, numValidators)
-	for i := 0; i < numValidators; i++ {
-		val, privVal := types.RandValidator(randPower, minPower)
-		validators[i] = types.GenesisValidator{
-			PubKey: val.PubKey,
-			Power:  val.VotingPower,
-		}
-		privValidators[i] = privVal
-	}
-	sort.Sort(types.PrivValidatorsByAddress(privValidators))
-
-	return &types.GenesisDoc{
-		GenesisTime: tmtime.Now(),
-		ChainID:     config.ChainID(),
-		Validators:  validators,
-	}, privValidators
-}
-
-func makeVote(
-	t *testing.T,
-	header *types.Header,
-	blockID types.BlockID,
-	valset *types.ValidatorSet,
-	privVal types.PrivValidator) *types.Vote {
-
-	pubKey, err := privVal.GetPubKey()
-	require.NoError(t, err)
-
-	valIdx, _ := valset.GetByAddress(pubKey.Address())
-	vote := &types.Vote{
-		ValidatorAddress: pubKey.Address(),
-		ValidatorIndex:   valIdx,
-		Height:           header.Height,
-		Round:            1,
-		Timestamp:        tmtime.Now(),
-		Type:             tmproto.PrecommitType,
-		BlockID:          blockID,
-	}
-
-	vpb := vote.ToProto()
-
-	_ = privVal.SignVote(header.ChainID, vpb)
-	vote.Signature = vpb.Signature
-
-	return vote
-}
-
-type BlockchainReactorPair struct {
-	bcR  *BlockchainReactor
-	conR *consensusReactorTest
-}
-
-func newBlockchainReactor(
-	t *testing.T,
-	logger log.Logger,
-	genDoc *types.GenesisDoc,
-	privVals []types.PrivValidator,
-	maxBlockHeight int64) *BlockchainReactor {
-	if len(privVals) != 1 {
-		panic("only support one validator")
-	}
-
-	app := &testApp{}
-	cc := proxy.NewLocalClientCreator(app)
-	proxyApp := proxy.NewAppConns(cc)
-	err := proxyApp.Start()
-	if err != nil {
-		panic(fmt.Errorf("error start app: %w", err))
-	}
-
-	blockDB := dbm.NewMemDB()
-	stateDB := dbm.NewMemDB()
-	stateStore := sm.NewStore(stateDB)
-	blockStore := store.NewBlockStore(blockDB)
-
-	state, err := stateStore.LoadFromDBOrGenesisDoc(genDoc)
-	if err != nil {
-		panic(fmt.Errorf("error constructing state from genesis file: %w", err))
-	}
-
-	// Make the BlockchainReactor itself.
-	// NOTE we have to create and commit the blocks first because
-	// pool.height is determined from the store.
-	fastSync := true
-	db := dbm.NewMemDB()
-	stateStore = sm.NewStore(db)
-	blockExec := sm.NewBlockExecutor(stateStore, log.TestingLogger(), proxyApp.Consensus(),
-		mock.Mempool{}, sm.EmptyEvidencePool{})
-	if err = stateStore.Save(state); err != nil {
-		panic(err)
-	}
-
-	// let's add some blocks in
-	for blockHeight := int64(1); blockHeight <= maxBlockHeight; blockHeight++ {
-		lastCommit := types.NewCommit(blockHeight-1, 1, types.BlockID{}, nil)
-		if blockHeight > 1 {
-			lastBlockMeta := blockStore.LoadBlockMeta(blockHeight - 1)
-			lastBlock := blockStore.LoadBlock(blockHeight - 1)
-
-			vote := makeVote(t, &lastBlock.Header, lastBlockMeta.BlockID, state.Validators, privVals[0])
-			lastCommit = types.NewCommit(vote.Height, vote.Round, lastBlockMeta.BlockID, []types.CommitSig{vote.CommitSig()})
-		}
-
-		thisBlock := makeBlock(blockHeight, state, lastCommit)
-
-		thisParts := thisBlock.MakePartSet(types.BlockPartSizeBytes)
-		blockID := types.BlockID{Hash: thisBlock.Hash(), PartSetHeader: thisParts.Header()}
-
-		state, _, err = blockExec.ApplyBlock(state, blockID, thisBlock)
-		if err != nil {
-			panic(fmt.Errorf("error apply block: %w", err))
-		}
-
-		blockStore.SaveBlock(thisBlock, thisParts, lastCommit)
-	}
-
-	bcReactor := NewBlockchainReactor(state.Copy(), blockExec, blockStore, fastSync)
-	bcReactor.SetLogger(logger.With("module", "blockchain"))
-
-	return bcReactor
-}
-
-func newBlockchainReactorPair(
-	t *testing.T,
-	logger log.Logger,
-	genDoc *types.GenesisDoc,
-	privVals []types.PrivValidator,
-	maxBlockHeight int64) BlockchainReactorPair {
-
-	consensusReactor := &consensusReactorTest{}
-	consensusReactor.BaseReactor = *p2p.NewBaseReactor("Consensus reactor", consensusReactor)
-
-	return BlockchainReactorPair{
-		newBlockchainReactor(t, logger, genDoc, privVals, maxBlockHeight),
-		consensusReactor}
-}
-
-type consensusReactorTest struct {
-	p2p.BaseReactor     // BaseService + p2p.Switch
-	switchedToConsensus bool
-	mtx                 sync.Mutex
-}
-
-func (conR *consensusReactorTest) SwitchToConsensus(state sm.State, blocksSynced bool) {
-	conR.mtx.Lock()
-	defer conR.mtx.Unlock()
-	conR.switchedToConsensus = true
-}
-
-func TestFastSyncNoBlockResponse(t *testing.T) {
-
-	config = cfg.ResetTestRoot("blockchain_new_reactor_test")
-	defer os.RemoveAll(config.RootDir)
-	genDoc, privVals := randGenesisDoc(1, false, 30)
-
-	maxBlockHeight := int64(65)
-
-	reactorPairs := make([]BlockchainReactorPair, 2)
-
-	logger := log.TestingLogger()
-	reactorPairs[0] = newBlockchainReactorPair(t, logger, genDoc, privVals, maxBlockHeight)
-	reactorPairs[1] = newBlockchainReactorPair(t, logger, genDoc, privVals, 0)
-
-	p2p.MakeConnectedSwitches(config.P2P, 2, func(i int, s *p2p.Switch) *p2p.Switch {
-		s.AddReactor("BLOCKCHAIN", reactorPairs[i].bcR)
-		s.AddReactor("CONSENSUS", reactorPairs[i].conR)
-		moduleName := fmt.Sprintf("blockchain-%v", i)
-		reactorPairs[i].bcR.SetLogger(logger.With("module", moduleName))
-
-		return s
-
-	}, p2p.Connect2Switches)
-
-	defer func() {
-		for _, r := range reactorPairs {
-			_ = r.bcR.Stop()
-			_ = r.conR.Stop()
-		}
-	}()
-
-	tests := []struct {
-		height   int64
-		existent bool
-	}{
-		{maxBlockHeight + 2, false},
-		{10, true},
-		{1, true},
-		{maxBlockHeight + 100, false},
-	}
-
-	for {
-		time.Sleep(10 * time.Millisecond)
-		reactorPairs[1].conR.mtx.Lock()
-		if reactorPairs[1].conR.switchedToConsensus {
-			reactorPairs[1].conR.mtx.Unlock()
-			break
-		}
-		reactorPairs[1].conR.mtx.Unlock()
-	}
-
-	assert.Equal(t, maxBlockHeight, reactorPairs[0].bcR.store.Height())
-
-	for _, tt := range tests {
-		block := reactorPairs[1].bcR.store.LoadBlock(tt.height)
-		if tt.existent {
-			assert.True(t, block != nil)
-		} else {
-			assert.True(t, block == nil)
-		}
-	}
-}
-
-// NOTE: This is too hard to test without
-// an easy way to add test peer to switch
-// or without significant refactoring of the module.
-// Alternatively we could actually dial a TCP conn but
-// that seems extreme.
-func TestFastSyncBadBlockStopsPeer(t *testing.T) {
-	numNodes := 4
-	maxBlockHeight := int64(148)
-
-	config = cfg.ResetTestRoot("blockchain_reactor_test")
-	defer os.RemoveAll(config.RootDir)
-	genDoc, privVals := randGenesisDoc(1, false, 30)
-
-	otherChain := newBlockchainReactorPair(t, log.TestingLogger(), genDoc, privVals, maxBlockHeight)
-	defer func() {
-		_ = otherChain.bcR.Stop()
-		_ = otherChain.conR.Stop()
-	}()
-
-	reactorPairs := make([]BlockchainReactorPair, numNodes)
-	logger := make([]log.Logger, numNodes)
-
-	for i := 0; i < numNodes; i++ {
-		logger[i] = log.TestingLogger()
-		height := int64(0)
-		if i == 0 {
-			height = maxBlockHeight
-		}
-		reactorPairs[i] = newBlockchainReactorPair(t, logger[i], genDoc, privVals, height)
-	}
-
-	switches := p2p.MakeConnectedSwitches(config.P2P, numNodes, func(i int, s *p2p.Switch) *p2p.Switch {
-		reactorPairs[i].conR.mtx.Lock()
-		s.AddReactor("BLOCKCHAIN", reactorPairs[i].bcR)
-		s.AddReactor("CONSENSUS", reactorPairs[i].conR)
-		moduleName := fmt.Sprintf("blockchain-%v", i)
-		reactorPairs[i].bcR.SetLogger(logger[i].With("module", moduleName))
-		reactorPairs[i].conR.mtx.Unlock()
-		return s
-
-	}, p2p.Connect2Switches)
-
-	defer func() {
-		for _, r := range reactorPairs {
-			_ = r.bcR.Stop()
-			_ = r.conR.Stop()
-		}
-	}()
-
-outerFor:
-	for {
-		time.Sleep(10 * time.Millisecond)
-		for i := 0; i < numNodes; i++ {
-			reactorPairs[i].conR.mtx.Lock()
-			if !reactorPairs[i].conR.switchedToConsensus {
-				reactorPairs[i].conR.mtx.Unlock()
-				continue outerFor
-			}
-			reactorPairs[i].conR.mtx.Unlock()
-		}
-		break
-	}
-
-	// at this time, reactors[0-3] is the newest
-	assert.Equal(t, numNodes-1, reactorPairs[1].bcR.Switch.Peers().Size())
-
-	// mark last reactorPair as an invalid peer
-	reactorPairs[numNodes-1].bcR.store = otherChain.bcR.store
-
-	lastLogger := log.TestingLogger()
-	lastReactorPair := newBlockchainReactorPair(t, lastLogger, genDoc, privVals, 0)
-	reactorPairs = append(reactorPairs, lastReactorPair)
-
-	switches = append(switches, p2p.MakeConnectedSwitches(config.P2P, 1, func(i int, s *p2p.Switch) *p2p.Switch {
-		s.AddReactor("BLOCKCHAIN", reactorPairs[len(reactorPairs)-1].bcR)
-		s.AddReactor("CONSENSUS", reactorPairs[len(reactorPairs)-1].conR)
-		moduleName := fmt.Sprintf("blockchain-%v", len(reactorPairs)-1)
-		reactorPairs[len(reactorPairs)-1].bcR.SetLogger(lastLogger.With("module", moduleName))
-		return s
-
-	}, p2p.Connect2Switches)...)
-
-	for i := 0; i < len(reactorPairs)-1; i++ {
-		p2p.Connect2Switches(switches, i, len(reactorPairs)-1)
-	}
-
-	for {
-		time.Sleep(1 * time.Second)
-		lastReactorPair.conR.mtx.Lock()
-		if lastReactorPair.conR.switchedToConsensus {
-			lastReactorPair.conR.mtx.Unlock()
-			break
-		}
-		lastReactorPair.conR.mtx.Unlock()
-
-		if lastReactorPair.bcR.Switch.Peers().Size() == 0 {
-			break
-		}
-	}
-
-	assert.True(t, lastReactorPair.bcR.Switch.Peers().Size() < len(reactorPairs)-1)
-}
-
-//----------------------------------------------
-// utility funcs
-
-func makeTxs(height int64) (txs []types.Tx) {
-	for i := 0; i < 10; i++ {
-		txs = append(txs, types.Tx([]byte{byte(height), byte(i)}))
-	}
-	return txs
-}
-
-func makeBlock(height int64, state sm.State, lastCommit *types.Commit) *types.Block {
-	block, _ := state.MakeBlock(height, makeTxs(height), lastCommit, nil, state.Validators.GetProposer().Address)
-	return block
-}
-
-type testApp struct {
-	abci.BaseApplication
-}

blockchain/v2/io.go

@@ -1,140 +0,0 @@
-package v2
-
-import (
-	"fmt"
-
-	bc "github.com/tendermint/tendermint/blockchain"
-	"github.com/tendermint/tendermint/p2p"
-	bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain"
-	"github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/types"
-)
-
-type iIO interface {
-	sendBlockRequest(peerID p2p.ID, height int64) error
-	sendBlockToPeer(block *types.Block, peerID p2p.ID) error
-	sendBlockNotFound(height int64, peerID p2p.ID) error
-	sendStatusResponse(base, height int64, peerID p2p.ID) error
-
-	broadcastStatusRequest() error
-
-	trySwitchToConsensus(state state.State, skipWAL bool) bool
-}
-
-type switchIO struct {
-	sw *p2p.Switch
-}
-
-func newSwitchIo(sw *p2p.Switch) *switchIO {
-	return &switchIO{
-		sw: sw,
-	}
-}
-
-const (
-	// BlockchainChannel is a channel for blocks and status updates (`BlockStore` height)
-	BlockchainChannel = byte(0x40)
-)
-
-type consensusReactor interface {
-	// for when we switch from blockchain reactor and fast sync to
-	// the consensus machine
-	SwitchToConsensus(state state.State, skipWAL bool)
-}
-
-func (sio *switchIO) sendBlockRequest(peerID p2p.ID, height int64) error {
-	peer := sio.sw.Peers().Get(peerID)
-	if peer == nil {
-		return fmt.Errorf("peer not found")
-	}
-	msgBytes, err := bc.EncodeMsg(&bcproto.BlockRequest{Height: height})
-	if err != nil {
-		return err
-	}
-
-	queued := peer.TrySend(BlockchainChannel, msgBytes)
-	if !queued {
-		return fmt.Errorf("send queue full")
-	}
-	return nil
-}
-
-func (sio *switchIO) sendStatusResponse(base int64, height int64, peerID p2p.ID) error {
-	peer := sio.sw.Peers().Get(peerID)
-	if peer == nil {
-		return fmt.Errorf("peer not found")
-	}
-
-	msgBytes, err := bc.EncodeMsg(&bcproto.StatusResponse{Height: height, Base: base})
-	if err != nil {
-		return err
-	}
-
-	if queued := peer.TrySend(BlockchainChannel, msgBytes); !queued {
-		return fmt.Errorf("peer queue full")
-	}
-
-	return nil
-}
-
-func (sio *switchIO) sendBlockToPeer(block *types.Block, peerID p2p.ID) error {
-	peer := sio.sw.Peers().Get(peerID)
-	if peer == nil {
-		return fmt.Errorf("peer not found")
-	}
-	if block == nil {
-		panic("trying to send nil block")
-	}
-
-	bpb, err := block.ToProto()
-	if err != nil {
-		return err
-	}
-
-	msgBytes, err := bc.EncodeMsg(&bcproto.BlockResponse{Block: bpb})
-	if err != nil {
-		return err
-	}
-	if queued := peer.TrySend(BlockchainChannel, msgBytes); !queued {
-		return fmt.Errorf("peer queue full")
-	}
-
-	return nil
-}
-
-func (sio *switchIO) sendBlockNotFound(height int64, peerID p2p.ID) error {
-	peer := sio.sw.Peers().Get(peerID)
-	if peer == nil {
-		return fmt.Errorf("peer not found")
-	}
-	msgBytes, err := bc.EncodeMsg(&bcproto.NoBlockResponse{Height: height})
-	if err != nil {
-		return err
-	}
-
-	if queued := peer.TrySend(BlockchainChannel, msgBytes); !queued {
-		return fmt.Errorf("peer queue full")
-	}
-
-	return nil
-}
-
-func (sio *switchIO) trySwitchToConsensus(state state.State, skipWAL bool) bool {
-	conR, ok := sio.sw.Reactor("CONSENSUS").(consensusReactor)
-	if ok {
-		conR.SwitchToConsensus(state, skipWAL)
-	}
-	return ok
-}
-
-func (sio *switchIO) broadcastStatusRequest() error {
-	msgBytes, err := bc.EncodeMsg(&bcproto.StatusRequest{})
-	if err != nil {
-		return err
-	}
-
-	// XXX: maybe we should use an io specific peer list here
-	sio.sw.Broadcast(BlockchainChannel, msgBytes)
-
-	return nil
-}

blockchain/v2/metrics.go

@@ -1,125 +0,0 @@
-package v2
-
-import (
-	"github.com/go-kit/kit/metrics"
-	"github.com/go-kit/kit/metrics/discard"
-	"github.com/go-kit/kit/metrics/prometheus"
-	stdprometheus "github.com/prometheus/client_golang/prometheus"
-)
-
-const (
-	// MetricsSubsystem is a subsystem shared by all metrics exposed by this
-	// package.
-	MetricsSubsystem = "blockchain"
-)
-
-// Metrics contains metrics exposed by this package.
-type Metrics struct {
-	// events_in
-	EventsIn metrics.Counter
-	// events_in
-	EventsHandled metrics.Counter
-	// events_out
-	EventsOut metrics.Counter
-	// errors_in
-	ErrorsIn metrics.Counter
-	// errors_handled
-	ErrorsHandled metrics.Counter
-	// errors_out
-	ErrorsOut metrics.Counter
-	// events_shed
-	EventsShed metrics.Counter
-	// events_sent
-	EventsSent metrics.Counter
-	// errors_sent
-	ErrorsSent metrics.Counter
-	// errors_shed
-	ErrorsShed metrics.Counter
-}
-
-// PrometheusMetrics returns metrics for in and out events, errors, etc. handled by routines.
-// Can we burn in the routine name here?
-func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics {
-	labels := []string{}
-	for i := 0; i < len(labelsAndValues); i += 2 {
-		labels = append(labels, labelsAndValues[i])
-	}
-	return &Metrics{
-		EventsIn: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "events_in",
-			Help:      "Events read from the channel.",
-		}, labels).With(labelsAndValues...),
-		EventsHandled: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "events_handled",
-			Help:      "Events handled",
-		}, labels).With(labelsAndValues...),
-		EventsOut: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "events_out",
-			Help:      "Events output from routine.",
-		}, labels).With(labelsAndValues...),
-		ErrorsIn: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "errors_in",
-			Help:      "Errors read from the channel.",
-		}, labels).With(labelsAndValues...),
-		ErrorsHandled: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "errors_handled",
-			Help:      "Errors handled.",
-		}, labels).With(labelsAndValues...),
-		ErrorsOut: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "errors_out",
-			Help:      "Errors output from routine.",
-		}, labels).With(labelsAndValues...),
-		ErrorsSent: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "errors_sent",
-			Help:      "Errors sent to routine.",
-		}, labels).With(labelsAndValues...),
-		ErrorsShed: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "errors_shed",
-			Help:      "Errors dropped from sending.",
-		}, labels).With(labelsAndValues...),
-		EventsSent: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "events_sent",
-			Help:      "Events sent to routine.",
-		}, labels).With(labelsAndValues...),
-		EventsShed: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "events_shed",
-			Help:      "Events dropped from sending.",
-		}, labels).With(labelsAndValues...),
-	}
-}
-
-// NopMetrics returns no-op Metrics.
-func NopMetrics() *Metrics {
-	return &Metrics{
-		EventsIn:      discard.NewCounter(),
-		EventsHandled: discard.NewCounter(),
-		EventsOut:     discard.NewCounter(),
-		ErrorsIn:      discard.NewCounter(),
-		ErrorsHandled: discard.NewCounter(),
-		ErrorsOut:     discard.NewCounter(),
-		EventsShed:    discard.NewCounter(),
-		EventsSent:    discard.NewCounter(),
-		ErrorsSent:    discard.NewCounter(),
-		ErrorsShed:    discard.NewCounter(),
-	}
-}

blockchain/v2/processor.go

@@ -1,192 +0,0 @@
-package v2
-
-import (
-	"fmt"
-
-	"github.com/tendermint/tendermint/p2p"
-	tmState "github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/types"
-)
-
-// Events generated by the processor:
-// block execution failure, event will indicate the peer(s) that caused the error
-type pcBlockVerificationFailure struct {
-	priorityNormal
-	height       int64
-	firstPeerID  p2p.ID
-	secondPeerID p2p.ID
-}
-
-func (e pcBlockVerificationFailure) String() string {
-	return fmt.Sprintf("pcBlockVerificationFailure{%d 1st peer: %v, 2nd peer: %v}",
-		e.height, e.firstPeerID, e.secondPeerID)
-}
-
-// successful block execution
-type pcBlockProcessed struct {
-	priorityNormal
-	height int64
-	peerID p2p.ID
-}
-
-func (e pcBlockProcessed) String() string {
-	return fmt.Sprintf("pcBlockProcessed{%d peer: %v}", e.height, e.peerID)
-}
-
-// processor has finished
-type pcFinished struct {
-	priorityNormal
-	blocksSynced int
-	tmState      tmState.State
-}
-
-func (p pcFinished) Error() string {
-	return "finished"
-}
-
-type queueItem struct {
-	block  *types.Block
-	peerID p2p.ID
-}
-
-type blockQueue map[int64]queueItem
-
-type pcState struct {
-	// blocks waiting to be processed
-	queue blockQueue
-
-	// draining indicates that the next rProcessBlock event with a queue miss constitutes completion
-	draining bool
-
-	// the number of blocks successfully synced by the processor
-	blocksSynced int
-
-	// the processorContext which contains the processor dependencies
-	context processorContext
-}
-
-func (state *pcState) String() string {
-	return fmt.Sprintf("height: %d queue length: %d draining: %v blocks synced: %d",
-		state.height(), len(state.queue), state.draining, state.blocksSynced)
-}
-
-// newPcState returns a pcState initialized with the last verified block enqueued
-func newPcState(context processorContext) *pcState {
-	return &pcState{
-		queue:        blockQueue{},
-		draining:     false,
-		blocksSynced: 0,
-		context:      context,
-	}
-}
-
-// nextTwo returns the next two unverified blocks
-func (state *pcState) nextTwo() (queueItem, queueItem, error) {
-	if first, ok := state.queue[state.height()+1]; ok {
-		if second, ok := state.queue[state.height()+2]; ok {
-			return first, second, nil
-		}
-	}
-	return queueItem{}, queueItem{}, fmt.Errorf("not found")
-}
-
-// synced returns true when at most the last verified block remains in the queue
-func (state *pcState) synced() bool {
-	return len(state.queue) <= 1
-}
-
-func (state *pcState) enqueue(peerID p2p.ID, block *types.Block, height int64) {
-	if item, ok := state.queue[height]; ok {
-		panic(fmt.Sprintf(
-			"duplicate block %d (%X) enqueued by processor (sent by %v; existing block %X from %v)",
-			height, block.Hash(), peerID, item.block.Hash(), item.peerID))
-	}
-
-	state.queue[height] = queueItem{block: block, peerID: peerID}
-}
-
-func (state *pcState) height() int64 {
-	return state.context.tmState().LastBlockHeight
-}
-
-// purgePeer moves all unprocessed blocks from the queue
-func (state *pcState) purgePeer(peerID p2p.ID) {
-	// what if height is less than state.height?
-	for height, item := range state.queue {
-		if item.peerID == peerID {
-			delete(state.queue, height)
-		}
-	}
-}
-
-// handle processes FSM events
-func (state *pcState) handle(event Event) (Event, error) {
-	switch event := event.(type) {
-	case bcResetState:
-		state.context.setState(event.state)
-		return noOp, nil
-
-	case scFinishedEv:
-		if state.synced() {
-			return pcFinished{tmState: state.context.tmState(), blocksSynced: state.blocksSynced}, nil
-		}
-		state.draining = true
-		return noOp, nil
-
-	case scPeerError:
-		state.purgePeer(event.peerID)
-		return noOp, nil
-
-	case scBlockReceived:
-		if event.block == nil {
-			return noOp, nil
-		}
-
-		// enqueue block if height is higher than state height, else ignore it
-		if event.block.Height > state.height() {
-			state.enqueue(event.peerID, event.block, event.block.Height)
-		}
-		return noOp, nil
-
-	case rProcessBlock:
-		tmState := state.context.tmState()
-		firstItem, secondItem, err := state.nextTwo()
-		if err != nil {
-			if state.draining {
-				return pcFinished{tmState: tmState, blocksSynced: state.blocksSynced}, nil
-			}
-			return noOp, nil
-		}
-
-		var (
-			first, second = firstItem.block, secondItem.block
-			firstParts    = first.MakePartSet(types.BlockPartSizeBytes)
-			firstID       = types.BlockID{Hash: first.Hash(), PartSetHeader: firstParts.Header()}
-		)
-
-		// verify if +second+ last commit "confirms" +first+ block
-		err = state.context.verifyCommit(tmState.ChainID, firstID, first.Height, second.LastCommit)
-		if err != nil {
-			state.purgePeer(firstItem.peerID)
-			if firstItem.peerID != secondItem.peerID {
-				state.purgePeer(secondItem.peerID)
-			}
-			return pcBlockVerificationFailure{
-					height: first.Height, firstPeerID: firstItem.peerID, secondPeerID: secondItem.peerID},
-				nil
-		}
-
-		state.context.saveBlock(first, firstParts, second.LastCommit)
-
-		if err := state.context.applyBlock(firstID, first); err != nil {
-			panic(fmt.Sprintf("failed to process committed block (%d:%X): %v", first.Height, first.Hash(), err))
-		}
-
-		delete(state.queue, first.Height)
-		state.blocksSynced++
-
-		return pcBlockProcessed{height: first.Height, peerID: firstItem.peerID}, nil
-	}
-
-	return noOp, nil
-}

blockchain/v2/processor_context.go

@@ -1,100 +0,0 @@
-package v2
-
-import (
-	"fmt"
-
-	"github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/types"
-)
-
-type processorContext interface {
-	applyBlock(blockID types.BlockID, block *types.Block) error
-	verifyCommit(chainID string, blockID types.BlockID, height int64, commit *types.Commit) error
-	saveBlock(block *types.Block, blockParts *types.PartSet, seenCommit *types.Commit)
-	tmState() state.State
-	setState(state.State)
-}
-
-type pContext struct {
-	store   blockStore
-	applier blockApplier
-	state   state.State
-}
-
-func newProcessorContext(st blockStore, ex blockApplier, s state.State) *pContext {
-	return &pContext{
-		store:   st,
-		applier: ex,
-		state:   s,
-	}
-}
-
-func (pc *pContext) applyBlock(blockID types.BlockID, block *types.Block) error {
-	newState, _, err := pc.applier.ApplyBlock(pc.state, blockID, block)
-	pc.state = newState
-	return err
-}
-
-func (pc pContext) tmState() state.State {
-	return pc.state
-}
-
-func (pc *pContext) setState(state state.State) {
-	pc.state = state
-}
-
-func (pc pContext) verifyCommit(chainID string, blockID types.BlockID, height int64, commit *types.Commit) error {
-	return pc.state.Validators.VerifyCommitLight(chainID, blockID, height, commit)
-}
-
-func (pc *pContext) saveBlock(block *types.Block, blockParts *types.PartSet, seenCommit *types.Commit) {
-	pc.store.SaveBlock(block, blockParts, seenCommit)
-}
-
-type mockPContext struct {
-	applicationBL  []int64
-	verificationBL []int64
-	state          state.State
-}
-
-func newMockProcessorContext(
-	state state.State,
-	verificationBlackList []int64,
-	applicationBlackList []int64) *mockPContext {
-	return &mockPContext{
-		applicationBL:  applicationBlackList,
-		verificationBL: verificationBlackList,
-		state:          state,
-	}
-}
-
-func (mpc *mockPContext) applyBlock(blockID types.BlockID, block *types.Block) error {
-	for _, h := range mpc.applicationBL {
-		if h == block.Height {
-			return fmt.Errorf("generic application error")
-		}
-	}
-	mpc.state.LastBlockHeight = block.Height
-	return nil
-}
-
-func (mpc *mockPContext) verifyCommit(chainID string, blockID types.BlockID, height int64, commit *types.Commit) error {
-	for _, h := range mpc.verificationBL {
-		if h == height {
-			return fmt.Errorf("generic verification error")
-		}
-	}
-	return nil
-}
-
-func (mpc *mockPContext) saveBlock(block *types.Block, blockParts *types.PartSet, seenCommit *types.Commit) {
-
-}
-
-func (mpc *mockPContext) setState(state state.State) {
-	mpc.state = state
-}
-
-func (mpc *mockPContext) tmState() state.State {
-	return mpc.state
-}

blockchain/v2/processor_test.go

@@ -1,306 +0,0 @@
-package v2
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/tendermint/tendermint/p2p"
-	tmState "github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/types"
-)
-
-// pcBlock is a test helper structure with simple types. Its purpose is to help with test readability.
-type pcBlock struct {
-	pid    string
-	height int64
-}
-
-// params is a test structure used to create processor state.
-type params struct {
-	height       int64
-	items        []pcBlock
-	blocksSynced int
-	verBL        []int64
-	appBL        []int64
-	draining     bool
-}
-
-// makePcBlock makes an empty block.
-func makePcBlock(height int64) *types.Block {
-	return &types.Block{Header: types.Header{Height: height}}
-}
-
-// makeState takes test parameters and creates a specific processor state.
-func makeState(p *params) *pcState {
-	var (
-		tmState = tmState.State{LastBlockHeight: p.height}
-		context = newMockProcessorContext(tmState, p.verBL, p.appBL)
-	)
-	state := newPcState(context)
-
-	for _, item := range p.items {
-		state.enqueue(p2p.ID(item.pid), makePcBlock(item.height), item.height)
-	}
-
-	state.blocksSynced = p.blocksSynced
-	state.draining = p.draining
-	return state
-}
-
-func mBlockResponse(peerID p2p.ID, height int64) scBlockReceived {
-	return scBlockReceived{
-		peerID: peerID,
-		block:  makePcBlock(height),
-	}
-}
-
-type pcFsmMakeStateValues struct {
-	currentState  *params
-	event         Event
-	wantState     *params
-	wantNextEvent Event
-	wantErr       error
-	wantPanic     bool
-}
-
-type testFields struct {
-	name  string
-	steps []pcFsmMakeStateValues
-}
-
-func executeProcessorTests(t *testing.T, tests []testFields) {
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			var state *pcState
-			for _, step := range tt.steps {
-				defer func() {
-					r := recover()
-					if (r != nil) != step.wantPanic {
-						t.Errorf("recover = %v, wantPanic = %v", r, step.wantPanic)
-					}
-				}()
-
-				// First step must always initialise the currentState as state.
-				if step.currentState != nil {
-					state = makeState(step.currentState)
-				}
-				if state == nil {
-					panic("Bad (initial?) step")
-				}
-
-				nextEvent, err := state.handle(step.event)
-				t.Log(state)
-				assert.Equal(t, step.wantErr, err)
-				assert.Equal(t, makeState(step.wantState), state)
-				assert.Equal(t, step.wantNextEvent, nextEvent)
-				// Next step may use the wantedState as their currentState.
-				state = makeState(step.wantState)
-			}
-		})
-	}
-}
-
-func TestRProcessPeerError(t *testing.T) {
-	tests := []testFields{
-		{
-			name: "error for existing peer",
-			steps: []pcFsmMakeStateValues{
-				{
-					currentState:  &params{items: []pcBlock{{"P1", 1}, {"P2", 2}}},
-					event:         scPeerError{peerID: "P2"},
-					wantState:     &params{items: []pcBlock{{"P1", 1}}},
-					wantNextEvent: noOp,
-				},
-			},
-		},
-		{
-			name: "error for unknown peer",
-			steps: []pcFsmMakeStateValues{
-				{
-					currentState:  &params{items: []pcBlock{{"P1", 1}, {"P2", 2}}},
-					event:         scPeerError{peerID: "P3"},
-					wantState:     &params{items: []pcBlock{{"P1", 1}, {"P2", 2}}},
-					wantNextEvent: noOp,
-				},
-			},
-		},
-	}
-
-	executeProcessorTests(t, tests)
-}
-
-func TestPcBlockResponse(t *testing.T) {
-	tests := []testFields{
-		{
-			name: "add one block",
-			steps: []pcFsmMakeStateValues{
-				{
-					currentState: &params{}, event: mBlockResponse("P1", 1),
-					wantState: &params{items: []pcBlock{{"P1", 1}}}, wantNextEvent: noOp,
-				},
-			},
-		},
-
-		{
-			name: "add two blocks",
-			steps: []pcFsmMakeStateValues{
-				{
-					currentState: &params{}, event: mBlockResponse("P1", 3),
-					wantState: &params{items: []pcBlock{{"P1", 3}}}, wantNextEvent: noOp,
-				},
-				{ // use previous wantState as currentState,
-					event:     mBlockResponse("P1", 4),
-					wantState: &params{items: []pcBlock{{"P1", 3}, {"P1", 4}}}, wantNextEvent: noOp,
-				},
-			},
-		},
-	}
-
-	executeProcessorTests(t, tests)
-}
-
-func TestRProcessBlockSuccess(t *testing.T) {
-	tests := []testFields{
-		{
-			name: "noop - no blocks over current height",
-			steps: []pcFsmMakeStateValues{
-				{
-					currentState: &params{}, event: rProcessBlock{},
-					wantState: &params{}, wantNextEvent: noOp,
-				},
-			},
-		},
-		{
-			name: "noop - high new blocks",
-			steps: []pcFsmMakeStateValues{
-				{
-					currentState: &params{height: 5, items: []pcBlock{{"P1", 30}, {"P2", 31}}}, event: rProcessBlock{},
-					wantState: &params{height: 5, items: []pcBlock{{"P1", 30}, {"P2", 31}}}, wantNextEvent: noOp,
-				},
-			},
-		},
-		{
-			name: "blocks H+1 and H+2 present",
-			steps: []pcFsmMakeStateValues{
-				{
-					currentState: &params{items: []pcBlock{{"P1", 1}, {"P2", 2}}}, event: rProcessBlock{},
-					wantState:     &params{height: 1, items: []pcBlock{{"P2", 2}}, blocksSynced: 1},
-					wantNextEvent: pcBlockProcessed{height: 1, peerID: "P1"},
-				},
-			},
-		},
-		{
-			name: "blocks H+1 and H+2 present after draining",
-			steps: []pcFsmMakeStateValues{
-				{ // some contiguous blocks - on stop check draining is set
-					currentState:  &params{items: []pcBlock{{"P1", 1}, {"P2", 2}, {"P1", 4}}},
-					event:         scFinishedEv{},
-					wantState:     &params{items: []pcBlock{{"P1", 1}, {"P2", 2}, {"P1", 4}}, draining: true},
-					wantNextEvent: noOp,
-				},
-				{
-					event:         rProcessBlock{},
-					wantState:     &params{height: 1, items: []pcBlock{{"P2", 2}, {"P1", 4}}, blocksSynced: 1, draining: true},
-					wantNextEvent: pcBlockProcessed{height: 1, peerID: "P1"},
-				},
-				{ // finish when H+1 or/and H+2 are missing
-					event:         rProcessBlock{},
-					wantState:     &params{height: 1, items: []pcBlock{{"P2", 2}, {"P1", 4}}, blocksSynced: 1, draining: true},
-					wantNextEvent: pcFinished{tmState: tmState.State{LastBlockHeight: 1}, blocksSynced: 1},
-				},
-			},
-		},
-	}
-
-	executeProcessorTests(t, tests)
-}
-
-func TestRProcessBlockFailures(t *testing.T) {
-	tests := []testFields{
-		{
-			name: "blocks H+1 and H+2 present from different peers - H+1 verification fails ",
-			steps: []pcFsmMakeStateValues{
-				{
-					currentState: &params{items: []pcBlock{{"P1", 1}, {"P2", 2}}, verBL: []int64{1}}, event: rProcessBlock{},
-					wantState:     &params{items: []pcBlock{}, verBL: []int64{1}},
-					wantNextEvent: pcBlockVerificationFailure{height: 1, firstPeerID: "P1", secondPeerID: "P2"},
-				},
-			},
-		},
-		{
-			name: "blocks H+1 and H+2 present from same peer - H+1 applyBlock fails ",
-			steps: []pcFsmMakeStateValues{
-				{
-					currentState: &params{items: []pcBlock{{"P1", 1}, {"P2", 2}}, appBL: []int64{1}}, event: rProcessBlock{},
-					wantState: &params{items: []pcBlock{}, appBL: []int64{1}}, wantPanic: true,
-				},
-			},
-		},
-		{
-			name: "blocks H+1 and H+2 present from same peers - H+1 verification fails ",
-			steps: []pcFsmMakeStateValues{
-				{
-					currentState: &params{height: 0, items: []pcBlock{{"P1", 1}, {"P1", 2}, {"P2", 3}},
-						verBL: []int64{1}}, event: rProcessBlock{},
-					wantState:     &params{height: 0, items: []pcBlock{{"P2", 3}}, verBL: []int64{1}},
-					wantNextEvent: pcBlockVerificationFailure{height: 1, firstPeerID: "P1", secondPeerID: "P1"},
-				},
-			},
-		},
-		{
-			name: "blocks H+1 and H+2 present from different peers - H+1 applyBlock fails ",
-			steps: []pcFsmMakeStateValues{
-				{
-					currentState: &params{items: []pcBlock{{"P1", 1}, {"P2", 2}, {"P2", 3}}, appBL: []int64{1}},
-					event:        rProcessBlock{},
-					wantState:    &params{items: []pcBlock{{"P2", 3}}, appBL: []int64{1}}, wantPanic: true,
-				},
-			},
-		},
-	}
-
-	executeProcessorTests(t, tests)
-}
-
-func TestScFinishedEv(t *testing.T) {
-	tests := []testFields{
-		{
-			name: "no blocks",
-			steps: []pcFsmMakeStateValues{
-				{
-					currentState: &params{height: 100, items: []pcBlock{}, blocksSynced: 100}, event: scFinishedEv{},
-					wantState:     &params{height: 100, items: []pcBlock{}, blocksSynced: 100},
-					wantNextEvent: pcFinished{tmState: tmState.State{LastBlockHeight: 100}, blocksSynced: 100},
-				},
-			},
-		},
-		{
-			name: "maxHeight+1 block present",
-			steps: []pcFsmMakeStateValues{
-				{
-					currentState: &params{height: 100, items: []pcBlock{
-						{"P1", 101}}, blocksSynced: 100}, event: scFinishedEv{},
-					wantState:     &params{height: 100, items: []pcBlock{{"P1", 101}}, blocksSynced: 100},
-					wantNextEvent: pcFinished{tmState: tmState.State{LastBlockHeight: 100}, blocksSynced: 100},
-				},
-			},
-		},
-		{
-			name: "more blocks present",
-			steps: []pcFsmMakeStateValues{
-				{
-					currentState: &params{height: 100, items: []pcBlock{
-						{"P1", 101}, {"P1", 102}}, blocksSynced: 100}, event: scFinishedEv{},
-					wantState: &params{height: 100, items: []pcBlock{
-						{"P1", 101}, {"P1", 102}}, blocksSynced: 100, draining: true},
-					wantNextEvent: noOp,
-					wantErr:       nil,
-				},
-			},
-		},
-	}
-
-	executeProcessorTests(t, tests)
-}

blockchain/v2/reactor.go

@@ -1,564 +0,0 @@
-package v2
-
-import (
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/tendermint/tendermint/behaviour"
-	bc "github.com/tendermint/tendermint/blockchain"
-	"github.com/tendermint/tendermint/libs/log"
-	tmsync "github.com/tendermint/tendermint/libs/sync"
-	"github.com/tendermint/tendermint/p2p"
-	bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain"
-	"github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/types"
-)
-
-const (
-	// chBufferSize is the buffer size of all event channels.
-	chBufferSize int = 1000
-)
-
-type blockStore interface {
-	LoadBlock(height int64) *types.Block
-	SaveBlock(*types.Block, *types.PartSet, *types.Commit)
-	Base() int64
-	Height() int64
-}
-
-// BlockchainReactor handles fast sync protocol.
-type BlockchainReactor struct {
-	p2p.BaseReactor
-
-	fastSync    bool // if true, enable fast sync on start
-	stateSynced bool // set to true when SwitchToFastSync is called by state sync
-	scheduler   *Routine
-	processor   *Routine
-	logger      log.Logger
-
-	mtx           tmsync.RWMutex
-	maxPeerHeight int64
-	syncHeight    int64
-	events        chan Event // non-nil during a fast sync
-
-	reporter behaviour.Reporter
-	io       iIO
-	store    blockStore
-}
-
-//nolint:unused,deadcode
-type blockVerifier interface {
-	VerifyCommit(chainID string, blockID types.BlockID, height int64, commit *types.Commit) error
-}
-
-type blockApplier interface {
-	ApplyBlock(state state.State, blockID types.BlockID, block *types.Block) (state.State, int64, error)
-}
-
-// XXX: unify naming in this package around tmState
-func newReactor(state state.State, store blockStore, reporter behaviour.Reporter,
-	blockApplier blockApplier, fastSync bool) *BlockchainReactor {
-	initHeight := state.LastBlockHeight + 1
-	if initHeight == 1 {
-		initHeight = state.InitialHeight
-	}
-	scheduler := newScheduler(initHeight, time.Now())
-	pContext := newProcessorContext(store, blockApplier, state)
-	// TODO: Fix naming to just newProcesssor
-	// newPcState requires a processorContext
-	processor := newPcState(pContext)
-
-	return &BlockchainReactor{
-		scheduler: newRoutine("scheduler", scheduler.handle, chBufferSize),
-		processor: newRoutine("processor", processor.handle, chBufferSize),
-		store:     store,
-		reporter:  reporter,
-		logger:    log.NewNopLogger(),
-		fastSync:  fastSync,
-	}
-}
-
-// NewBlockchainReactor creates a new reactor instance.
-func NewBlockchainReactor(
-	state state.State,
-	blockApplier blockApplier,
-	store blockStore,
-	fastSync bool) *BlockchainReactor {
-	reporter := behaviour.NewMockReporter()
-	return newReactor(state, store, reporter, blockApplier, fastSync)
-}
-
-// SetSwitch implements Reactor interface.
-func (r *BlockchainReactor) SetSwitch(sw *p2p.Switch) {
-	r.Switch = sw
-	if sw != nil {
-		r.io = newSwitchIo(sw)
-	} else {
-		r.io = nil
-	}
-}
-
-func (r *BlockchainReactor) setMaxPeerHeight(height int64) {
-	r.mtx.Lock()
-	defer r.mtx.Unlock()
-	if height > r.maxPeerHeight {
-		r.maxPeerHeight = height
-	}
-}
-
-func (r *BlockchainReactor) setSyncHeight(height int64) {
-	r.mtx.Lock()
-	defer r.mtx.Unlock()
-	r.syncHeight = height
-}
-
-// SyncHeight returns the height to which the BlockchainReactor has synced.
-func (r *BlockchainReactor) SyncHeight() int64 {
-	r.mtx.RLock()
-	defer r.mtx.RUnlock()
-	return r.syncHeight
-}
-
-// SetLogger sets the logger of the reactor.
-func (r *BlockchainReactor) SetLogger(logger log.Logger) {
-	r.logger = logger
-	r.scheduler.setLogger(logger)
-	r.processor.setLogger(logger)
-}
-
-// Start implements cmn.Service interface
-func (r *BlockchainReactor) Start() error {
-	r.reporter = behaviour.NewSwitchReporter(r.BaseReactor.Switch)
-	if r.fastSync {
-		err := r.startSync(nil)
-		if err != nil {
-			return fmt.Errorf("failed to start fast sync: %w", err)
-		}
-	}
-	return nil
-}
-
-// startSync begins a fast sync, signalled by r.events being non-nil. If state is non-nil,
-// the scheduler and processor is updated with this state on startup.
-func (r *BlockchainReactor) startSync(state *state.State) error {
-	r.mtx.Lock()
-	defer r.mtx.Unlock()
-	if r.events != nil {
-		return errors.New("fast sync already in progress")
-	}
-	r.events = make(chan Event, chBufferSize)
-	go r.scheduler.start()
-	go r.processor.start()
-	if state != nil {
-		<-r.scheduler.ready()
-		<-r.processor.ready()
-		r.scheduler.send(bcResetState{state: *state})
-		r.processor.send(bcResetState{state: *state})
-	}
-	go r.demux(r.events)
-	return nil
-}
-
-// endSync ends a fast sync
-func (r *BlockchainReactor) endSync() {
-	r.mtx.Lock()
-	defer r.mtx.Unlock()
-	if r.events != nil {
-		close(r.events)
-	}
-	r.events = nil
-	r.scheduler.stop()
-	r.processor.stop()
-}
-
-// SwitchToFastSync is called by the state sync reactor when switching to fast sync.
-func (r *BlockchainReactor) SwitchToFastSync(state state.State) error {
-	r.stateSynced = true
-	state = state.Copy()
-	return r.startSync(&state)
-}
-
-// reactor generated ticker events:
-// ticker for cleaning peers
-type rTryPrunePeer struct {
-	priorityHigh
-	time time.Time
-}
-
-func (e rTryPrunePeer) String() string {
-	return fmt.Sprintf("rTryPrunePeer{%v}", e.time)
-}
-
-// ticker event for scheduling block requests
-type rTrySchedule struct {
-	priorityHigh
-	time time.Time
-}
-
-func (e rTrySchedule) String() string {
-	return fmt.Sprintf("rTrySchedule{%v}", e.time)
-}
-
-// ticker for block processing
-type rProcessBlock struct {
-	priorityNormal
-}
-
-func (e rProcessBlock) String() string {
-	return "rProcessBlock"
-}
-
-// reactor generated events based on blockchain related messages from peers:
-// blockResponse message received from a peer
-type bcBlockResponse struct {
-	priorityNormal
-	time   time.Time
-	peerID p2p.ID
-	size   int64
-	block  *types.Block
-}
-
-func (resp bcBlockResponse) String() string {
-	return fmt.Sprintf("bcBlockResponse{%d#%X (size: %d bytes) from %v at %v}",
-		resp.block.Height, resp.block.Hash(), resp.size, resp.peerID, resp.time)
-}
-
-// blockNoResponse message received from a peer
-type bcNoBlockResponse struct {
-	priorityNormal
-	time   time.Time
-	peerID p2p.ID
-	height int64
-}
-
-func (resp bcNoBlockResponse) String() string {
-	return fmt.Sprintf("bcNoBlockResponse{%v has no block at height %d at %v}",
-		resp.peerID, resp.height, resp.time)
-}
-
-// statusResponse message received from a peer
-type bcStatusResponse struct {
-	priorityNormal
-	time   time.Time
-	peerID p2p.ID
-	base   int64
-	height int64
-}
-
-func (resp bcStatusResponse) String() string {
-	return fmt.Sprintf("bcStatusResponse{%v is at height %d (base: %d) at %v}",
-		resp.peerID, resp.height, resp.base, resp.time)
-}
-
-// new peer is connected
-type bcAddNewPeer struct {
-	priorityNormal
-	peerID p2p.ID
-}
-
-func (resp bcAddNewPeer) String() string {
-	return fmt.Sprintf("bcAddNewPeer{%v}", resp.peerID)
-}
-
-// existing peer is removed
-type bcRemovePeer struct {
-	priorityHigh
-	peerID p2p.ID
-	reason interface{}
-}
-
-func (resp bcRemovePeer) String() string {
-	return fmt.Sprintf("bcRemovePeer{%v due to %v}", resp.peerID, resp.reason)
-}
-
-// resets the scheduler and processor state, e.g. following a switch from state syncing
-type bcResetState struct {
-	priorityHigh
-	state state.State
-}
-
-func (e bcResetState) String() string {
-	return fmt.Sprintf("bcResetState{%v}", e.state)
-}
-
-// Takes the channel as a parameter to avoid race conditions on r.events.
-func (r *BlockchainReactor) demux(events <-chan Event) {
-	var lastRate = 0.0
-	var lastHundred = time.Now()
-
-	var (
-		processBlockFreq = 20 * time.Millisecond
-		doProcessBlockCh = make(chan struct{}, 1)
-		doProcessBlockTk = time.NewTicker(processBlockFreq)
-	)
-	defer doProcessBlockTk.Stop()
-
-	var (
-		prunePeerFreq = 1 * time.Second
-		doPrunePeerCh = make(chan struct{}, 1)
-		doPrunePeerTk = time.NewTicker(prunePeerFreq)
-	)
-	defer doPrunePeerTk.Stop()
-
-	var (
-		scheduleFreq = 20 * time.Millisecond
-		doScheduleCh = make(chan struct{}, 1)
-		doScheduleTk = time.NewTicker(scheduleFreq)
-	)
-	defer doScheduleTk.Stop()
-
-	var (
-		statusFreq = 10 * time.Second
-		doStatusCh = make(chan struct{}, 1)
-		doStatusTk = time.NewTicker(statusFreq)
-	)
-	defer doStatusTk.Stop()
-	doStatusCh <- struct{}{} // immediately broadcast to get status of existing peers
-
-	// XXX: Extract timers to make testing atemporal
-	for {
-		select {
-		// Pacers: send at most per frequency but don't saturate
-		case <-doProcessBlockTk.C:
-			select {
-			case doProcessBlockCh <- struct{}{}:
-			default:
-			}
-		case <-doPrunePeerTk.C:
-			select {
-			case doPrunePeerCh <- struct{}{}:
-			default:
-			}
-		case <-doScheduleTk.C:
-			select {
-			case doScheduleCh <- struct{}{}:
-			default:
-			}
-		case <-doStatusTk.C:
-			select {
-			case doStatusCh <- struct{}{}:
-			default:
-			}
-
-		// Tickers: perform tasks periodically
-		case <-doScheduleCh:
-			r.scheduler.send(rTrySchedule{time: time.Now()})
-		case <-doPrunePeerCh:
-			r.scheduler.send(rTryPrunePeer{time: time.Now()})
-		case <-doProcessBlockCh:
-			r.processor.send(rProcessBlock{})
-		case <-doStatusCh:
-			if err := r.io.broadcastStatusRequest(); err != nil {
-				r.logger.Error("Error broadcasting status request", "err", err)
-			}
-
-		// Events from peers. Closing the channel signals event loop termination.
-		case event, ok := <-events:
-			if !ok {
-				r.logger.Info("Stopping event processing")
-				return
-			}
-			switch event := event.(type) {
-			case bcStatusResponse:
-				r.setMaxPeerHeight(event.height)
-				r.scheduler.send(event)
-			case bcAddNewPeer, bcRemovePeer, bcBlockResponse, bcNoBlockResponse:
-				r.scheduler.send(event)
-			default:
-				r.logger.Error("Received unexpected event", "event", fmt.Sprintf("%T", event))
-			}
-
-		// Incremental events from scheduler
-		case event := <-r.scheduler.next():
-			switch event := event.(type) {
-			case scBlockReceived:
-				r.processor.send(event)
-			case scPeerError:
-				r.processor.send(event)
-				if err := r.reporter.Report(behaviour.BadMessage(event.peerID, "scPeerError")); err != nil {
-					r.logger.Error("Error reporting peer", "err", err)
-				}
-			case scBlockRequest:
-				if err := r.io.sendBlockRequest(event.peerID, event.height); err != nil {
-					r.logger.Error("Error sending block request", "err", err)
-				}
-			case scFinishedEv:
-				r.processor.send(event)
-				r.scheduler.stop()
-			case scSchedulerFail:
-				r.logger.Error("Scheduler failure", "err", event.reason.Error())
-			case scPeersPruned:
-				// Remove peers from the processor.
-				for _, peerID := range event.peers {
-					r.processor.send(scPeerError{peerID: peerID, reason: errors.New("peer was pruned")})
-				}
-				r.logger.Debug("Pruned peers", "count", len(event.peers))
-			case noOpEvent:
-			default:
-				r.logger.Error("Received unexpected scheduler event", "event", fmt.Sprintf("%T", event))
-			}
-
-		// Incremental events from processor
-		case event := <-r.processor.next():
-			switch event := event.(type) {
-			case pcBlockProcessed:
-				r.setSyncHeight(event.height)
-				if r.syncHeight%100 == 0 {
-					lastRate = 0.9*lastRate + 0.1*(100/time.Since(lastHundred).Seconds())
-					r.logger.Info("Fast Sync Rate", "height", r.syncHeight,
-						"max_peer_height", r.maxPeerHeight, "blocks/s", lastRate)
-					lastHundred = time.Now()
-				}
-				r.scheduler.send(event)
-			case pcBlockVerificationFailure:
-				r.scheduler.send(event)
-			case pcFinished:
-				r.logger.Info("Fast sync complete, switching to consensus")
-				if !r.io.trySwitchToConsensus(event.tmState, event.blocksSynced > 0 || r.stateSynced) {
-					r.logger.Error("Failed to switch to consensus reactor")
-				}
-				r.endSync()
-				return
-			case noOpEvent:
-			default:
-				r.logger.Error("Received unexpected processor event", "event", fmt.Sprintf("%T", event))
-			}
-
-		// Terminal event from scheduler
-		case err := <-r.scheduler.final():
-			switch err {
-			case nil:
-				r.logger.Info("Scheduler stopped")
-			default:
-				r.logger.Error("Scheduler aborted with error", "err", err)
-			}
-
-		// Terminal event from processor
-		case err := <-r.processor.final():
-			switch err {
-			case nil:
-				r.logger.Info("Processor stopped")
-			default:
-				r.logger.Error("Processor aborted with error", "err", err)
-			}
-		}
-	}
-}
-
-// Stop implements cmn.Service interface.
-func (r *BlockchainReactor) Stop() error {
-	r.logger.Info("reactor stopping")
-	r.endSync()
-	r.logger.Info("reactor stopped")
-	return nil
-}
-
-// Receive implements Reactor by handling different message types.
-func (r *BlockchainReactor) Receive(chID byte, src p2p.Peer, msgBytes []byte) {
-	msg, err := bc.DecodeMsg(msgBytes)
-	if err != nil {
-		r.logger.Error("error decoding message",
-			"src", src.ID(), "chId", chID, "msg", msg, "err", err)
-		_ = r.reporter.Report(behaviour.BadMessage(src.ID(), err.Error()))
-		return
-	}
-
-	if err = bc.ValidateMsg(msg); err != nil {
-		r.logger.Error("peer sent us invalid msg", "peer", src, "msg", msg, "err", err)
-		_ = r.reporter.Report(behaviour.BadMessage(src.ID(), err.Error()))
-		return
-	}
-
-	r.logger.Debug("Receive", "src", src.ID(), "chID", chID, "msg", msg)
-
-	switch msg := msg.(type) {
-	case *bcproto.StatusRequest:
-		if err := r.io.sendStatusResponse(r.store.Base(), r.store.Height(), src.ID()); err != nil {
-			r.logger.Error("Could not send status message to peer", "src", src)
-		}
-
-	case *bcproto.BlockRequest:
-		block := r.store.LoadBlock(msg.Height)
-		if block != nil {
-			if err = r.io.sendBlockToPeer(block, src.ID()); err != nil {
-				r.logger.Error("Could not send block message to peer: ", err)
-			}
-		} else {
-			r.logger.Info("peer asking for a block we don't have", "src", src, "height", msg.Height)
-			peerID := src.ID()
-			if err = r.io.sendBlockNotFound(msg.Height, peerID); err != nil {
-				r.logger.Error("Couldn't send block not found: ", err)
-			}
-		}
-
-	case *bcproto.StatusResponse:
-		r.mtx.RLock()
-		if r.events != nil {
-			r.events <- bcStatusResponse{peerID: src.ID(), base: msg.Base, height: msg.Height}
-		}
-		r.mtx.RUnlock()
-
-	case *bcproto.BlockResponse:
-		bi, err := types.BlockFromProto(msg.Block)
-		if err != nil {
-			r.logger.Error("error transitioning block from protobuf", "err", err)
-			return
-		}
-		r.mtx.RLock()
-		if r.events != nil {
-			r.events <- bcBlockResponse{
-				peerID: src.ID(),
-				block:  bi,
-				size:   int64(len(msgBytes)),
-				time:   time.Now(),
-			}
-		}
-		r.mtx.RUnlock()
-
-	case *bcproto.NoBlockResponse:
-		r.mtx.RLock()
-		if r.events != nil {
-			r.events <- bcNoBlockResponse{peerID: src.ID(), height: msg.Height, time: time.Now()}
-		}
-		r.mtx.RUnlock()
-	}
-}
-
-// AddPeer implements Reactor interface
-func (r *BlockchainReactor) AddPeer(peer p2p.Peer) {
-	err := r.io.sendStatusResponse(r.store.Base(), r.store.Height(), peer.ID())
-	if err != nil {
-		r.logger.Error("Could not send status message to peer new", "src", peer.ID, "height", r.SyncHeight())
-	}
-	r.mtx.RLock()
-	defer r.mtx.RUnlock()
-	if r.events != nil {
-		r.events <- bcAddNewPeer{peerID: peer.ID()}
-	}
-}
-
-// RemovePeer implements Reactor interface.
-func (r *BlockchainReactor) RemovePeer(peer p2p.Peer, reason interface{}) {
-	r.mtx.RLock()
-	defer r.mtx.RUnlock()
-	if r.events != nil {
-		r.events <- bcRemovePeer{
-			peerID: peer.ID(),
-			reason: reason,
-		}
-	}
-}
-
-// GetChannels implements Reactor
-func (r *BlockchainReactor) GetChannels() []*p2p.ChannelDescriptor {
-	return []*p2p.ChannelDescriptor{
-		{
-			ID:                  BlockchainChannel,
-			Priority:            5,
-			SendQueueCapacity:   2000,
-			RecvBufferCapacity:  50 * 4096,
-			RecvMessageCapacity: bc.MaxMsgSize,
-		},
-	}
-}

blockchain/v2/reactor_test.go

@@ -1,555 +0,0 @@
-package v2
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"sort"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	dbm "github.com/tendermint/tm-db"
-
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/behaviour"
-	bc "github.com/tendermint/tendermint/blockchain"
-	cfg "github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/libs/service"
-	"github.com/tendermint/tendermint/mempool/mock"
-	"github.com/tendermint/tendermint/p2p"
-	"github.com/tendermint/tendermint/p2p/conn"
-	bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain"
-	"github.com/tendermint/tendermint/proxy"
-	sm "github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/store"
-	"github.com/tendermint/tendermint/types"
-	tmtime "github.com/tendermint/tendermint/types/time"
-)
-
-type mockPeer struct {
-	service.Service
-	id p2p.ID
-}
-
-func (mp mockPeer) FlushStop()           {}
-func (mp mockPeer) ID() p2p.ID           { return mp.id }
-func (mp mockPeer) RemoteIP() net.IP     { return net.IP{} }
-func (mp mockPeer) RemoteAddr() net.Addr { return &net.TCPAddr{IP: mp.RemoteIP(), Port: 8800} }
-
-func (mp mockPeer) IsOutbound() bool   { return true }
-func (mp mockPeer) IsPersistent() bool { return true }
-func (mp mockPeer) CloseConn() error   { return nil }
-
-func (mp mockPeer) NodeInfo() p2p.NodeInfo {
-	return p2p.DefaultNodeInfo{
-		DefaultNodeID: "",
-		ListenAddr:    "",
-	}
-}
-func (mp mockPeer) Status() conn.ConnectionStatus { return conn.ConnectionStatus{} }
-func (mp mockPeer) SocketAddr() *p2p.NetAddress   { return &p2p.NetAddress{} }
-
-func (mp mockPeer) Send(byte, []byte) bool    { return true }
-func (mp mockPeer) TrySend(byte, []byte) bool { return true }
-
-func (mp mockPeer) Set(string, interface{}) {}
-func (mp mockPeer) Get(string) interface{}  { return struct{}{} }
-
-// nolint:unused // ignore
-type mockBlockStore struct {
-	blocks map[int64]*types.Block
-}
-
-// nolint:unused // ignore
-func (ml *mockBlockStore) Height() int64 {
-	return int64(len(ml.blocks))
-}
-
-// nolint:unused // ignore
-func (ml *mockBlockStore) LoadBlock(height int64) *types.Block {
-	return ml.blocks[height]
-}
-
-// nolint:unused // ignore
-func (ml *mockBlockStore) SaveBlock(block *types.Block, part *types.PartSet, commit *types.Commit) {
-	ml.blocks[block.Height] = block
-}
-
-type mockBlockApplier struct {
-}
-
-// XXX: Add whitelist/blacklist?
-func (mba *mockBlockApplier) ApplyBlock(
-	state sm.State, blockID types.BlockID, block *types.Block,
-) (sm.State, int64, error) {
-	state.LastBlockHeight++
-	return state, 0, nil
-}
-
-type mockSwitchIo struct {
-	mtx                 sync.Mutex
-	switchedToConsensus bool
-	numStatusResponse   int
-	numBlockResponse    int
-	numNoBlockResponse  int
-}
-
-func (sio *mockSwitchIo) sendBlockRequest(peerID p2p.ID, height int64) error {
-	return nil
-}
-
-func (sio *mockSwitchIo) sendStatusResponse(base, height int64, peerID p2p.ID) error {
-	sio.mtx.Lock()
-	defer sio.mtx.Unlock()
-	sio.numStatusResponse++
-	return nil
-}
-
-func (sio *mockSwitchIo) sendBlockToPeer(block *types.Block, peerID p2p.ID) error {
-	sio.mtx.Lock()
-	defer sio.mtx.Unlock()
-	sio.numBlockResponse++
-	return nil
-}
-
-func (sio *mockSwitchIo) sendBlockNotFound(height int64, peerID p2p.ID) error {
-	sio.mtx.Lock()
-	defer sio.mtx.Unlock()
-	sio.numNoBlockResponse++
-	return nil
-}
-
-func (sio *mockSwitchIo) trySwitchToConsensus(state sm.State, skipWAL bool) bool {
-	sio.mtx.Lock()
-	defer sio.mtx.Unlock()
-	sio.switchedToConsensus = true
-	return true
-}
-
-func (sio *mockSwitchIo) broadcastStatusRequest() error {
-	return nil
-}
-
-type testReactorParams struct {
-	logger      log.Logger
-	genDoc      *types.GenesisDoc
-	privVals    []types.PrivValidator
-	startHeight int64
-	mockA       bool
-}
-
-func newTestReactor(p testReactorParams) *BlockchainReactor {
-	store, state, _ := newReactorStore(p.genDoc, p.privVals, p.startHeight)
-	reporter := behaviour.NewMockReporter()
-
-	var appl blockApplier
-
-	if p.mockA {
-		appl = &mockBlockApplier{}
-	} else {
-		app := &testApp{}
-		cc := proxy.NewLocalClientCreator(app)
-		proxyApp := proxy.NewAppConns(cc)
-		err := proxyApp.Start()
-		if err != nil {
-			panic(fmt.Errorf("error start app: %w", err))
-		}
-		db := dbm.NewMemDB()
-		stateStore := sm.NewStore(db)
-		appl = sm.NewBlockExecutor(stateStore, p.logger, proxyApp.Consensus(), mock.Mempool{}, sm.EmptyEvidencePool{})
-		if err = stateStore.Save(state); err != nil {
-			panic(err)
-		}
-	}
-
-	r := newReactor(state, store, reporter, appl, true)
-	logger := log.TestingLogger()
-	r.SetLogger(logger.With("module", "blockchain"))
-
-	return r
-}
-
-// This test is left here and not deleted to retain the termination cases for
-// future improvement in [#4482](https://github.com/tendermint/tendermint/issues/4482).
-// func TestReactorTerminationScenarios(t *testing.T) {
-
-// 	config := cfg.ResetTestRoot("blockchain_reactor_v2_test")
-// 	defer os.RemoveAll(config.RootDir)
-// 	genDoc, privVals := randGenesisDoc(config.ChainID(), 1, false, 30)
-// 	refStore, _, _ := newReactorStore(genDoc, privVals, 20)
-
-// 	params := testReactorParams{
-// 		logger:      log.TestingLogger(),
-// 		genDoc:      genDoc,
-// 		privVals:    privVals,
-// 		startHeight: 10,
-// 		bufferSize:  100,
-// 		mockA:       true,
-// 	}
-
-// 	type testEvent struct {
-// 		evType string
-// 		peer   string
-// 		height int64
-// 	}
-
-// 	tests := []struct {
-// 		name   string
-// 		params testReactorParams
-// 		msgs   []testEvent
-// 	}{
-// 		{
-// 			name:   "simple termination on max peer height - one peer",
-// 			params: params,
-// 			msgs: []testEvent{
-// 				{evType: "AddPeer", peer: "P1"},
-// 				{evType: "ReceiveS", peer: "P1", height: 13},
-// 				{evType: "BlockReq"},
-// 				{evType: "ReceiveB", peer: "P1", height: 11},
-// 				{evType: "BlockReq"},
-// 				{evType: "BlockReq"},
-// 				{evType: "ReceiveB", peer: "P1", height: 12},
-// 				{evType: "Process"},
-// 				{evType: "ReceiveB", peer: "P1", height: 13},
-// 				{evType: "Process"},
-// 			},
-// 		},
-// 		{
-// 			name:   "simple termination on max peer height - two peers",
-// 			params: params,
-// 			msgs: []testEvent{
-// 				{evType: "AddPeer", peer: "P1"},
-// 				{evType: "AddPeer", peer: "P2"},
-// 				{evType: "ReceiveS", peer: "P1", height: 13},
-// 				{evType: "ReceiveS", peer: "P2", height: 15},
-// 				{evType: "BlockReq"},
-// 				{evType: "BlockReq"},
-// 				{evType: "ReceiveB", peer: "P1", height: 11},
-// 				{evType: "ReceiveB", peer: "P2", height: 12},
-// 				{evType: "Process"},
-// 				{evType: "BlockReq"},
-// 				{evType: "BlockReq"},
-// 				{evType: "ReceiveB", peer: "P1", height: 13},
-// 				{evType: "Process"},
-// 				{evType: "ReceiveB", peer: "P2", height: 14},
-// 				{evType: "Process"},
-// 				{evType: "BlockReq"},
-// 				{evType: "ReceiveB", peer: "P2", height: 15},
-// 				{evType: "Process"},
-// 			},
-// 		},
-// 		{
-// 			name:   "termination on max peer height - two peers, noBlock error",
-// 			params: params,
-// 			msgs: []testEvent{
-// 				{evType: "AddPeer", peer: "P1"},
-// 				{evType: "AddPeer", peer: "P2"},
-// 				{evType: "ReceiveS", peer: "P1", height: 13},
-// 				{evType: "ReceiveS", peer: "P2", height: 15},
-// 				{evType: "BlockReq"},
-// 				{evType: "BlockReq"},
-// 				{evType: "ReceiveNB", peer: "P1", height: 11},
-// 				{evType: "BlockReq"},
-// 				{evType: "ReceiveB", peer: "P2", height: 12},
-// 				{evType: "ReceiveB", peer: "P2", height: 11},
-// 				{evType: "Process"},
-// 				{evType: "BlockReq"},
-// 				{evType: "BlockReq"},
-// 				{evType: "ReceiveB", peer: "P2", height: 13},
-// 				{evType: "Process"},
-// 				{evType: "ReceiveB", peer: "P2", height: 14},
-// 				{evType: "Process"},
-// 				{evType: "BlockReq"},
-// 				{evType: "ReceiveB", peer: "P2", height: 15},
-// 				{evType: "Process"},
-// 			},
-// 		},
-// 		{
-// 			name:   "termination on max peer height - two peers, remove one peer",
-// 			params: params,
-// 			msgs: []testEvent{
-// 				{evType: "AddPeer", peer: "P1"},
-// 				{evType: "AddPeer", peer: "P2"},
-// 				{evType: "ReceiveS", peer: "P1", height: 13},
-// 				{evType: "ReceiveS", peer: "P2", height: 15},
-// 				{evType: "BlockReq"},
-// 				{evType: "BlockReq"},
-// 				{evType: "RemovePeer", peer: "P1"},
-// 				{evType: "BlockReq"},
-// 				{evType: "ReceiveB", peer: "P2", height: 12},
-// 				{evType: "ReceiveB", peer: "P2", height: 11},
-// 				{evType: "Process"},
-// 				{evType: "BlockReq"},
-// 				{evType: "BlockReq"},
-// 				{evType: "ReceiveB", peer: "P2", height: 13},
-// 				{evType: "Process"},
-// 				{evType: "ReceiveB", peer: "P2", height: 14},
-// 				{evType: "Process"},
-// 				{evType: "BlockReq"},
-// 				{evType: "ReceiveB", peer: "P2", height: 15},
-// 				{evType: "Process"},
-// 			},
-// 		},
-// 	}
-
-// 	for _, tt := range tests {
-// 		tt := tt
-// 		t.Run(tt.name, func(t *testing.T) {
-// 			reactor := newTestReactor(params)
-// 			reactor.Start()
-// 			reactor.reporter = behaviour.NewMockReporter()
-// 			mockSwitch := &mockSwitchIo{switchedToConsensus: false}
-// 			reactor.io = mockSwitch
-// 			// time for go routines to start
-// 			time.Sleep(time.Millisecond)
-
-// 			for _, step := range tt.msgs {
-// 				switch step.evType {
-// 				case "AddPeer":
-// 					reactor.scheduler.send(bcAddNewPeer{peerID: p2p.ID(step.peer)})
-// 				case "RemovePeer":
-// 					reactor.scheduler.send(bcRemovePeer{peerID: p2p.ID(step.peer)})
-// 				case "ReceiveS":
-// 					reactor.scheduler.send(bcStatusResponse{
-// 						peerID: p2p.ID(step.peer),
-// 						height: step.height,
-// 						time:   time.Now(),
-// 					})
-// 				case "ReceiveB":
-// 					reactor.scheduler.send(bcBlockResponse{
-// 						peerID: p2p.ID(step.peer),
-// 						block:  refStore.LoadBlock(step.height),
-// 						size:   10,
-// 						time:   time.Now(),
-// 					})
-// 				case "ReceiveNB":
-// 					reactor.scheduler.send(bcNoBlockResponse{
-// 						peerID: p2p.ID(step.peer),
-// 						height: step.height,
-// 						time:   time.Now(),
-// 					})
-// 				case "BlockReq":
-// 					reactor.scheduler.send(rTrySchedule{time: time.Now()})
-// 				case "Process":
-// 					reactor.processor.send(rProcessBlock{})
-// 				}
-// 				// give time for messages to propagate between routines
-// 				time.Sleep(time.Millisecond)
-// 			}
-
-// 			// time for processor to finish and reactor to switch to consensus
-// 			time.Sleep(20 * time.Millisecond)
-// 			assert.True(t, mockSwitch.hasSwitchedToConsensus())
-// 			reactor.Stop()
-// 		})
-// 	}
-// }
-
-func TestReactorHelperMode(t *testing.T) {
-	var (
-		channelID = byte(0x40)
-	)
-
-	config := cfg.ResetTestRoot("blockchain_reactor_v2_test")
-	defer os.RemoveAll(config.RootDir)
-	genDoc, privVals := randGenesisDoc(config.ChainID(), 1, false, 30)
-
-	params := testReactorParams{
-		logger:      log.TestingLogger(),
-		genDoc:      genDoc,
-		privVals:    privVals,
-		startHeight: 20,
-		mockA:       true,
-	}
-
-	type testEvent struct {
-		peer  string
-		event interface{}
-	}
-
-	tests := []struct {
-		name   string
-		params testReactorParams
-		msgs   []testEvent
-	}{
-		{
-			name:   "status request",
-			params: params,
-			msgs: []testEvent{
-				{"P1", bcproto.StatusRequest{}},
-				{"P1", bcproto.BlockRequest{Height: 13}},
-				{"P1", bcproto.BlockRequest{Height: 20}},
-				{"P1", bcproto.BlockRequest{Height: 22}},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			reactor := newTestReactor(params)
-			mockSwitch := &mockSwitchIo{switchedToConsensus: false}
-			reactor.io = mockSwitch
-			err := reactor.Start()
-			require.NoError(t, err)
-
-			for i := 0; i < len(tt.msgs); i++ {
-				step := tt.msgs[i]
-				switch ev := step.event.(type) {
-				case bcproto.StatusRequest:
-					old := mockSwitch.numStatusResponse
-					msg, err := bc.EncodeMsg(&ev)
-					assert.NoError(t, err)
-					reactor.Receive(channelID, mockPeer{id: p2p.ID(step.peer)}, msg)
-					assert.Equal(t, old+1, mockSwitch.numStatusResponse)
-				case bcproto.BlockRequest:
-					if ev.Height > params.startHeight {
-						old := mockSwitch.numNoBlockResponse
-						msg, err := bc.EncodeMsg(&ev)
-						assert.NoError(t, err)
-						reactor.Receive(channelID, mockPeer{id: p2p.ID(step.peer)}, msg)
-						assert.Equal(t, old+1, mockSwitch.numNoBlockResponse)
-					} else {
-						old := mockSwitch.numBlockResponse
-						msg, err := bc.EncodeMsg(&ev)
-						assert.NoError(t, err)
-						assert.NoError(t, err)
-						reactor.Receive(channelID, mockPeer{id: p2p.ID(step.peer)}, msg)
-						assert.Equal(t, old+1, mockSwitch.numBlockResponse)
-					}
-				}
-			}
-			err = reactor.Stop()
-			require.NoError(t, err)
-		})
-	}
-}
-
-func TestReactorSetSwitchNil(t *testing.T) {
-	config := cfg.ResetTestRoot("blockchain_reactor_v2_test")
-	defer os.RemoveAll(config.RootDir)
-	genDoc, privVals := randGenesisDoc(config.ChainID(), 1, false, 30)
-
-	reactor := newTestReactor(testReactorParams{
-		logger:   log.TestingLogger(),
-		genDoc:   genDoc,
-		privVals: privVals,
-	})
-	reactor.SetSwitch(nil)
-
-	assert.Nil(t, reactor.Switch)
-	assert.Nil(t, reactor.io)
-}
-
-//----------------------------------------------
-// utility funcs
-
-func makeTxs(height int64) (txs []types.Tx) {
-	for i := 0; i < 10; i++ {
-		txs = append(txs, types.Tx([]byte{byte(height), byte(i)}))
-	}
-	return txs
-}
-
-func makeBlock(height int64, state sm.State, lastCommit *types.Commit) *types.Block {
-	block, _ := state.MakeBlock(height, makeTxs(height), lastCommit, nil, state.Validators.GetProposer().Address)
-	return block
-}
-
-type testApp struct {
-	abci.BaseApplication
-}
-
-func randGenesisDoc(chainID string, numValidators int, randPower bool, minPower int64) (
-	*types.GenesisDoc, []types.PrivValidator) {
-	validators := make([]types.GenesisValidator, numValidators)
-	privValidators := make([]types.PrivValidator, numValidators)
-	for i := 0; i < numValidators; i++ {
-		val, privVal := types.RandValidator(randPower, minPower)
-		validators[i] = types.GenesisValidator{
-			PubKey: val.PubKey,
-			Power:  val.VotingPower,
-		}
-		privValidators[i] = privVal
-	}
-	sort.Sort(types.PrivValidatorsByAddress(privValidators))
-
-	return &types.GenesisDoc{
-		GenesisTime: tmtime.Now(),
-		ChainID:     chainID,
-		Validators:  validators,
-	}, privValidators
-}
-
-// Why are we importing the entire blockExecutor dependency graph here
-// when we have the facilities to
-func newReactorStore(
-	genDoc *types.GenesisDoc,
-	privVals []types.PrivValidator,
-	maxBlockHeight int64) (*store.BlockStore, sm.State, *sm.BlockExecutor) {
-	if len(privVals) != 1 {
-		panic("only support one validator")
-	}
-	app := &testApp{}
-	cc := proxy.NewLocalClientCreator(app)
-	proxyApp := proxy.NewAppConns(cc)
-	err := proxyApp.Start()
-	if err != nil {
-		panic(fmt.Errorf("error start app: %w", err))
-	}
-
-	stateDB := dbm.NewMemDB()
-	blockStore := store.NewBlockStore(dbm.NewMemDB())
-	stateStore := sm.NewStore(stateDB)
-	state, err := stateStore.LoadFromDBOrGenesisDoc(genDoc)
-	if err != nil {
-		panic(fmt.Errorf("error constructing state from genesis file: %w", err))
-	}
-
-	db := dbm.NewMemDB()
-	stateStore = sm.NewStore(db)
-	blockExec := sm.NewBlockExecutor(stateStore, log.TestingLogger(), proxyApp.Consensus(),
-		mock.Mempool{}, sm.EmptyEvidencePool{})
-	if err = stateStore.Save(state); err != nil {
-		panic(err)
-	}
-
-	// add blocks in
-	for blockHeight := int64(1); blockHeight <= maxBlockHeight; blockHeight++ {
-		lastCommit := types.NewCommit(blockHeight-1, 0, types.BlockID{}, nil)
-		if blockHeight > 1 {
-			lastBlockMeta := blockStore.LoadBlockMeta(blockHeight - 1)
-			lastBlock := blockStore.LoadBlock(blockHeight - 1)
-			vote, err := types.MakeVote(
-				lastBlock.Header.Height,
-				lastBlockMeta.BlockID,
-				state.Validators,
-				privVals[0],
-				lastBlock.Header.ChainID,
-				time.Now(),
-			)
-			if err != nil {
-				panic(err)
-			}
-			lastCommit = types.NewCommit(vote.Height, vote.Round,
-				lastBlockMeta.BlockID, []types.CommitSig{vote.CommitSig()})
-		}
-
-		thisBlock := makeBlock(blockHeight, state, lastCommit)
-
-		thisParts := thisBlock.MakePartSet(types.BlockPartSizeBytes)
-		blockID := types.BlockID{Hash: thisBlock.Hash(), PartSetHeader: thisParts.Header()}
-
-		state, _, err = blockExec.ApplyBlock(state, blockID, thisBlock)
-		if err != nil {
-			panic(fmt.Errorf("error apply block: %w", err))
-		}
-
-		blockStore.SaveBlock(thisBlock, thisParts, lastCommit)
-	}
-	return blockStore, state, blockExec
-}

blockchain/v2/routine.go

@@ -1,166 +0,0 @@
-package v2
-
-import (
-	"fmt"
-	"strings"
-	"sync/atomic"
-
-	"github.com/Workiva/go-datastructures/queue"
-
-	"github.com/tendermint/tendermint/libs/log"
-)
-
-type handleFunc = func(event Event) (Event, error)
-
-const historySize = 25
-
-// Routine is a structure that models a finite state machine as serialized
-// stream of events processed by a handle function. This Routine structure
-// handles the concurrency and messaging guarantees. Events are sent via
-// `send` are handled by the `handle` function to produce an iterator
-// `next()`. Calling `stop()` on a routine will conclude processing of all
-// sent events and produce `final()` event representing the terminal state.
-type Routine struct {
-	name    string
-	handle  handleFunc
-	queue   *queue.PriorityQueue
-	history []Event
-	out     chan Event
-	fin     chan error
-	rdy     chan struct{}
-	running *uint32
-	logger  log.Logger
-	metrics *Metrics
-}
-
-func newRoutine(name string, handleFunc handleFunc, bufferSize int) *Routine {
-	return &Routine{
-		name:    name,
-		handle:  handleFunc,
-		queue:   queue.NewPriorityQueue(bufferSize, true),
-		history: make([]Event, 0, historySize),
-		out:     make(chan Event, bufferSize),
-		rdy:     make(chan struct{}, 1),
-		fin:     make(chan error, 1),
-		running: new(uint32),
-		logger:  log.NewNopLogger(),
-		metrics: NopMetrics(),
-	}
-}
-
-func (rt *Routine) setLogger(logger log.Logger) {
-	rt.logger = logger
-}
-
-// nolint:unused
-func (rt *Routine) setMetrics(metrics *Metrics) {
-	rt.metrics = metrics
-}
-
-func (rt *Routine) start() {
-	rt.logger.Info("routine start", "msg", log.NewLazySprintf("%s: run", rt.name))
-	running := atomic.CompareAndSwapUint32(rt.running, uint32(0), uint32(1))
-	if !running {
-		panic(fmt.Sprintf("%s is already running", rt.name))
-	}
-	close(rt.rdy)
-	defer func() {
-		if r := recover(); r != nil {
-			var (
-				b strings.Builder
-				j int
-			)
-			for i := len(rt.history) - 1; i >= 0; i-- {
-				fmt.Fprintf(&b, "%d: %+v\n", j, rt.history[i])
-				j++
-			}
-			panic(fmt.Sprintf("%v\nlast events:\n%v", r, b.String()))
-		}
-		stopped := atomic.CompareAndSwapUint32(rt.running, uint32(1), uint32(0))
-		if !stopped {
-			panic(fmt.Sprintf("%s is failed to stop", rt.name))
-		}
-	}()
-
-	for {
-		events, err := rt.queue.Get(1)
-		if err == queue.ErrDisposed {
-			rt.terminate(nil)
-			return
-		} else if err != nil {
-			rt.terminate(err)
-			return
-		}
-		oEvent, err := rt.handle(events[0].(Event))
-		rt.metrics.EventsHandled.With("routine", rt.name).Add(1)
-		if err != nil {
-			rt.terminate(err)
-			return
-		}
-		rt.metrics.EventsOut.With("routine", rt.name).Add(1)
-		rt.logger.Debug("routine start", "msg", log.NewLazySprintf("%s: produced %T %+v", rt.name, oEvent, oEvent))
-
-		// Skip rTrySchedule and rProcessBlock events as they clutter the history
-		// due to their frequency.
-		switch events[0].(type) {
-		case rTrySchedule:
-		case rProcessBlock:
-		default:
-			rt.history = append(rt.history, events[0].(Event))
-			if len(rt.history) > historySize {
-				rt.history = rt.history[1:]
-			}
-		}
-
-		rt.out <- oEvent
-	}
-}
-
-// XXX: look into returning OpError in the net package
-func (rt *Routine) send(event Event) bool {
-	rt.logger.Debug("routine send", "msg", log.NewLazySprintf("%s: received %T %+v", rt.name, event, event))
-	if !rt.isRunning() {
-		return false
-	}
-	err := rt.queue.Put(event)
-	if err != nil {
-		rt.metrics.EventsShed.With("routine", rt.name).Add(1)
-		rt.logger.Error(fmt.Sprintf("%s: send failed, queue was full/stopped", rt.name))
-		return false
-	}
-
-	rt.metrics.EventsSent.With("routine", rt.name).Add(1)
-	return true
-}
-
-func (rt *Routine) isRunning() bool {
-	return atomic.LoadUint32(rt.running) == 1
-}
-
-func (rt *Routine) next() chan Event {
-	return rt.out
-}
-
-func (rt *Routine) ready() chan struct{} {
-	return rt.rdy
-}
-
-func (rt *Routine) stop() {
-	if !rt.isRunning() { // XXX: this should check rt.queue.Disposed()
-		return
-	}
-
-	rt.logger.Info("routine stop", "msg", log.NewLazySprintf("%s: stop", rt.name))
-	rt.queue.Dispose() // this should block until all queue items are free?
-}
-
-func (rt *Routine) final() chan error {
-	return rt.fin
-}
-
-// XXX: Maybe get rid of this
-func (rt *Routine) terminate(reason error) {
-	// We don't close the rt.out channel here, to avoid spinning on the closed channel
-	// in the event loop.
-	rt.fin <- reason
-}

blockchain/v2/routine_test.go

@@ -1,163 +0,0 @@
-package v2
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-type eventA struct {
-	priorityNormal
-}
-
-var errDone = fmt.Errorf("done")
-
-func simpleHandler(event Event) (Event, error) {
-	if _, ok := event.(eventA); ok {
-		return noOp, errDone
-	}
-	return noOp, nil
-}
-
-func TestRoutineFinal(t *testing.T) {
-	var (
-		bufferSize = 10
-		routine    = newRoutine("simpleRoutine", simpleHandler, bufferSize)
-	)
-
-	assert.False(t, routine.isRunning(),
-		"expected an initialized routine to not be running")
-	go routine.start()
-	<-routine.ready()
-	assert.True(t, routine.isRunning(),
-		"expected an started routine")
-
-	assert.True(t, routine.send(eventA{}),
-		"expected sending to a ready routine to succeed")
-
-	assert.Equal(t, errDone, <-routine.final(),
-		"expected the final event to be done")
-
-	assert.False(t, routine.isRunning(),
-		"expected an completed routine to no longer be running")
-}
-
-func TestRoutineStop(t *testing.T) {
-	var (
-		bufferSize = 10
-		routine    = newRoutine("simpleRoutine", simpleHandler, bufferSize)
-	)
-
-	assert.False(t, routine.send(eventA{}),
-		"expected sending to an unstarted routine to fail")
-
-	go routine.start()
-	<-routine.ready()
-
-	assert.True(t, routine.send(eventA{}),
-		"expected sending to a running routine to succeed")
-
-	routine.stop()
-
-	assert.False(t, routine.send(eventA{}),
-		"expected sending to a stopped routine to fail")
-}
-
-type finalCount struct {
-	count int
-}
-
-func (f finalCount) Error() string {
-	return "end"
-}
-
-func genStatefulHandler(maxCount int) handleFunc {
-	counter := 0
-	return func(event Event) (Event, error) {
-		if _, ok := event.(eventA); ok {
-			counter++
-			if counter >= maxCount {
-				return noOp, finalCount{counter}
-			}
-
-			return eventA{}, nil
-		}
-		return noOp, nil
-	}
-}
-
-func feedback(r *Routine) {
-	for event := range r.next() {
-		r.send(event)
-	}
-}
-
-func TestStatefulRoutine(t *testing.T) {
-	var (
-		count      = 10
-		handler    = genStatefulHandler(count)
-		bufferSize = 20
-		routine    = newRoutine("statefulRoutine", handler, bufferSize)
-	)
-
-	go routine.start()
-	go feedback(routine)
-	<-routine.ready()
-
-	assert.True(t, routine.send(eventA{}),
-		"expected sending to a started routine to succeed")
-
-	final := <-routine.final()
-	if fnl, ok := final.(finalCount); ok {
-		assert.Equal(t, count, fnl.count,
-			"expected the routine to count to 10")
-	} else {
-		t.Fail()
-	}
-}
-
-type lowPriorityEvent struct {
-	priorityLow
-}
-
-type highPriorityEvent struct {
-	priorityHigh
-}
-
-func handleWithPriority(event Event) (Event, error) {
-	switch event.(type) {
-	case lowPriorityEvent:
-		return noOp, nil
-	case highPriorityEvent:
-		return noOp, errDone
-	}
-	return noOp, nil
-}
-
-func TestPriority(t *testing.T) {
-	var (
-		bufferSize = 20
-		routine    = newRoutine("priorityRoutine", handleWithPriority, bufferSize)
-	)
-
-	go routine.start()
-	<-routine.ready()
-	go func() {
-		for {
-			routine.send(lowPriorityEvent{})
-			time.Sleep(1 * time.Millisecond)
-		}
-	}()
-	time.Sleep(10 * time.Millisecond)
-
-	assert.True(t, routine.isRunning(),
-		"expected an started routine")
-	assert.True(t, routine.send(highPriorityEvent{}),
-		"expected send to succeed even when saturated")
-
-	assert.Equal(t, errDone, <-routine.final())
-	assert.False(t, routine.isRunning(),
-		"expected an started routine")
-}

blockchain/v2/scheduler.go

@@ -1,712 +0,0 @@
-package v2
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"math"
-	"sort"
-	"time"
-
-	"github.com/tendermint/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
-)
-
-// Events generated by the scheduler:
-// all blocks have been processed
-type scFinishedEv struct {
-	priorityNormal
-	reason string
-}
-
-func (e scFinishedEv) String() string {
-	return fmt.Sprintf("scFinishedEv{%v}", e.reason)
-}
-
-// send a blockRequest message
-type scBlockRequest struct {
-	priorityNormal
-	peerID p2p.ID
-	height int64
-}
-
-func (e scBlockRequest) String() string {
-	return fmt.Sprintf("scBlockRequest{%d from %v}", e.height, e.peerID)
-}
-
-// a block has been received and validated by the scheduler
-type scBlockReceived struct {
-	priorityNormal
-	peerID p2p.ID
-	block  *types.Block
-}
-
-func (e scBlockReceived) String() string {
-	return fmt.Sprintf("scBlockReceived{%d#%X from %v}", e.block.Height, e.block.Hash(), e.peerID)
-}
-
-// scheduler detected a peer error
-type scPeerError struct {
-	priorityHigh
-	peerID p2p.ID
-	reason error
-}
-
-func (e scPeerError) String() string {
-	return fmt.Sprintf("scPeerError{%v errored with %v}", e.peerID, e.reason)
-}
-
-// scheduler removed a set of peers (timed out or slow peer)
-type scPeersPruned struct {
-	priorityHigh
-	peers []p2p.ID
-}
-
-func (e scPeersPruned) String() string {
-	return fmt.Sprintf("scPeersPruned{%v}", e.peers)
-}
-
-// XXX: make this fatal?
-// scheduler encountered a fatal error
-type scSchedulerFail struct {
-	priorityHigh
-	reason error
-}
-
-func (e scSchedulerFail) String() string {
-	return fmt.Sprintf("scSchedulerFail{%v}", e.reason)
-}
-
-type blockState int
-
-const (
-	blockStateUnknown   blockState = iota + 1 // no known peer has this block
-	blockStateNew                             // indicates that a peer has reported having this block
-	blockStatePending                         // indicates that this block has been requested from a peer
-	blockStateReceived                        // indicates that this block has been received by a peer
-	blockStateProcessed                       // indicates that this block has been applied
-)
-
-func (e blockState) String() string {
-	switch e {
-	case blockStateUnknown:
-		return "Unknown"
-	case blockStateNew:
-		return "New"
-	case blockStatePending:
-		return "Pending"
-	case blockStateReceived:
-		return "Received"
-	case blockStateProcessed:
-		return "Processed"
-	default:
-		return fmt.Sprintf("invalid blockState: %d", e)
-	}
-}
-
-type peerState int
-
-const (
-	peerStateNew = iota + 1
-	peerStateReady
-	peerStateRemoved
-)
-
-func (e peerState) String() string {
-	switch e {
-	case peerStateNew:
-		return "New"
-	case peerStateReady:
-		return "Ready"
-	case peerStateRemoved:
-		return "Removed"
-	default:
-		panic(fmt.Sprintf("unknown peerState: %d", e))
-	}
-}
-
-type scPeer struct {
-	peerID p2p.ID
-
-	// initialized as New when peer is added, updated to Ready when statusUpdate is received,
-	// updated to Removed when peer is removed
-	state peerState
-
-	base        int64 // updated when statusResponse is received
-	height      int64 // updated when statusResponse is received
-	lastTouched time.Time
-	lastRate    int64 // last receive rate in bytes
-}
-
-func (p scPeer) String() string {
-	return fmt.Sprintf("{state %v, base %d, height %d, lastTouched %v, lastRate %d, id %v}",
-		p.state, p.base, p.height, p.lastTouched, p.lastRate, p.peerID)
-}
-
-func newScPeer(peerID p2p.ID) *scPeer {
-	return &scPeer{
-		peerID:      peerID,
-		state:       peerStateNew,
-		base:        -1,
-		height:      -1,
-		lastTouched: time.Time{},
-	}
-}
-
-// The scheduler keep track of the state of each block and each peer. The
-// scheduler will attempt to schedule new block requests with `trySchedule`
-// events and remove slow peers with `tryPrune` events.
-type scheduler struct {
-	initHeight int64
-
-	// next block that needs to be processed. All blocks with smaller height are
-	// in Processed state.
-	height int64
-
-	// lastAdvance tracks the last time a block execution happened.
-	// syncTimeout is the maximum time the scheduler waits to advance in the fast sync process before finishing.
-	// This covers the cases where there are no peers or all peers have a lower height.
-	lastAdvance time.Time
-	syncTimeout time.Duration
-
-	// a map of peerID to scheduler specific peer struct `scPeer` used to keep
-	// track of peer specific state
-	peers       map[p2p.ID]*scPeer
-	peerTimeout time.Duration // maximum response time from a peer otherwise prune
-	minRecvRate int64         // minimum receive rate from peer otherwise prune
-
-	// the maximum number of blocks that should be New, Received or Pending at any point
-	// in time. This is used to enforce a limit on the blockStates map.
-	targetPending int
-	// a list of blocks to be scheduled (New), Pending or Received. Its length should be
-	// smaller than targetPending.
-	blockStates map[int64]blockState
-
-	// a map of heights to the peer we are waiting a response from
-	pendingBlocks map[int64]p2p.ID
-
-	// the time at which a block was put in blockStatePending
-	pendingTime map[int64]time.Time
-
-	// a map of heights to the peers that put the block in blockStateReceived
-	receivedBlocks map[int64]p2p.ID
-}
-
-func (sc scheduler) String() string {
-	return fmt.Sprintf("ih: %d, bst: %v, peers: %v, pblks: %v, ptm %v, rblks: %v",
-		sc.initHeight, sc.blockStates, sc.peers, sc.pendingBlocks, sc.pendingTime, sc.receivedBlocks)
-}
-
-func newScheduler(initHeight int64, startTime time.Time) *scheduler {
-	sc := scheduler{
-		initHeight:     initHeight,
-		lastAdvance:    startTime,
-		syncTimeout:    60 * time.Second,
-		height:         initHeight,
-		blockStates:    make(map[int64]blockState),
-		peers:          make(map[p2p.ID]*scPeer),
-		pendingBlocks:  make(map[int64]p2p.ID),
-		pendingTime:    make(map[int64]time.Time),
-		receivedBlocks: make(map[int64]p2p.ID),
-		targetPending:  10,               // TODO - pass as param
-		peerTimeout:    15 * time.Second, // TODO - pass as param
-		minRecvRate:    0,                // int64(7680), TODO - pass as param
-	}
-
-	return &sc
-}
-
-func (sc *scheduler) ensurePeer(peerID p2p.ID) *scPeer {
-	if _, ok := sc.peers[peerID]; !ok {
-		sc.peers[peerID] = newScPeer(peerID)
-	}
-	return sc.peers[peerID]
-}
-
-func (sc *scheduler) touchPeer(peerID p2p.ID, time time.Time) error {
-	peer, ok := sc.peers[peerID]
-	if !ok {
-		return fmt.Errorf("couldn't find peer %s", peerID)
-	}
-
-	if peer.state != peerStateReady {
-		return fmt.Errorf("tried to touch peer in state %s, must be Ready", peer.state)
-	}
-
-	peer.lastTouched = time
-
-	return nil
-}
-
-func (sc *scheduler) removePeer(peerID p2p.ID) {
-	peer, ok := sc.peers[peerID]
-	if !ok {
-		return
-	}
-	if peer.state == peerStateRemoved {
-		return
-	}
-
-	for height, pendingPeerID := range sc.pendingBlocks {
-		if pendingPeerID == peerID {
-			sc.setStateAtHeight(height, blockStateNew)
-			delete(sc.pendingTime, height)
-			delete(sc.pendingBlocks, height)
-		}
-	}
-
-	for height, rcvPeerID := range sc.receivedBlocks {
-		if rcvPeerID == peerID {
-			sc.setStateAtHeight(height, blockStateNew)
-			delete(sc.receivedBlocks, height)
-		}
-	}
-
-	// remove the blocks from blockStates if the peer removal causes the max peer height to be lower.
-	peer.state = peerStateRemoved
-	maxPeerHeight := int64(0)
-	for _, otherPeer := range sc.peers {
-		if otherPeer.state != peerStateReady {
-			continue
-		}
-		if otherPeer.peerID != peer.peerID && otherPeer.height > maxPeerHeight {
-			maxPeerHeight = otherPeer.height
-		}
-	}
-	for h := range sc.blockStates {
-		if h > maxPeerHeight {
-			delete(sc.blockStates, h)
-		}
-	}
-}
-
-// check if the blockPool is running low and add new blocks in New state to be requested.
-// This function is called when there is an increase in the maximum peer height or when
-// blocks are processed.
-func (sc *scheduler) addNewBlocks() {
-	if len(sc.blockStates) >= sc.targetPending {
-		return
-	}
-
-	for i := sc.height; i < int64(sc.targetPending)+sc.height; i++ {
-		if i > sc.maxHeight() {
-			break
-		}
-		if sc.getStateAtHeight(i) == blockStateUnknown {
-			sc.setStateAtHeight(i, blockStateNew)
-		}
-	}
-}
-
-func (sc *scheduler) setPeerRange(peerID p2p.ID, base int64, height int64) error {
-	peer := sc.ensurePeer(peerID)
-
-	if peer.state == peerStateRemoved {
-		return nil // noop
-	}
-
-	if height < peer.height {
-		sc.removePeer(peerID)
-		return fmt.Errorf("cannot move peer height lower. from %d to %d", peer.height, height)
-	}
-
-	if base > height {
-		sc.removePeer(peerID)
-		return fmt.Errorf("cannot set peer base higher than its height")
-	}
-
-	peer.base = base
-	peer.height = height
-	peer.state = peerStateReady
-
-	sc.addNewBlocks()
-	return nil
-}
-
-func (sc *scheduler) getStateAtHeight(height int64) blockState {
-	if height < sc.height {
-		return blockStateProcessed
-	} else if state, ok := sc.blockStates[height]; ok {
-		return state
-	} else {
-		return blockStateUnknown
-	}
-}
-
-func (sc *scheduler) getPeersWithHeight(height int64) []p2p.ID {
-	peers := make([]p2p.ID, 0)
-	for _, peer := range sc.peers {
-		if peer.state != peerStateReady {
-			continue
-		}
-		if peer.base <= height && peer.height >= height {
-			peers = append(peers, peer.peerID)
-		}
-	}
-	return peers
-}
-
-func (sc *scheduler) prunablePeers(peerTimout time.Duration, minRecvRate int64, now time.Time) []p2p.ID {
-	prunable := make([]p2p.ID, 0)
-	for peerID, peer := range sc.peers {
-		if peer.state != peerStateReady {
-			continue
-		}
-		if now.Sub(peer.lastTouched) > peerTimout || peer.lastRate < minRecvRate {
-			prunable = append(prunable, peerID)
-		}
-	}
-	// Tests for handleTryPrunePeer() may fail without sort due to range non-determinism
-	sort.Sort(PeerByID(prunable))
-	return prunable
-}
-
-func (sc *scheduler) setStateAtHeight(height int64, state blockState) {
-	sc.blockStates[height] = state
-}
-
-// CONTRACT: peer exists and in Ready state.
-func (sc *scheduler) markReceived(peerID p2p.ID, height int64, size int64, now time.Time) error {
-	peer := sc.peers[peerID]
-
-	if state := sc.getStateAtHeight(height); state != blockStatePending || sc.pendingBlocks[height] != peerID {
-		return fmt.Errorf("received block %d from peer %s without being requested", height, peerID)
-	}
-
-	pendingTime, ok := sc.pendingTime[height]
-	if !ok || now.Sub(pendingTime) <= 0 {
-		return fmt.Errorf("clock error: block %d received at %s but requested at %s",
-			height, pendingTime, now)
-	}
-
-	peer.lastRate = size / now.Sub(pendingTime).Nanoseconds()
-
-	sc.setStateAtHeight(height, blockStateReceived)
-	delete(sc.pendingBlocks, height)
-	delete(sc.pendingTime, height)
-
-	sc.receivedBlocks[height] = peerID
-
-	return nil
-}
-
-func (sc *scheduler) markPending(peerID p2p.ID, height int64, time time.Time) error {
-	state := sc.getStateAtHeight(height)
-	if state != blockStateNew {
-		return fmt.Errorf("block %d should be in blockStateNew but is %s", height, state)
-	}
-
-	peer, ok := sc.peers[peerID]
-	if !ok {
-		return fmt.Errorf("cannot find peer %s", peerID)
-	}
-
-	if peer.state != peerStateReady {
-		return fmt.Errorf("cannot schedule %d from %s in %s", height, peerID, peer.state)
-	}
-
-	if height > peer.height {
-		return fmt.Errorf("cannot request height %d from peer %s that is at height %d",
-			height, peerID, peer.height)
-	}
-
-	if height < peer.base {
-		return fmt.Errorf("cannot request height %d for peer %s with base %d",
-			height, peerID, peer.base)
-	}
-
-	sc.setStateAtHeight(height, blockStatePending)
-	sc.pendingBlocks[height] = peerID
-	sc.pendingTime[height] = time
-
-	return nil
-}
-
-func (sc *scheduler) markProcessed(height int64) error {
-	// It is possible that a peer error or timeout is handled after the processor
-	// has processed the block but before the scheduler received this event, so
-	// when pcBlockProcessed event is received, the block had been requested
-	// again => don't check the block state.
-	sc.lastAdvance = time.Now()
-	sc.height = height + 1
-	delete(sc.pendingBlocks, height)
-	delete(sc.pendingTime, height)
-	delete(sc.receivedBlocks, height)
-	delete(sc.blockStates, height)
-	sc.addNewBlocks()
-	return nil
-}
-
-func (sc *scheduler) allBlocksProcessed() bool {
-	if len(sc.peers) == 0 {
-		return false
-	}
-	return sc.height >= sc.maxHeight()
-}
-
-// returns max peer height or the last processed block, i.e. sc.height
-func (sc *scheduler) maxHeight() int64 {
-	max := sc.height - 1
-	for _, peer := range sc.peers {
-		if peer.state != peerStateReady {
-			continue
-		}
-		if max < peer.height {
-			max = peer.height
-		}
-	}
-	return max
-}
-
-// lowest block in sc.blockStates with state == blockStateNew or -1 if no new blocks
-func (sc *scheduler) nextHeightToSchedule() int64 {
-	var min int64 = math.MaxInt64
-	for height, state := range sc.blockStates {
-		if state == blockStateNew && height < min {
-			min = height
-		}
-	}
-	if min == math.MaxInt64 {
-		min = -1
-	}
-	return min
-}
-
-func (sc *scheduler) pendingFrom(peerID p2p.ID) []int64 {
-	var heights []int64
-	for height, pendingPeerID := range sc.pendingBlocks {
-		if pendingPeerID == peerID {
-			heights = append(heights, height)
-		}
-	}
-	return heights
-}
-
-func (sc *scheduler) selectPeer(height int64) (p2p.ID, error) {
-	peers := sc.getPeersWithHeight(height)
-	if len(peers) == 0 {
-		return "", fmt.Errorf("cannot find peer for height %d", height)
-	}
-
-	// create a map from number of pending requests to a list
-	// of peers having that number of pending requests.
-	pendingFrom := make(map[int][]p2p.ID)
-	for _, peerID := range peers {
-		numPending := len(sc.pendingFrom(peerID))
-		pendingFrom[numPending] = append(pendingFrom[numPending], peerID)
-	}
-
-	// find the set of peers with minimum number of pending requests.
-	var minPending int64 = math.MaxInt64
-	for mp := range pendingFrom {
-		if int64(mp) < minPending {
-			minPending = int64(mp)
-		}
-	}
-
-	sort.Sort(PeerByID(pendingFrom[int(minPending)]))
-	return pendingFrom[int(minPending)][0], nil
-}
-
-// PeerByID is a list of peers sorted by peerID.
-type PeerByID []p2p.ID
-
-func (peers PeerByID) Len() int {
-	return len(peers)
-}
-func (peers PeerByID) Less(i, j int) bool {
-	return bytes.Compare([]byte(peers[i]), []byte(peers[j])) == -1
-}
-
-func (peers PeerByID) Swap(i, j int) {
-	peers[i], peers[j] = peers[j], peers[i]
-}
-
-// Handlers
-
-// This handler gets the block, performs some validation and then passes it on to the processor.
-func (sc *scheduler) handleBlockResponse(event bcBlockResponse) (Event, error) {
-	err := sc.touchPeer(event.peerID, event.time)
-	if err != nil {
-		// peer does not exist OR not ready
-		return noOp, nil
-	}
-
-	err = sc.markReceived(event.peerID, event.block.Height, event.size, event.time)
-	if err != nil {
-		sc.removePeer(event.peerID)
-		return scPeerError{peerID: event.peerID, reason: err}, nil
-	}
-
-	return scBlockReceived{peerID: event.peerID, block: event.block}, nil
-}
-
-func (sc *scheduler) handleNoBlockResponse(event bcNoBlockResponse) (Event, error) {
-	// No such peer or peer was removed.
-	peer, ok := sc.peers[event.peerID]
-	if !ok || peer.state == peerStateRemoved {
-		return noOp, nil
-	}
-
-	// The peer may have been just removed due to errors, low speed or timeouts.
-	sc.removePeer(event.peerID)
-
-	return scPeerError{peerID: event.peerID,
-		reason: fmt.Errorf("peer %v with base %d height %d claims no block for %d",
-			event.peerID, peer.base, peer.height, event.height)}, nil
-}
-
-func (sc *scheduler) handleBlockProcessed(event pcBlockProcessed) (Event, error) {
-	if event.height != sc.height {
-		panic(fmt.Sprintf("processed height %d, but expected height %d", event.height, sc.height))
-	}
-
-	err := sc.markProcessed(event.height)
-	if err != nil {
-		return scSchedulerFail{reason: err}, nil
-	}
-
-	if sc.allBlocksProcessed() {
-		return scFinishedEv{reason: "processed all blocks"}, nil
-	}
-
-	return noOp, nil
-}
-
-// Handles an error from the processor. The processor had already cleaned the blocks from
-// the peers included in this event. Just attempt to remove the peers.
-func (sc *scheduler) handleBlockProcessError(event pcBlockVerificationFailure) (Event, error) {
-	// The peers may have been just removed due to errors, low speed or timeouts.
-	sc.removePeer(event.firstPeerID)
-	if event.firstPeerID != event.secondPeerID {
-		sc.removePeer(event.secondPeerID)
-	}
-
-	if sc.allBlocksProcessed() {
-		return scFinishedEv{reason: "error on last block"}, nil
-	}
-
-	return noOp, nil
-}
-
-func (sc *scheduler) handleAddNewPeer(event bcAddNewPeer) (Event, error) {
-	sc.ensurePeer(event.peerID)
-	return noOp, nil
-}
-
-func (sc *scheduler) handleRemovePeer(event bcRemovePeer) (Event, error) {
-	sc.removePeer(event.peerID)
-
-	if sc.allBlocksProcessed() {
-		return scFinishedEv{reason: "removed peer"}, nil
-	}
-
-	// Return scPeerError so the peer (and all associated blocks) is removed from
-	// the processor.
-	return scPeerError{peerID: event.peerID, reason: errors.New("peer was stopped")}, nil
-}
-
-func (sc *scheduler) handleTryPrunePeer(event rTryPrunePeer) (Event, error) {
-	// Check behavior of peer responsible to deliver block at sc.height.
-	timeHeightAsked, ok := sc.pendingTime[sc.height]
-	if ok && time.Since(timeHeightAsked) > sc.peerTimeout {
-		// A request was sent to a peer for block at sc.height but a response was not received
-		// from that peer within sc.peerTimeout. Remove the peer. This is to ensure that a peer
-		// will be timed out even if it sends blocks at higher heights but prevents progress by
-		// not sending the block at current height.
-		sc.removePeer(sc.pendingBlocks[sc.height])
-	}
-
-	prunablePeers := sc.prunablePeers(sc.peerTimeout, sc.minRecvRate, event.time)
-	if len(prunablePeers) == 0 {
-		return noOp, nil
-	}
-	for _, peerID := range prunablePeers {
-		sc.removePeer(peerID)
-	}
-
-	// If all blocks are processed we should finish.
-	if sc.allBlocksProcessed() {
-		return scFinishedEv{reason: "after try prune"}, nil
-	}
-
-	return scPeersPruned{peers: prunablePeers}, nil
-}
-
-func (sc *scheduler) handleResetState(event bcResetState) (Event, error) {
-	initHeight := event.state.LastBlockHeight + 1
-	if initHeight == 1 {
-		initHeight = event.state.InitialHeight
-	}
-	sc.initHeight = initHeight
-	sc.height = initHeight
-	sc.lastAdvance = time.Now()
-	sc.addNewBlocks()
-	return noOp, nil
-}
-
-func (sc *scheduler) handleTrySchedule(event rTrySchedule) (Event, error) {
-	if time.Since(sc.lastAdvance) > sc.syncTimeout {
-		return scFinishedEv{reason: "timeout, no advance"}, nil
-	}
-
-	nextHeight := sc.nextHeightToSchedule()
-	if nextHeight == -1 {
-		return noOp, nil
-	}
-
-	bestPeerID, err := sc.selectPeer(nextHeight)
-	if err != nil {
-		return scSchedulerFail{reason: err}, nil
-	}
-	if err := sc.markPending(bestPeerID, nextHeight, event.time); err != nil {
-		return scSchedulerFail{reason: err}, nil // XXX: peerError might be more appropriate
-	}
-	return scBlockRequest{peerID: bestPeerID, height: nextHeight}, nil
-
-}
-
-func (sc *scheduler) handleStatusResponse(event bcStatusResponse) (Event, error) {
-	err := sc.setPeerRange(event.peerID, event.base, event.height)
-	if err != nil {
-		return scPeerError{peerID: event.peerID, reason: err}, nil
-	}
-	return noOp, nil
-}
-
-func (sc *scheduler) handle(event Event) (Event, error) {
-	switch event := event.(type) {
-	case bcResetState:
-		nextEvent, err := sc.handleResetState(event)
-		return nextEvent, err
-	case bcStatusResponse:
-		nextEvent, err := sc.handleStatusResponse(event)
-		return nextEvent, err
-	case bcBlockResponse:
-		nextEvent, err := sc.handleBlockResponse(event)
-		return nextEvent, err
-	case bcNoBlockResponse:
-		nextEvent, err := sc.handleNoBlockResponse(event)
-		return nextEvent, err
-	case rTrySchedule:
-		nextEvent, err := sc.handleTrySchedule(event)
-		return nextEvent, err
-	case bcAddNewPeer:
-		nextEvent, err := sc.handleAddNewPeer(event)
-		return nextEvent, err
-	case bcRemovePeer:
-		nextEvent, err := sc.handleRemovePeer(event)
-		return nextEvent, err
-	case rTryPrunePeer:
-		nextEvent, err := sc.handleTryPrunePeer(event)
-		return nextEvent, err
-	case pcBlockProcessed:
-		nextEvent, err := sc.handleBlockProcessed(event)
-		return nextEvent, err
-	case pcBlockVerificationFailure:
-		nextEvent, err := sc.handleBlockProcessError(event)
-		return nextEvent, err
-	default:
-		return scSchedulerFail{reason: fmt.Errorf("unknown event %v", event)}, nil
-	}
-}

blockchain/v2/types.go

@@ -1,65 +0,0 @@
-package v2
-
-import (
-	"github.com/Workiva/go-datastructures/queue"
-)
-
-// Event is the type that can be added to the priority queue.
-type Event queue.Item
-
-type priority interface {
-	Compare(other queue.Item) int
-	Priority() int
-}
-
-type priorityLow struct{}
-type priorityNormal struct{}
-type priorityHigh struct{}
-
-func (p priorityLow) Priority() int {
-	return 1
-}
-
-func (p priorityNormal) Priority() int {
-	return 2
-}
-
-func (p priorityHigh) Priority() int {
-	return 3
-}
-
-func (p priorityLow) Compare(other queue.Item) int {
-	op := other.(priority)
-	if p.Priority() > op.Priority() {
-		return 1
-	} else if p.Priority() == op.Priority() {
-		return 0
-	}
-	return -1
-}
-
-func (p priorityNormal) Compare(other queue.Item) int {
-	op := other.(priority)
-	if p.Priority() > op.Priority() {
-		return 1
-	} else if p.Priority() == op.Priority() {
-		return 0
-	}
-	return -1
-}
-
-func (p priorityHigh) Compare(other queue.Item) int {
-	op := other.(priority)
-	if p.Priority() > op.Priority() {
-		return 1
-	} else if p.Priority() == op.Priority() {
-		return 0
-	}
-	return -1
-}
-
-type noOpEvent struct {
-	priorityLow
-}
-
-var noOp = noOpEvent{}

cmd/tendermint/commands/debug/dump.go

@@ -3,7 +3,6 @@ package debug
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"time"
@@ -82,7 +81,7 @@ func dumpCmdHandler(_ *cobra.Command, args []string) error {
 func dumpDebugData(outDir string, conf *cfg.Config, rpc *rpchttp.HTTP) {
 	start := time.Now().UTC()
 
-	tmpDir, err := ioutil.TempDir(outDir, "tendermint_debug_tmp")
+	tmpDir, err := os.MkdirTemp(outDir, "tendermint_debug_tmp")
 	if err != nil {
 		logger.Error("failed to create temporary directory", "dir", tmpDir, "error", err)
 		return

cmd/tendermint/commands/debug/io.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -111,5 +110,5 @@ func writeStateJSONToFile(state interface{}, dir, filename string) error {
 		return fmt.Errorf("failed to encode state dump: %w", err)
 	}
 
-	return ioutil.WriteFile(path.Join(dir, filename), stateJSON, os.ModePerm)
+	return os.WriteFile(path.Join(dir, filename), stateJSON, os.ModePerm)
 }

cmd/tendermint/commands/debug/kill.go

@@ -3,7 +3,6 @@ package debug
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -56,7 +55,7 @@ func killCmdHandler(cmd *cobra.Command, args []string) error {
 
 	// Create a temporary directory which will contain all the state dumps and
 	// relevant files and directories that will be compressed into a file.
-	tmpDir, err := ioutil.TempDir(os.TempDir(), "tendermint_debug_tmp")
+	tmpDir, err := os.MkdirTemp(os.TempDir(), "tendermint_debug_tmp")
 	if err != nil {
 		return fmt.Errorf("failed to create temporary directory: %w", err)
 	}

cmd/tendermint/commands/debug/util.go

@@ -3,7 +3,7 @@ package debug
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"path"
@@ -73,10 +73,10 @@ func dumpProfile(dir, addr, profile string, debug int) error {
 	}
 	defer resp.Body.Close()
 
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return fmt.Errorf("failed to read %s profile response body: %w", profile, err)
 	}
 
-	return ioutil.WriteFile(path.Join(dir, fmt.Sprintf("%s.out", profile)), body, os.ModePerm)
+	return os.WriteFile(path.Join(dir, fmt.Sprintf("%s.out", profile)), body, os.ModePerm)
 }

cmd/tendermint/commands/init.go

@@ -14,7 +14,7 @@ import (
 	tmtime "github.com/tendermint/tendermint/types/time"
 )
 
-// InitFilesCmd initialises a fresh Tendermint Core instance.
+// InitFilesCmd initializes a fresh Tendermint Core instance.
 var InitFilesCmd = &cobra.Command{
 	Use:   "init",
 	Short: "Initialize Tendermint",

cmd/tendermint/commands/light.go

@@ -101,7 +101,7 @@ func init() {
 }
 
 func runProxy(cmd *cobra.Command, args []string) error {
-	// Initialise logger.
+	// Initialize logger.
 	logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
 	var option log.Option
 	if verbose {

cmd/tendermint/commands/root_test.go

@@ -2,7 +2,6 @@ package commands
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -168,5 +167,5 @@ func WriteConfigVals(dir string, vals map[string]string) error {
 		data += fmt.Sprintf("%s = \"%s\"\n", k, v)
 	}
 	cfile := filepath.Join(dir, "config.toml")
-	return ioutil.WriteFile(cfile, []byte(data), 0600)
+	return os.WriteFile(cfile, []byte(data), 0600)
 }

cmd/tendermint/commands/run_node.go

@@ -46,7 +46,7 @@ func AddNodeFlags(cmd *cobra.Command) {
 		"proxy_app",
 		config.ProxyApp,
 		"proxy app address, or one of: 'kvstore',"+
-			" 'persistent_kvstore', 'counter', 'e2e' or 'noop' for local testing.")
+			" 'persistent_kvstore' or 'noop' for local testing.")
 	cmd.Flags().String("abci", config.ABCI, "specify abci transport (socket | grpc)")
 
 	// rpc flags
@@ -63,6 +63,7 @@ func AddNodeFlags(cmd *cobra.Command) {
 		"p2p.laddr",
 		config.P2P.ListenAddress,
 		"node listen address. (0.0.0.0:0 means any interface, any port)")
+	cmd.Flags().String("p2p.external-address", config.P2P.ExternalAddress, "ip:port address to advertise to peers for them to dial")
 	cmd.Flags().String("p2p.seeds", config.P2P.Seeds, "comma-delimited ID@host:port seed nodes")
 	cmd.Flags().String("p2p.persistent_peers", config.P2P.PersistentPeers, "comma-delimited ID@host:port persistent peers")
 	cmd.Flags().String("p2p.unconditional_peer_ids",

config/config.go

@@ -370,7 +370,7 @@ type RPCConfig struct {
 	//
 	// Enabling this parameter will cause the WebSocket connection to be closed
 	// instead if it cannot read fast enough, allowing for greater
-	// predictability in subscription behaviour.
+	// predictability in subscription behavior.
 	CloseOnSlowClient bool `mapstructure:"experimental_close_on_slow_client"`
 
 	// How long to wait for a tx to be committed during /broadcast_tx_commit
@@ -897,10 +897,8 @@ func (cfg *FastSyncConfig) ValidateBasic() error {
 	switch cfg.Version {
 	case "v0":
 		return nil
-	case "v1":
-		return nil
-	case "v2":
-		return nil
+	case "v1", "v2":
+		return fmt.Errorf("fast sync version %s has been deprecated. Please use v0 instead", cfg.Version)
 	default:
 		return fmt.Errorf("unknown fastsync version %s", cfg.Version)
 	}

config/config_test.go

@@ -134,7 +134,7 @@ func TestFastSyncConfigValidateBasic(t *testing.T) {
 
 	// tamper with version
 	cfg.Version = "v1"
-	assert.NoError(t, cfg.ValidateBasic())
+	assert.Error(t, cfg.ValidateBasic())
 
 	cfg.Version = "invalid"
 	assert.Error(t, cfg.ValidateBasic())

config/toml.go

@@ -3,7 +3,7 @@ package config
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 	"text/template"
@@ -230,7 +230,7 @@ experimental_websocket_write_buffer_size = {{ .RPC.WebSocketWriteBufferSize }}
 #
 # Enabling this experimental parameter will cause the WebSocket connection to
 # be closed instead if it cannot read fast enough, allowing for greater
-# predictability in subscription behaviour.
+# predictability in subscription behavior.
 experimental_close_on_slow_client = {{ .RPC.CloseOnSlowClient }}
 
 # How long to wait for a tx to be committed during /broadcast_tx_commit.
@@ -434,9 +434,11 @@ chunk_fetchers = "{{ .StateSync.ChunkFetchers }}"
 [fastsync]
 
 # Fast Sync version to use:
-#   1) "v0" (default) - the legacy fast sync implementation
-#   2) "v1" - refactor of v0 version for better testability
-#   2) "v2" - complete redesign of v0, optimized for testability & readability
+# 
+# In v0.37, v1 and v2 of the fast sync protocol were deprecated.
+# Please use v0 instead.
+#
+#   1) "v0" - the default fast sync implementation
 version = "{{ .FastSync.Version }}"
 
 #######################################################
@@ -533,7 +535,7 @@ func ResetTestRoot(testName string) *Config {
 
 func ResetTestRootWithChainID(testName string, chainID string) *Config {
 	// create a unique, concurrency-safe test directory under os.TempDir()
-	rootDir, err := ioutil.TempDir("", fmt.Sprintf("%s-%s_", chainID, testName))
+	rootDir, err := os.MkdirTemp("", fmt.Sprintf("%s-%s_", chainID, testName))
 	if err != nil {
 		panic(err)
 	}

config/toml_test.go

@@ -1,7 +1,6 @@
 package config
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -23,7 +22,7 @@ func TestEnsureRoot(t *testing.T) {
 	require := require.New(t)
 
 	// setup temp dir for test
-	tmpDir, err := ioutil.TempDir("", "config-test")
+	tmpDir, err := os.MkdirTemp("", "config-test")
 	require.Nil(err)
 	defer os.RemoveAll(tmpDir)
 
@@ -31,7 +30,7 @@ func TestEnsureRoot(t *testing.T) {
 	EnsureRoot(tmpDir)
 
 	// make sure config is set properly
-	data, err := ioutil.ReadFile(filepath.Join(tmpDir, defaultConfigFilePath))
+	data, err := os.ReadFile(filepath.Join(tmpDir, defaultConfigFilePath))
 	require.Nil(err)
 
 	if !checkConfig(string(data)) {
@@ -52,7 +51,7 @@ func TestEnsureTestRoot(t *testing.T) {
 	rootDir := cfg.RootDir
 
 	// make sure config is set properly
-	data, err := ioutil.ReadFile(filepath.Join(rootDir, defaultConfigFilePath))
+	data, err := os.ReadFile(filepath.Join(rootDir, defaultConfigFilePath))
 	require.Nil(err)
 
 	if !checkConfig(string(data)) {

consensus/byzantine_test.go

@@ -42,7 +42,7 @@ func TestByzantinePrevoteEquivocation(t *testing.T) {
 	const prevoteHeight = int64(2)
 	testName := "consensus_byzantine_test"
 	tickerFunc := newMockTickerFunc(true)
-	appFunc := newCounter
+	appFunc := newKVStore
 
 	genDoc, privVals := randGenesisDoc(nValidators, false, 30)
 	css := make([]*State, nValidators)
@@ -302,7 +302,7 @@ func TestByzantinePrevoteEquivocation(t *testing.T) {
 func TestByzantineConflictingProposalsWithPartition(t *testing.T) {
 	N := 4
 	logger := consensusLogger().With("test", "byzantine")
-	app := newCounter
+	app := newKVStore
 	css, cleanup := randConsensusNet(N, "consensus_byzantine_test", newMockTickerFunc(false), app)
 	defer cleanup()
 
@@ -446,8 +446,8 @@ func TestByzantineConflictingProposalsWithPartition(t *testing.T) {
 	case <-done:
 	case <-tick.C:
 		for i, reactor := range reactors {
-			t.Log(fmt.Sprintf("Consensus Reactor %v", i))
-			t.Log(fmt.Sprintf("%v", reactor))
+			t.Logf("Consensus Reactor %v", i)
+			t.Logf("%v", reactor)
 		}
 		t.Fatalf("Timed out waiting for all validators to commit first block")
 	}

consensus/common_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
@@ -20,7 +19,6 @@ import (
 	dbm "github.com/tendermint/tm-db"
 
 	abcicli "github.com/tendermint/tendermint/abci/client"
-	"github.com/tendermint/tendermint/abci/example/counter"
 	"github.com/tendermint/tendermint/abci/example/kvstore"
 	abci "github.com/tendermint/tendermint/abci/types"
 	cfg "github.com/tendermint/tendermint/config"
@@ -463,7 +461,7 @@ func randState(nValidators int) (*State, []*validatorStub) {
 
 	vss := make([]*validatorStub, nValidators)
 
-	cs := newState(state, privVals[0], counter.NewApplication(true))
+	cs := newState(state, privVals[0], kvstore.NewApplication())
 
 	for i := 0; i < nValidators; i++ {
 		vss[i] = newValidatorStub(privVals[i], int32(i))
@@ -768,11 +766,11 @@ func randConsensusNetWithPeers(
 		if i < nValidators {
 			privVal = privVals[i]
 		} else {
-			tempKeyFile, err := ioutil.TempFile("", "priv_validator_key_")
+			tempKeyFile, err := os.CreateTemp("", "priv_validator_key_")
 			if err != nil {
 				panic(err)
 			}
-			tempStateFile, err := ioutil.TempFile("", "priv_validator_state_")
+			tempStateFile, err := os.CreateTemp("", "priv_validator_state_")
 			if err != nil {
 				panic(err)
 			}
@@ -887,20 +885,18 @@ func (m *mockTicker) Chan() <-chan timeoutInfo {
 
 func (*mockTicker) SetLogger(log.Logger) {}
 
-//------------------------------------
-
-func newCounter() abci.Application {
-	return counter.NewApplication(true)
-}
-
 func newPersistentKVStore() abci.Application {
-	dir, err := ioutil.TempDir("", "persistent-kvstore")
+	dir, err := os.MkdirTemp("", "persistent-kvstore")
 	if err != nil {
 		panic(err)
 	}
 	return kvstore.NewPersistentKVStoreApplication(dir)
 }
 
+func newKVStore() abci.Application {
+	return kvstore.NewApplication()
+}
+
 func newPersistentKVStoreWithPath(dbDir string) abci.Application {
 	return kvstore.NewPersistentKVStoreApplication(dbDir)
 }

consensus/invalid_test.go

@@ -18,7 +18,7 @@ import (
 // Ensure a testnet makes blocks
 func TestReactorInvalidPrecommit(t *testing.T) {
 	N := 4
-	css, cleanup := randConsensusNet(N, "consensus_reactor_test", newMockTickerFunc(true), newCounter)
+	css, cleanup := randConsensusNet(N, "consensus_reactor_test", newMockTickerFunc(true), newKVStore)
 	defer cleanup()
 
 	for i := 0; i < 4; i++ {

consensus/metrics.gen.go

@@ -0,0 +1,195 @@
+// Code generated by metricsgen. DO NOT EDIT.
+
+package consensus
+
+import (
+	"github.com/go-kit/kit/metrics/discard"
+	prometheus "github.com/go-kit/kit/metrics/prometheus"
+	stdprometheus "github.com/prometheus/client_golang/prometheus"
+)
+
+func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics {
+	labels := []string{}
+	for i := 0; i < len(labelsAndValues); i += 2 {
+		labels = append(labels, labelsAndValues[i])
+	}
+	return &Metrics{
+		Height: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "height",
+			Help:      "Height of the chain.",
+		}, labels).With(labelsAndValues...),
+		ValidatorLastSignedHeight: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "validator_last_signed_height",
+			Help:      "Last height signed by this validator if the node is a validator.",
+		}, append(labels, "validator_address")).With(labelsAndValues...),
+		Rounds: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "rounds",
+			Help:      "Number of rounds.",
+		}, labels).With(labelsAndValues...),
+		RoundDurationSeconds: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "round_duration_seconds",
+			Help:      "Histogram of round duration.",
+
+			Buckets: stdprometheus.ExponentialBucketsRange(0.1, 100, 8),
+		}, labels).With(labelsAndValues...),
+		Validators: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "validators",
+			Help:      "Number of validators.",
+		}, labels).With(labelsAndValues...),
+		ValidatorsPower: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "validators_power",
+			Help:      "Total power of all validators.",
+		}, labels).With(labelsAndValues...),
+		ValidatorPower: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "validator_power",
+			Help:      "Power of a validator.",
+		}, append(labels, "validator_address")).With(labelsAndValues...),
+		ValidatorMissedBlocks: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "validator_missed_blocks",
+			Help:      "Amount of blocks missed per validator.",
+		}, append(labels, "validator_address")).With(labelsAndValues...),
+		MissingValidators: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "missing_validators",
+			Help:      "Number of validators who did not sign.",
+		}, labels).With(labelsAndValues...),
+		MissingValidatorsPower: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "missing_validators_power",
+			Help:      "Total power of the missing validators.",
+		}, labels).With(labelsAndValues...),
+		ByzantineValidators: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "byzantine_validators",
+			Help:      "Number of validators who tried to double sign.",
+		}, labels).With(labelsAndValues...),
+		ByzantineValidatorsPower: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "byzantine_validators_power",
+			Help:      "Total power of the byzantine validators.",
+		}, labels).With(labelsAndValues...),
+		BlockIntervalSeconds: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "block_interval_seconds",
+			Help:      "Time between this and the last block.",
+		}, labels).With(labelsAndValues...),
+		NumTxs: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "num_txs",
+			Help:      "Number of transactions.",
+		}, labels).With(labelsAndValues...),
+		BlockSizeBytes: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "block_size_bytes",
+			Help:      "Size of the block.",
+		}, labels).With(labelsAndValues...),
+		TotalTxs: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "total_txs",
+			Help:      "Total number of transactions.",
+		}, labels).With(labelsAndValues...),
+		CommittedHeight: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "latest_block_height",
+			Help:      "The latest block height.",
+		}, labels).With(labelsAndValues...),
+		FastSyncing: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "fast_syncing",
+			Help:      "Whether or not a node is fast syncing. 1 if yes, 0 if no.",
+		}, labels).With(labelsAndValues...),
+		StateSyncing: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "state_syncing",
+			Help:      "Whether or not a node is state syncing. 1 if yes, 0 if no.",
+		}, labels).With(labelsAndValues...),
+		BlockParts: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "block_parts",
+			Help:      "Number of block parts transmitted by each peer.",
+		}, append(labels, "peer_id")).With(labelsAndValues...),
+		StepDurationSeconds: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "step_duration_seconds",
+			Help:      "Histogram of durations for each step in the consensus protocol.",
+
+			Buckets: stdprometheus.ExponentialBucketsRange(0.1, 100, 8),
+		}, append(labels, "step")).With(labelsAndValues...),
+		BlockGossipPartsReceived: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "block_gossip_parts_received",
+			Help:      "Number of block parts received by the node, separated by whether the part was relevant to the block the node is trying to gather or not.",
+		}, append(labels, "matches_current")).With(labelsAndValues...),
+		QuorumPrevoteDelay: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "quorum_prevote_delay",
+			Help:      "Interval in seconds between the proposal timestamp and the timestamp of the earliest prevote that achieved a quorum.",
+		}, append(labels, "proposer_address")).With(labelsAndValues...),
+		FullPrevoteDelay: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "full_prevote_delay",
+			Help:      "Interval in seconds between the proposal timestamp and the timestamp of the latest prevote in a round where all validators voted.",
+		}, append(labels, "proposer_address")).With(labelsAndValues...),
+	}
+}
+
+func NopMetrics() *Metrics {
+	return &Metrics{
+		Height:                    discard.NewGauge(),
+		ValidatorLastSignedHeight: discard.NewGauge(),
+		Rounds:                    discard.NewGauge(),
+		RoundDurationSeconds:      discard.NewHistogram(),
+		Validators:                discard.NewGauge(),
+		ValidatorsPower:           discard.NewGauge(),
+		ValidatorPower:            discard.NewGauge(),
+		ValidatorMissedBlocks:     discard.NewGauge(),
+		MissingValidators:         discard.NewGauge(),
+		MissingValidatorsPower:    discard.NewGauge(),
+		ByzantineValidators:       discard.NewGauge(),
+		ByzantineValidatorsPower:  discard.NewGauge(),
+		BlockIntervalSeconds:      discard.NewHistogram(),
+		NumTxs:                    discard.NewGauge(),
+		BlockSizeBytes:            discard.NewGauge(),
+		TotalTxs:                  discard.NewGauge(),
+		CommittedHeight:           discard.NewGauge(),
+		FastSyncing:               discard.NewGauge(),
+		StateSyncing:              discard.NewGauge(),
+		BlockParts:                discard.NewCounter(),
+		StepDurationSeconds:       discard.NewHistogram(),
+		BlockGossipPartsReceived:  discard.NewCounter(),
+		QuorumPrevoteDelay:        discard.NewGauge(),
+		FullPrevoteDelay:          discard.NewGauge(),
+	}
+}

consensus/metrics.go

@@ -1,11 +1,12 @@
 package consensus
 
 import (
-	"github.com/go-kit/kit/metrics"
-	"github.com/go-kit/kit/metrics/discard"
+	"strings"
+	"time"
 
-	prometheus "github.com/go-kit/kit/metrics/prometheus"
-	stdprometheus "github.com/prometheus/client_golang/prometheus"
+	"github.com/go-kit/kit/metrics"
+	cstypes "github.com/tendermint/tendermint/consensus/types"
+	"github.com/tendermint/tendermint/types"
 )
 
 const (
@@ -14,25 +15,30 @@ const (
 	MetricsSubsystem = "consensus"
 )
 
+//go:generate go run ../scripts/metricsgen -struct=Metrics
+
 // Metrics contains metrics exposed by this package.
 type Metrics struct {
 	// Height of the chain.
 	Height metrics.Gauge
 
-	// ValidatorLastSignedHeight of a validator.
-	ValidatorLastSignedHeight metrics.Gauge
+	// Last height signed by this validator if the node is a validator.
+	ValidatorLastSignedHeight metrics.Gauge `metrics_labels:"validator_address"`
 
 	// Number of rounds.
 	Rounds metrics.Gauge
 
+	// Histogram of round duration.
+	RoundDurationSeconds metrics.Histogram `metrics_buckettype:"exprange" metrics_bucketsizes:"0.1, 100, 8"`
+
 	// Number of validators.
 	Validators metrics.Gauge
 	// Total power of all validators.
 	ValidatorsPower metrics.Gauge
 	// Power of a validator.
-	ValidatorPower metrics.Gauge
-	// Amount of blocks missed by a validator.
-	ValidatorMissedBlocks metrics.Gauge
+	ValidatorPower metrics.Gauge `metrics_labels:"validator_address"`
+	// Amount of blocks missed per validator.
+	ValidatorMissedBlocks metrics.Gauge `metrics_labels:"validator_address"`
 	// Number of validators who did not sign.
 	MissingValidators metrics.Gauge
 	// Total power of the missing validators.
@@ -52,14 +58,22 @@ type Metrics struct {
 	// Total number of transactions.
 	TotalTxs metrics.Gauge
 	// The latest block height.
-	CommittedHeight metrics.Gauge
+	CommittedHeight metrics.Gauge `metrics_name:"latest_block_height"`
 	// Whether or not a node is fast syncing. 1 if yes, 0 if no.
 	FastSyncing metrics.Gauge
 	// Whether or not a node is state syncing. 1 if yes, 0 if no.
 	StateSyncing metrics.Gauge
 
-	// Number of blockparts transmitted by peer.
-	BlockParts metrics.Counter
+	// Number of block parts transmitted by each peer.
+	BlockParts metrics.Counter `metrics_labels:"peer_id"`
+
+	// Histogram of durations for each step in the consensus protocol.
+	StepDurationSeconds metrics.Histogram `metrics_labels:"step" metrics_buckettype:"exprange" metrics_bucketsizes:"0.1, 100, 8"`
+	stepStart           time.Time
+
+	// Number of block parts received by the node, separated by whether the part
+	// was relevant to the block the node is trying to gather or not.
+	BlockGossipPartsReceived metrics.Counter `metrics_labels:"matches_current"`
 
 	// QuroumPrevoteMessageDelay is the interval in seconds between the proposal
 	// timestamp and the timestamp of the earliest prevote that achieved a quorum
@@ -70,183 +84,35 @@ type Metrics struct {
 	// be above 2/3 of the total voting power of the network defines the endpoint
 	// the endpoint of the interval. Subtract the proposal timestamp from this endpoint
 	// to obtain the quorum delay.
-	QuorumPrevoteMessageDelay metrics.Gauge
+	//metrics:Interval in seconds between the proposal timestamp and the timestamp of the earliest prevote that achieved a quorum.
+	QuorumPrevoteDelay metrics.Gauge `metrics_labels:"proposer_address"`
 
-	// FullPrevoteMessageDelay is the interval in seconds between the proposal
+	// FullPrevoteDelay is the interval in seconds between the proposal
 	// timestamp and the timestamp of the latest prevote in a round where 100%
 	// of the voting power on the network issued prevotes.
-	FullPrevoteMessageDelay metrics.Gauge
+	//metrics:Interval in seconds between the proposal timestamp and the timestamp of the latest prevote in a round where all validators voted.
+	FullPrevoteDelay metrics.Gauge `metrics_labels:"proposer_address"`
 }
 
-// PrometheusMetrics returns Metrics build using Prometheus client library.
-// Optionally, labels can be provided along with their values ("foo",
-// "fooValue").
-func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics {
-	labels := []string{}
-	for i := 0; i < len(labelsAndValues); i += 2 {
-		labels = append(labels, labelsAndValues[i])
-	}
-	return &Metrics{
-		Height: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "height",
-			Help:      "Height of the chain.",
-		}, labels).With(labelsAndValues...),
-		Rounds: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "rounds",
-			Help:      "Number of rounds.",
-		}, labels).With(labelsAndValues...),
-
-		Validators: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "validators",
-			Help:      "Number of validators.",
-		}, labels).With(labelsAndValues...),
-		ValidatorLastSignedHeight: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "validator_last_signed_height",
-			Help:      "Last signed height for a validator",
-		}, append(labels, "validator_address")).With(labelsAndValues...),
-		ValidatorMissedBlocks: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "validator_missed_blocks",
-			Help:      "Total missed blocks for a validator",
-		}, append(labels, "validator_address")).With(labelsAndValues...),
-		ValidatorsPower: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "validators_power",
-			Help:      "Total power of all validators.",
-		}, labels).With(labelsAndValues...),
-		ValidatorPower: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "validator_power",
-			Help:      "Power of a validator",
-		}, append(labels, "validator_address")).With(labelsAndValues...),
-		MissingValidators: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "missing_validators",
-			Help:      "Number of validators who did not sign.",
-		}, labels).With(labelsAndValues...),
-		MissingValidatorsPower: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "missing_validators_power",
-			Help:      "Total power of the missing validators.",
-		}, labels).With(labelsAndValues...),
-		ByzantineValidators: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "byzantine_validators",
-			Help:      "Number of validators who tried to double sign.",
-		}, labels).With(labelsAndValues...),
-		ByzantineValidatorsPower: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "byzantine_validators_power",
-			Help:      "Total power of the byzantine validators.",
-		}, labels).With(labelsAndValues...),
-		BlockIntervalSeconds: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "block_interval_seconds",
-			Help:      "Time between this and the last block.",
-		}, labels).With(labelsAndValues...),
-		NumTxs: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "num_txs",
-			Help:      "Number of transactions.",
-		}, labels).With(labelsAndValues...),
-		BlockSizeBytes: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "block_size_bytes",
-			Help:      "Size of the block.",
-		}, labels).With(labelsAndValues...),
-		TotalTxs: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "total_txs",
-			Help:      "Total number of transactions.",
-		}, labels).With(labelsAndValues...),
-		CommittedHeight: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "latest_block_height",
-			Help:      "The latest block height.",
-		}, labels).With(labelsAndValues...),
-		FastSyncing: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "fast_syncing",
-			Help:      "Whether or not a node is fast syncing. 1 if yes, 0 if no.",
-		}, labels).With(labelsAndValues...),
-		StateSyncing: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "state_syncing",
-			Help:      "Whether or not a node is state syncing. 1 if yes, 0 if no.",
-		}, labels).With(labelsAndValues...),
-		BlockParts: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "block_parts",
-			Help:      "Number of blockparts transmitted by peer.",
-		}, append(labels, "peer_id")).With(labelsAndValues...),
-		QuorumPrevoteMessageDelay: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "quorum_prevote_message_delay",
-			Help: "Difference in seconds between the proposal timestamp and the timestamp " +
-				"of the latest prevote that achieved a quorum in the prevote step.",
-		}, labels).With(labelsAndValues...),
-		FullPrevoteMessageDelay: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "full_prevote_message_delay",
-			Help: "Difference in seconds between the proposal timestamp and the timestamp " +
-				"of the latest prevote that achieved 100% of the voting power in the prevote step.",
-		}, labels).With(labelsAndValues...),
-	}
+// RecordConsMetrics uses for recording the block related metrics during fast-sync.
+func (m *Metrics) RecordConsMetrics(block *types.Block) {
+	m.NumTxs.Set(float64(len(block.Data.Txs)))
+	m.TotalTxs.Add(float64(len(block.Data.Txs)))
+	m.BlockSizeBytes.Set(float64(block.Size()))
+	m.CommittedHeight.Set(float64(block.Height))
 }
 
-// NopMetrics returns no-op Metrics.
-func NopMetrics() *Metrics {
-	return &Metrics{
-		Height: discard.NewGauge(),
-
-		ValidatorLastSignedHeight: discard.NewGauge(),
-
-		Rounds: discard.NewGauge(),
-
-		Validators:               discard.NewGauge(),
-		ValidatorsPower:          discard.NewGauge(),
-		ValidatorPower:           discard.NewGauge(),
-		ValidatorMissedBlocks:    discard.NewGauge(),
-		MissingValidators:        discard.NewGauge(),
-		MissingValidatorsPower:   discard.NewGauge(),
-		ByzantineValidators:      discard.NewGauge(),
-		ByzantineValidatorsPower: discard.NewGauge(),
-
-		BlockIntervalSeconds: discard.NewHistogram(),
-
-		NumTxs:                    discard.NewGauge(),
-		BlockSizeBytes:            discard.NewGauge(),
-		TotalTxs:                  discard.NewGauge(),
-		CommittedHeight:           discard.NewGauge(),
-		FastSyncing:               discard.NewGauge(),
-		StateSyncing:              discard.NewGauge(),
-		BlockParts:                discard.NewCounter(),
-		QuorumPrevoteMessageDelay: discard.NewGauge(),
-		FullPrevoteMessageDelay:   discard.NewGauge(),
-	}
+func (m *Metrics) MarkRound(r int32, st time.Time) {
+	m.Rounds.Set(float64(r))
+	roundTime := time.Since(st).Seconds()
+	m.RoundDurationSeconds.Observe(roundTime)
+}
+
+func (m *Metrics) MarkStep(s cstypes.RoundStepType) {
+	if !m.stepStart.IsZero() {
+		stepTime := time.Since(m.stepStart).Seconds()
+		stepName := strings.TrimPrefix(s.String(), "RoundStep")
+		m.StepDurationSeconds.With("step", stepName).Observe(stepTime)
+	}
+	m.stepStart = time.Now()
 }

consensus/reactor_test.go

@@ -112,7 +112,7 @@ func stopConsensusNet(logger log.Logger, reactors []*Reactor, eventBuses []*type
 // Ensure a testnet makes blocks
 func TestReactorBasic(t *testing.T) {
 	N := 4
-	css, cleanup := randConsensusNet(N, "consensus_reactor_test", newMockTickerFunc(true), newCounter)
+	css, cleanup := randConsensusNet(N, "consensus_reactor_test", newMockTickerFunc(true), newKVStore)
 	defer cleanup()
 	reactors, blocksSubs, eventBuses := startConsensusNet(t, css, N)
 	defer stopConsensusNet(log.TestingLogger(), reactors, eventBuses)
@@ -127,11 +127,11 @@ func TestReactorWithEvidence(t *testing.T) {
 	nValidators := 4
 	testName := "consensus_reactor_test"
 	tickerFunc := newMockTickerFunc(true)
-	appFunc := newCounter
+	appFunc := newKVStore
 
 	// heed the advice from https://www.sandimetz.com/blog/2016/1/20/the-wrong-abstraction
 	// to unroll unwieldy abstractions. Here we duplicate the code from:
-	// css := randConsensusNet(N, "consensus_reactor_test", newMockTickerFunc(true), newCounter)
+	// css := randConsensusNet(N, "consensus_reactor_test", newMockTickerFunc(true), newKVStore)
 
 	genDoc, privVals := randGenesisDoc(nValidators, false, 30)
 	css := make([]*State, nValidators)
@@ -233,7 +233,7 @@ func TestReactorWithEvidence(t *testing.T) {
 // Ensure a testnet makes blocks when there are txs
 func TestReactorCreatesBlockWhenEmptyBlocksFalse(t *testing.T) {
 	N := 4
-	css, cleanup := randConsensusNet(N, "consensus_reactor_test", newMockTickerFunc(true), newCounter,
+	css, cleanup := randConsensusNet(N, "consensus_reactor_test", newMockTickerFunc(true), newKVStore,
 		func(c *cfg.Config) {
 			c.Consensus.CreateEmptyBlocks = false
 		})
@@ -254,7 +254,7 @@ func TestReactorCreatesBlockWhenEmptyBlocksFalse(t *testing.T) {
 
 func TestReactorReceiveDoesNotPanicIfAddPeerHasntBeenCalledYet(t *testing.T) {
 	N := 1
-	css, cleanup := randConsensusNet(N, "consensus_reactor_test", newMockTickerFunc(true), newCounter)
+	css, cleanup := randConsensusNet(N, "consensus_reactor_test", newMockTickerFunc(true), newKVStore)
 	defer cleanup()
 	reactors, _, eventBuses := startConsensusNet(t, css, N)
 	defer stopConsensusNet(log.TestingLogger(), reactors, eventBuses)
@@ -277,7 +277,7 @@ func TestReactorReceiveDoesNotPanicIfAddPeerHasntBeenCalledYet(t *testing.T) {
 
 func TestReactorReceivePanicsIfInitPeerHasntBeenCalledYet(t *testing.T) {
 	N := 1
-	css, cleanup := randConsensusNet(N, "consensus_reactor_test", newMockTickerFunc(true), newCounter)
+	css, cleanup := randConsensusNet(N, "consensus_reactor_test", newMockTickerFunc(true), newKVStore)
 	defer cleanup()
 	reactors, _, eventBuses := startConsensusNet(t, css, N)
 	defer stopConsensusNet(log.TestingLogger(), reactors, eventBuses)
@@ -300,7 +300,7 @@ func TestReactorReceivePanicsIfInitPeerHasntBeenCalledYet(t *testing.T) {
 // Test we record stats about votes and block parts from other peers.
 func TestReactorRecordsVotesAndBlockParts(t *testing.T) {
 	N := 4
-	css, cleanup := randConsensusNet(N, "consensus_reactor_test", newMockTickerFunc(true), newCounter)
+	css, cleanup := randConsensusNet(N, "consensus_reactor_test", newMockTickerFunc(true), newKVStore)
 	defer cleanup()
 	reactors, blocksSubs, eventBuses := startConsensusNet(t, css, N)
 	defer stopConsensusNet(log.TestingLogger(), reactors, eventBuses)
@@ -521,7 +521,7 @@ func TestReactorValidatorSetChanges(t *testing.T) {
 // Check we can make blocks with skip_timeout_commit=false
 func TestReactorWithTimeoutCommit(t *testing.T) {
 	N := 4
-	css, cleanup := randConsensusNet(N, "consensus_reactor_with_timeout_commit_test", newMockTickerFunc(false), newCounter)
+	css, cleanup := randConsensusNet(N, "consensus_reactor_with_timeout_commit_test", newMockTickerFunc(false), newKVStore)
 	defer cleanup()
 	// override default SkipTimeoutCommit == true for tests
 	for i := 0; i < N; i++ {

consensus/replay.go

@@ -55,7 +55,7 @@ func (cs *State) readReplayMessage(msg *TimedWALMessage, newStepSub types.Subscr
 					return fmt.Errorf("roundState mismatch. Got %v; Expected %v", m2, m)
 				}
 			case <-newStepSub.Cancelled():
-				return fmt.Errorf("failed to read off newStepSub.Out(). newStepSub was cancelled")
+				return fmt.Errorf("failed to read off newStepSub.Out(). newStepSub was canceled")
 			case <-ticker:
 				return fmt.Errorf("failed to read off newStepSub.Out()")
 			}

consensus/replay_file.go

@@ -309,7 +309,7 @@ func newConsensusStateForReplay(config cfg.BaseConfig, csConfig *cfg.ConsensusCo
 
 	// Create proxyAppConn connection (consensus, mempool, query)
 	clientCreator := proxy.DefaultClientCreator(config.ProxyApp, config.ABCI, config.DBDir())
-	proxyApp := proxy.NewAppConns(clientCreator)
+	proxyApp := proxy.NewAppConns(clientCreator, proxy.NopMetrics())
 	err = proxyApp.Start()
 	if err != nil {
 		tmos.Exit(fmt.Sprintf("Error starting proxy app conns: %v", err))

consensus/replay_stubs.go

@@ -66,7 +66,7 @@ func newMockProxyApp(appHash []byte, abciResponses *tmstate.ABCIResponses) proxy
 	if err != nil {
 		panic(err)
 	}
-	return proxy.NewAppConnConsensus(cli)
+	return proxy.NewAppConnConsensus(cli, proxy.NopMetrics())
 }
 
 type mockProxyApp struct {

consensus/replay_test.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -78,7 +77,7 @@ func startNewStateAndWaitForBlock(t *testing.T, consensusReplayConfig *cfg.Confi
 	)
 	cs.SetLogger(logger)
 
-	bytes, _ := ioutil.ReadFile(cs.config.WalFile())
+	bytes, _ := os.ReadFile(cs.config.WalFile())
 	t.Logf("====== WAL: \n\r%X\n", bytes)
 
 	err := cs.Start()
@@ -98,7 +97,7 @@ func startNewStateAndWaitForBlock(t *testing.T, consensusReplayConfig *cfg.Confi
 	select {
 	case <-newBlockSub.Out():
 	case <-newBlockSub.Cancelled():
-		t.Fatal("newBlockSub was cancelled")
+		t.Fatal("newBlockSub was canceled")
 	case <-time.After(120 * time.Second):
 		t.Fatal("Timed out waiting for new block (see trace above)")
 	}
@@ -634,7 +633,7 @@ func TestMockProxyApp(t *testing.T) {
 }
 
 func tempWALWithData(data []byte) string {
-	walFile, err := ioutil.TempFile("", "wal")
+	walFile, err := os.CreateTemp("", "wal")
 	if err != nil {
 		panic(fmt.Sprintf("failed to create temp WAL file: %v", err))
 	}
@@ -710,7 +709,7 @@ func testHandshakeReplay(t *testing.T, config *cfg.Config, nBlocks int, mode uin
 	if nBlocks > 0 {
 		// run nBlocks against a new client to build up the app state.
 		// use a throwaway tendermint state
-		proxyApp := proxy.NewAppConns(clientCreator2)
+		proxyApp := proxy.NewAppConns(clientCreator2, proxy.NopMetrics())
 		stateDB1 := dbm.NewMemDB()
 		stateStore := sm.NewStore(stateDB1)
 		err := stateStore.Save(genesisState)
@@ -730,7 +729,7 @@ func testHandshakeReplay(t *testing.T, config *cfg.Config, nBlocks int, mode uin
 	// now start the app using the handshake - it should sync
 	genDoc, _ := sm.MakeGenesisDocFromFile(config.GenesisFile())
 	handshaker := NewHandshaker(stateStore, state, store, genDoc)
-	proxyApp := proxy.NewAppConns(clientCreator2)
+	proxyApp := proxy.NewAppConns(clientCreator2, proxy.NopMetrics())
 	if err := proxyApp.Start(); err != nil {
 		t.Fatalf("Error starting proxy app connections: %v", err)
 	}
@@ -839,7 +838,7 @@ func buildTMStateFromChain(
 	clientCreator := proxy.NewLocalClientCreator(
 		kvstore.NewPersistentKVStoreApplication(
 			filepath.Join(config.DBDir(), fmt.Sprintf("replay_test_%d_%d_t", nBlocks, mode))))
-	proxyApp := proxy.NewAppConns(clientCreator)
+	proxyApp := proxy.NewAppConns(clientCreator, proxy.NopMetrics())
 	if err := proxyApp.Start(); err != nil {
 		panic(err)
 	}
@@ -905,7 +904,7 @@ func TestHandshakePanicsIfAppReturnsWrongAppHash(t *testing.T) {
 	{
 		app := &badApp{numBlocks: 3, allHashesAreWrong: true}
 		clientCreator := proxy.NewLocalClientCreator(app)
-		proxyApp := proxy.NewAppConns(clientCreator)
+		proxyApp := proxy.NewAppConns(clientCreator, proxy.NopMetrics())
 		err := proxyApp.Start()
 		require.NoError(t, err)
 		t.Cleanup(func() {
@@ -929,7 +928,7 @@ func TestHandshakePanicsIfAppReturnsWrongAppHash(t *testing.T) {
 	{
 		app := &badApp{numBlocks: 3, onlyLastHashIsWrong: true}
 		clientCreator := proxy.NewLocalClientCreator(app)
-		proxyApp := proxy.NewAppConns(clientCreator)
+		proxyApp := proxy.NewAppConns(clientCreator, proxy.NopMetrics())
 		err := proxyApp.Start()
 		require.NoError(t, err)
 		t.Cleanup(func() {
@@ -1059,7 +1058,7 @@ func makeBlockchainFromWAL(wal WAL) ([]*types.Block, []*types.Commit, error) {
 			// if its not the first one, we have a full block
 			if thisBlockParts != nil {
 				var pbb = new(tmproto.Block)
-				bz, err := ioutil.ReadAll(thisBlockParts.GetReader())
+				bz, err := io.ReadAll(thisBlockParts.GetReader())
 				if err != nil {
 					panic(err)
 				}
@@ -1098,7 +1097,7 @@ func makeBlockchainFromWAL(wal WAL) ([]*types.Block, []*types.Commit, error) {
 		}
 	}
 	// grab the last block too
-	bz, err := ioutil.ReadAll(thisBlockParts.GetReader())
+	bz, err := io.ReadAll(thisBlockParts.GetReader())
 	if err != nil {
 		panic(err)
 	}
@@ -1182,6 +1181,7 @@ func (bs *mockBlockStore) LoadBlock(height int64) *types.Block { return bs.chain
 func (bs *mockBlockStore) LoadBlockByHash(hash []byte) *types.Block {
 	return bs.chain[int64(len(bs.chain))-1]
 }
+func (bs *mockBlockStore) LoadBlockMetaByHash(hash []byte) *types.BlockMeta { return nil }
 func (bs *mockBlockStore) LoadBlockMeta(height int64) *types.BlockMeta {
 	block := bs.chain[height-1]
 	return &types.BlockMeta{
@@ -1232,7 +1232,7 @@ func TestHandshakeUpdatesValidators(t *testing.T) {
 	// now start the app using the handshake - it should sync
 	genDoc, _ := sm.MakeGenesisDocFromFile(config.GenesisFile())
 	handshaker := NewHandshaker(stateStore, state, store, genDoc)
-	proxyApp := proxy.NewAppConns(clientCreator)
+	proxyApp := proxy.NewAppConns(clientCreator, proxy.NopMetrics())
 	if err := proxyApp.Start(); err != nil {
 		t.Fatalf("Error starting proxy app connections: %v", err)
 	}

consensus/state.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"runtime/debug"
 	"sort"
@@ -523,6 +523,14 @@ func (cs *State) updateHeight(height int64) {
 }
 
 func (cs *State) updateRoundStep(round int32, step cstypes.RoundStepType) {
+	if !cs.replayMode {
+		if round != cs.Round || round == 0 && step == cstypes.RoundStepNewRound {
+			cs.metrics.MarkRound(cs.Round, cs.StartTime)
+		}
+		if cs.Step != step {
+			cs.metrics.MarkStep(cs.Step)
+		}
+	}
 	cs.Round = round
 	cs.Step = step
 }
@@ -821,7 +829,7 @@ func (cs *State) handleMsg(mi msgInfo) {
 
 		// We unlock here to yield to any routines that need to read the the RoundState.
 		// Previously, this code held the lock from the point at which the final block
-		// part was recieved until the block executed against the application.
+		// part was received until the block executed against the application.
 		// This prevented the reactor from being able to retrieve the most updated
 		// version of the RoundState. The reactor needs the updated RoundState to
 		// gossip the now completed block.
@@ -1021,9 +1029,6 @@ func (cs *State) enterNewRound(height int64, round int32) {
 	if err := cs.eventBus.PublishEventNewRound(cs.NewRoundEvent()); err != nil {
 		cs.Logger.Error("failed publishing new round", "err", err)
 	}
-
-	cs.metrics.Rounds.Set(float64(round))
-
 	// Wait for txs to be available in the mempool
 	// before we enterPropose in round 0. If the last block changed the app hash,
 	// we may need an empty "proof" block, and enterPropose immediately.
@@ -1854,11 +1859,13 @@ func (cs *State) addProposalBlockPart(msg *BlockPartMessage, peerID p2p.ID) (add
 	// Blocks might be reused, so round mismatch is OK
 	if cs.Height != height {
 		cs.Logger.Debug("received block part from wrong height", "height", height, "round", round)
+		cs.metrics.BlockGossipPartsReceived.With("matches_current", "false").Add(1)
 		return false, nil
 	}
 
 	// We're not expecting a block part.
 	if cs.ProposalBlockParts == nil {
+		cs.metrics.BlockGossipPartsReceived.With("matches_current", "false").Add(1)
 		// NOTE: this can happen when we've gone to a higher round and
 		// then receive parts from the previous round - not necessarily a bad peer.
 		cs.Logger.Debug(
@@ -1873,15 +1880,21 @@ func (cs *State) addProposalBlockPart(msg *BlockPartMessage, peerID p2p.ID) (add
 
 	added, err = cs.ProposalBlockParts.AddPart(part)
 	if err != nil {
+		if errors.Is(err, types.ErrPartSetInvalidProof) || errors.Is(err, types.ErrPartSetUnexpectedIndex) {
+			cs.metrics.BlockGossipPartsReceived.With("matches_current", "false").Add(1)
+		}
 		return added, err
 	}
+
+	cs.metrics.BlockGossipPartsReceived.With("matches_current", "true").Add(1)
+
 	if cs.ProposalBlockParts.ByteSize() > cs.state.ConsensusParams.Block.MaxBytes {
 		return added, fmt.Errorf("total size of proposal block parts exceeds maximum block bytes (%d > %d)",
 			cs.ProposalBlockParts.ByteSize(), cs.state.ConsensusParams.Block.MaxBytes,
 		)
 	}
 	if added && cs.ProposalBlockParts.IsComplete() {
-		bz, err := ioutil.ReadAll(cs.ProposalBlockParts.GetReader())
+		bz, err := io.ReadAll(cs.ProposalBlockParts.GetReader())
 		if err != nil {
 			return added, err
 		}
@@ -2034,7 +2047,7 @@ func (cs *State) addVote(vote *types.Vote, peerID p2p.ID) (added bool, err error
 	}
 
 	// Height mismatch is ignored.
-	// Not necessarily a bad peer, but not favourable behaviour.
+	// Not necessarily a bad peer, but not favorable behavior.
 	if vote.Height != cs.Height {
 		cs.Logger.Debug("vote ignored and not added", "vote_height", vote.Height, "cs_height", cs.Height, "peer", peerID)
 		return
@@ -2310,12 +2323,12 @@ func (cs *State) calculatePrevoteMessageDelayMetrics() {
 		_, val := cs.Validators.GetByAddress(v.ValidatorAddress)
 		votingPowerSeen += val.VotingPower
 		if votingPowerSeen >= cs.Validators.TotalVotingPower()*2/3+1 {
-			cs.metrics.QuorumPrevoteMessageDelay.Set(v.Timestamp.Sub(cs.Proposal.Timestamp).Seconds())
+			cs.metrics.QuorumPrevoteDelay.With("proposer_address", cs.Validators.GetProposer().Address.String()).Set(v.Timestamp.Sub(cs.Proposal.Timestamp).Seconds())
 			break
 		}
 	}
 	if ps.HasAll() {
-		cs.metrics.FullPrevoteMessageDelay.Set(pl[len(pl)-1].Timestamp.Sub(cs.Proposal.Timestamp).Seconds())
+		cs.metrics.FullPrevoteDelay.With("proposer_address", cs.Validators.GetProposer().Address.String()).Set(pl[len(pl)-1].Timestamp.Sub(cs.Proposal.Timestamp).Seconds())
 	}
 }
 

consensus/state_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tendermint/abci/example/counter"
+	"github.com/tendermint/tendermint/abci/example/kvstore"
 	cstypes "github.com/tendermint/tendermint/consensus/types"
 	"github.com/tendermint/tendermint/crypto/tmhash"
 	"github.com/tendermint/tendermint/libs/log"
@@ -630,7 +630,7 @@ func TestStateLockPOLRelock(t *testing.T) {
 	signAddVotes(cs1, tmproto.PrecommitType, nil, types.PartSetHeader{}, vs2, vs3, vs4)
 
 	// before we timeout to the new round set the new proposal
-	cs2 := newState(cs1.state, vs2, counter.NewApplication(true))
+	cs2 := newState(cs1.state, vs2, kvstore.NewApplication())
 	prop, propBlock := decideProposal(cs2, vs2, vs2.Height, vs2.Round+1)
 	if prop == nil || propBlock == nil {
 		t.Fatal("Failed to create proposal block with vs2")
@@ -815,7 +815,7 @@ func TestStateLockPOLUnlockOnUnknownBlock(t *testing.T) {
 	signAddVotes(cs1, tmproto.PrecommitType, nil, types.PartSetHeader{}, vs2, vs3, vs4)
 
 	// before we timeout to the new round set the new proposal
-	cs2 := newState(cs1.state, vs2, counter.NewApplication(true))
+	cs2 := newState(cs1.state, vs2, kvstore.NewApplication())
 	prop, propBlock := decideProposal(cs2, vs2, vs2.Height, vs2.Round+1)
 	if prop == nil || propBlock == nil {
 		t.Fatal("Failed to create proposal block with vs2")
@@ -859,7 +859,7 @@ func TestStateLockPOLUnlockOnUnknownBlock(t *testing.T) {
 	signAddVotes(cs1, tmproto.PrecommitType, nil, types.PartSetHeader{}, vs2, vs3, vs4)
 
 	// before we timeout to the new round set the new proposal
-	cs3 := newState(cs1.state, vs3, counter.NewApplication(true))
+	cs3 := newState(cs1.state, vs3, kvstore.NewApplication())
 	prop, propBlock = decideProposal(cs3, vs3, vs3.Height, vs3.Round+1)
 	if prop == nil || propBlock == nil {
 		t.Fatal("Failed to create proposal block with vs2")

consensus/wal_generator.go

@@ -59,7 +59,7 @@ func WALGenerateNBlocks(t *testing.T, wr io.Writer, numBlocks int) (err error) {
 
 	blockStore := store.NewBlockStore(blockStoreDB)
 
-	proxyApp := proxy.NewAppConns(proxy.NewLocalClientCreator(app))
+	proxyApp := proxy.NewAppConns(proxy.NewLocalClientCreator(app), proxy.NopMetrics())
 	proxyApp.SetLogger(logger.With("module", "proxy"))
 	if err := proxyApp.Start(); err != nil {
 		return fmt.Errorf("failed to start proxy app connections: %w", err)

consensus/wal_test.go

@@ -3,7 +3,6 @@ package consensus
 import (
 	"bytes"
 	"crypto/rand"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -27,7 +26,7 @@ const (
 )
 
 func TestWALTruncate(t *testing.T) {
-	walDir, err := ioutil.TempDir("", "wal")
+	walDir, err := os.MkdirTemp("", "wal")
 	require.NoError(t, err)
 	defer os.RemoveAll(walDir)
 
@@ -109,7 +108,7 @@ func TestWALEncoderDecoder(t *testing.T) {
 }
 
 func TestWALWrite(t *testing.T) {
-	walDir, err := ioutil.TempDir("", "wal")
+	walDir, err := os.MkdirTemp("", "wal")
 	require.NoError(t, err)
 	defer os.RemoveAll(walDir)
 	walFile := filepath.Join(walDir, "wal")
@@ -177,7 +176,7 @@ func TestWALSearchForEndHeight(t *testing.T) {
 }
 
 func TestWALPeriodicSync(t *testing.T) {
-	walDir, err := ioutil.TempDir("", "wal")
+	walDir, err := os.MkdirTemp("", "wal")
 	require.NoError(t, err)
 	defer os.RemoveAll(walDir)
 

crypto/armor/armor.go

@@ -3,7 +3,7 @@ package armor
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 
 	"golang.org/x/crypto/openpgp/armor" // nolint: staticcheck
 )
@@ -31,7 +31,7 @@ func DecodeArmor(armorStr string) (blockType string, headers map[string]string,
 	if err != nil {
 		return "", nil, nil, err
 	}
-	data, err = ioutil.ReadAll(block.Body)
+	data, err = io.ReadAll(block.Body)
 	if err != nil {
 		return "", nil, nil, err
 	}

docs/app-dev/abci-cli.md

@@ -31,7 +31,6 @@ Available Commands:
   check_tx    Validate a tx
   commit      Commit the application state and return the Merkle root hash
   console     Start an interactive abci console for multiple commands
-  counter     ABCI demo example
   deliver_tx  Deliver a new tx to the application
   kvstore     ABCI demo example
   echo        Have the application echo a message
@@ -214,140 +213,9 @@ we do `deliver_tx "abc=efg"` it will store `(abc, efg)`.
 Similarly, you could put the commands in a file and run
 `abci-cli --verbose batch < myfile`.
 
-## Counter - Another Example
-
-Now that we've got the hang of it, let's try another application, the
-"counter" app.
-
-Like the kvstore app, its code can be found
-[here](https://github.com/tendermint/tendermint/blob/v0.34.x/abci/cmd/abci-cli/abci-cli.go)
-and looks like:
-
-```go
-func cmdCounter(cmd *cobra.Command, args []string) error {
-
-    app := counter.NewCounterApplication(flagSerial)
-
-    logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
-
-    // Start the listener
-    srv, err := server.NewServer(flagAddrC, flagAbci, app)
-    if err != nil {
-        return err
-    }
-    srv.SetLogger(logger.With("module", "abci-server"))
-    if err := srv.Start(); err != nil {
-        return err
-    }
-
-    // Stop upon receiving SIGTERM or CTRL-C.
-    tmos.TrapSignal(logger, func() {
-        // Cleanup
-        srv.Stop()
-    })
-
-    // Run forever.
-    select {}
-}
-```
-
-The counter app doesn't use a Merkle tree, it just counts how many times
-we've sent a transaction, asked for a hash, or committed the state. The
-result of `commit` is just the number of transactions sent.
-
-This application has two modes: `serial=off` and `serial=on`.
-
-When `serial=on`, transactions must be a big-endian encoded incrementing
-integer, starting at 0.
-
-If `serial=off`, there are no restrictions on transactions.
-
-We can toggle the value of `serial` using the `set_option` ABCI message.
-
-When `serial=on`, some transactions are invalid. In a live blockchain,
-transactions collect in memory before they are committed into blocks. To
-avoid wasting resources on invalid transactions, ABCI provides the
-`check_tx` message, which application developers can use to accept or
-reject transactions, before they are stored in memory or gossipped to
-other peers.
-
-In this instance of the counter app, `check_tx` only allows transactions
-whose integer is greater than the last committed one.
-
-Let's kill the console and the kvstore application, and start the
-counter app:
-
-```sh
-abci-cli counter
-```
-
-In another window, start the `abci-cli console`:
-
-```sh
-> set_option serial on
--> code: OK
--> log: OK (SetOption doesn't return anything.)
-
-> check_tx 0x00
--> code: OK
-
-> check_tx 0xff
--> code: OK
-
-> deliver_tx 0x00
--> code: OK
-
-> check_tx 0x00
--> code: BadNonce
--> log: Invalid nonce. Expected >= 1, got 0
-
-> deliver_tx 0x01
--> code: OK
-
-> deliver_tx 0x04
--> code: BadNonce
--> log: Invalid nonce. Expected 2, got 4
-
-> info
--> code: OK
--> data: {"hashes":0,"txs":2}
--> data.hex: 0x7B22686173686573223A302C22747873223A327D
-```
-
-This is a very simple application, but between `counter` and `kvstore`,
-its easy to see how you can build out arbitrary application states on
-top of the ABCI. [Hyperledger's
-Burrow](https://github.com/hyperledger/burrow) also runs atop ABCI,
-bringing with it Ethereum-like accounts, the Ethereum virtual-machine,
-Monax's permissioning scheme, and native contracts extensions.
-
-But the ultimate flexibility comes from being able to write the
-application easily in any language.
-
-We have implemented the counter in a number of languages [see the
-example directory](https://github.com/tendermint/tendermint/tree/master/abci/example).
-
-To run the Node.js version, fist download & install [the Javascript ABCI server](https://github.com/tendermint/js-abci):
-
-```sh
-git clone https://github.com/tendermint/js-abci.git
-cd js-abci
-npm install abci
-```
-
-Now you can start the app:
-
-```sh
-node example/counter.js
-```
-
-(you'll have to kill the other counter application process). In another
-window, run the console and those previous ABCI commands. You should get
-the same results as for the Go version.
-
 ## Bounties
 
-Want to write the counter app in your favorite language?! We'd be happy
+Want to write an app in your favorite language?! We'd be happy
 to add you to our [ecosystem](https://github.com/tendermint/awesome#ecosystem)!
 See [funding](https://github.com/interchainio/funding) opportunities from the
 [Interchain Foundation](https://interchain.io/) for implementations in new languages and more.

docs/app-dev/getting-started.md

@@ -37,8 +37,8 @@ cd $GOPATH/src/github.com/tendermint/tendermint
 make install_abci
 ```
 
-Now you should have the `abci-cli` installed; you'll see a couple of
-commands (`counter` and `kvstore`) that are example applications written
+Now you should have the `abci-cli` installed; you'll notice the `kvstore`
+command, an example application written
 in Go. See below for an application written in JavaScript.
 
 Now, let's run some apps!
@@ -165,92 +165,6 @@ curl -s 'localhost:26657/abci_query?data="name"'
 Try some other transactions and queries to make sure everything is
 working!
 
-## Counter - Another Example
-
-Now that we've got the hang of it, let's try another application, the
-`counter` app.
-
-The counter app doesn't use a Merkle tree, it just counts how many times
-we've sent a transaction, or committed the state.
-
-This application has two modes: `serial=off` and `serial=on`.
-
-When `serial=on`, transactions must be a big-endian encoded incrementing
-integer, starting at 0.
-
-If `serial=off`, there are no restrictions on transactions.
-
-In a live blockchain, transactions collect in memory before they are
-committed into blocks. To avoid wasting resources on invalid
-transactions, ABCI provides the `CheckTx` message, which application
-developers can use to accept or reject transactions, before they are
-stored in memory or gossipped to other peers.
-
-In this instance of the counter app, with `serial=on`, `CheckTx` only
-allows transactions whose integer is greater than the last committed
-one.
-
-Let's kill the previous instance of `tendermint` and the `kvstore`
-application, and start the counter app. We can enable `serial=on` with a
-flag:
-
-```sh
-abci-cli counter --serial
-```
-
-In another window, reset then start Tendermint:
-
-```sh
-tendermint unsafe_reset_all
-tendermint node
-```
-
-Once again, you can see the blocks streaming by. Let's send some
-transactions. Since we have set `serial=on`, the first transaction must
-be the number `0`:
-
-```sh
-curl localhost:26657/broadcast_tx_commit?tx=0x00
-```
-
-Note the empty (hence successful) response. The next transaction must be
-the number `1`. If instead, we try to send a `5`, we get an error:
-
-```json
-> curl localhost:26657/broadcast_tx_commit?tx=0x05
-{
-  "jsonrpc": "2.0",
-  "id": "",
-  "result": {
-    "check_tx": {},
-    "deliver_tx": {
-      "code": 2,
-      "log": "Invalid nonce. Expected 1, got 5"
-    },
-    "hash": "33B93DFF98749B0D6996A70F64071347060DC19C",
-    "height": 34
-  }
-}
-```
-
-But if we send a `1`, it works again:
-
-```json
-> curl localhost:26657/broadcast_tx_commit?tx=0x01
-{
-  "jsonrpc": "2.0",
-  "id": "",
-  "result": {
-    "check_tx": {},
-    "deliver_tx": {},
-    "hash": "F17854A977F6FA7EEA1BD758E296710B86F72F3D",
-    "height": 60
-  }
-}
-```
-
-For more details on the `broadcast_tx` API, see [the guide on using
-Tendermint](../tendermint-core/using-tendermint.md).
 
 ## CounterJS - Example in Another Language
 

docs/architecture/adr-007-trust-metric-usage.md

@@ -10,8 +10,8 @@ As the node becomes well connected to the rest of the network, it can dial lesse
 quality peers and help assess their quality. Similarly, when queried for peers, a node should make
 sure they dont return low quality peers.
 
-Peer quality can be tracked using a trust metric that flags certain behaviours as good or bad. When enough
-bad behaviour accumulates, we can mark the peer as bad and disconnect.
+Peer quality can be tracked using a trust metric that flags certain behaviors as good or bad. When enough
+bad behavior accumulates, we can mark the peer as bad and disconnect.
 For example, when the PEXReactor makes a request for peers network addresses from an already known peer, and the returned network addresses are unreachable, this undesirable behavior should be tracked. Returning a few bad network addresses probably shouldn’t cause a peer to be dropped, while excessive amounts of this behavior does qualify the peer for removal. The originally proposed approach and design document for the trust metric can be found in the [ADR 006](adr-006-trust-metric.md) document.
 
 The trust metric implementation allows a developer to obtain a peer's trust metric from a trust metric store, and track good and bad events relevant to a peer's behavior, and at any time, the peer's metric can be queried for a current trust value. The current trust value is calculated with a formula that utilizes current behavior, previous behavior, and change between the two. Current behavior is calculated as the percentage of good behavior within a time interval. The time interval is short; probably set between 30 seconds and 5 minutes. On the other hand, the historic data can estimate a peer's behavior over days worth of tracking. At the end of a time interval, the current behavior becomes part of the historic data, and a new time interval begins with the good and bad counters reset to zero.
@@ -77,7 +77,7 @@ When a peer receives a pexRequestMessage, it returns a random sample of high qua
 Peer quality is tracked in the connection and across the reactors by storing the TrustMetric in the peer's
 thread safe Data store.
 
-Peer behaviour is then defined as one of the following:
+Peer behavior is then defined as one of the following:
 
 - Fatal - something outright malicious that causes us to disconnect the peer and ban it from the address book for some amount of time
 - Bad - Any kind of timeout, messages that don't unmarshal, fail other validity checks, or messages we didn't ask for or aren't expecting (usually worth one bad event)
@@ -85,7 +85,7 @@ Peer behaviour is then defined as one of the following:
 - Correct - Normal correct behavior (worth one good event)
 - Good - some random majority of peers per reactor sending us useful messages (worth more than one good event).
 
-Note that Fatal behaviour causes us to remove the peer, and neutral behaviour does not affect the score.
+Note that Fatal behavior causes us to remove the peer, and neutral behavior does not affect the score.
 
 ## Status
 

docs/architecture/adr-009-ABCI-design.md

@@ -74,7 +74,7 @@ convenient to work with address information, and for it to be simple to do so.
 ### AbsentValidators
 
 Tendermint also provides a list of validators in BeginBlock who did not sign the
-last block. This allows applications to reflect availability behaviour in the
+last block. This allows applications to reflect availability behavior in the
 application, for instance by punishing validators for not having votes included
 in commits.
 

docs/architecture/adr-016-protocol-versions.md

@@ -75,14 +75,14 @@ to connect to peers with older version.
 
 ### P2PVersion
 
-- All p2p and reactor messaging (messages, detectable behaviour)
+- All p2p and reactor messaging (messages, detectable behavior)
 - Will change gradually as reactors evolve to improve performance and support new features - eg proposed new message types BatchTx in the mempool and HasBlockPart in the consensus
 - It's easy to determine the version of a peer from its first serialized message/s
 - New versions must be compatible with at least one old version to allow gradual upgrades
 
 ### AppVersion
 
-- The ABCI state machine (txs, begin/endblock behaviour, commit hashing)
+- The ABCI state machine (txs, begin/endblock behavior, commit hashing)
 - Behaviour and message types will change abruptly in the course of the life of a chain
 - Need to minimize complexity of the code for supporting different AppVersions at different heights
 - Ideally, each version of the software supports only a _single_ AppVersion at one time

docs/architecture/adr-023-ABCI-propose-tx.md

@@ -28,14 +28,14 @@ Due to the requirements of [Minimal Viable Plasma (MVP)](https://ethresear.ch/t/
 
    `exit` transactions may also be treated in a similar manner, wherein the
    input is the UTXO being exited on the Root Chain, and the output belongs to
-   a reserved "burn" address, e.g., `0x0`. In such cases, it is favourable for
+   a reserved "burn" address, e.g., `0x0`. In such cases, it is favorable for
    the containing block to only hold a single transaction that may receive
    special treatment.
 
 2. Other "internal" transactions on the child chain, which may be initiated
    unilaterally. The most basic example of is a coinbase transaction
    implementing validator node incentives, but may also be app-specific. In
-   these cases, it may be favourable for such transactions to
+   these cases, it may be favorable for such transactions to
    be ordered in a specific manner, e.g., coinbase transactions will always be
    at index 0. In general, such strategies increase the determinism and
    predictability of blockchain applications.

docs/architecture/adr-039-peer-behaviour.md

@@ -6,20 +6,20 @@
 
 ## Context
 
-The responsibility for signaling and acting upon peer behaviour lacks a single 
+The responsibility for signaling and acting upon peer behavior lacks a single 
 owning component and is heavily coupled with the network stack[<sup>1</sup>](#references). Reactors
 maintain a reference to the `p2p.Switch` which they use to call 
 `switch.StopPeerForError(...)` when a peer misbehaves and 
 `switch.MarkAsGood(...)` when a peer contributes in some meaningful way. 
 While the switch handles `StopPeerForError` internally, the `MarkAsGood` 
 method delegates to another component, `p2p.AddrBook`. This scheme of delegation 
-across Switch obscures the responsibility for handling peer behaviour
+across Switch obscures the responsibility for handling peer behavior
 and ties up the reactors in a larger dependency graph when testing.
 
 ## Decision
 
 Introduce a `PeerBehaviour` interface and concrete implementations which
-provide methods for reactors to signal peer behaviour without direct
+provide methods for reactors to signal peer behavior without direct
 coupling `p2p.Switch`.  Introduce a ErrorBehaviourPeer to provide
 concrete reasons for stopping peers. Introduce GoodBehaviourPeer to provide
 concrete ways in which a peer contributes.
@@ -139,10 +139,10 @@ Accepted
 
 ### Positive
 
-    * De-couple signaling from acting upon peer behaviour.
+    * De-couple signaling from acting upon peer behavior.
     * Reduce the coupling of reactors and the Switch and the network
       stack
-    * The responsibility of managing peer behaviour can be migrated to
+    * The responsibility of managing peer behavior can be migrated to
       a single component instead of split between the switch and the
       address book.
 

docs/architecture/adr-042-state-sync.md

@@ -146,7 +146,7 @@ subjectivity](https://github.com/tendermint/tendermint/pull/3795)) and
 can compare any subset of keys called a chunk against the merkle root.
 The advantage of light client validation is that the block headers are
 signed by validators which have something to lose for malicious
-behaviour. If a validator were to provide an invalid proof, they can be
+behavior. If a validator were to provide an invalid proof, they can be
 slashed.
 
 Majority of peer validation: A manifest file containing a list of chunks

docs/architecture/adr-045-abci-evidence.md

@@ -22,7 +22,7 @@ main chain - so called Fork-Lite. See the
 document for more details. For a sequential lite client, this can happen via
 equivocation or amnesia attacks. For a skipping lite client this can also happen
 via lunatic validator attacks. There must be some way for applications to punish
-all forms of misbehaviour.
+all forms of misbehavior.
 
 The essential question is whether Tendermint should manage the evidence
 verification, or whether it should treat evidence more like a transaction (ie.
@@ -52,7 +52,7 @@ Arguments in favor of leaving evidence handling in Tendermint:
   currently](https://github.com/tendermint/tendermint/blob/c67154232ca8be8f5c21dff65d154127adc4f7bb/docs/spec/consensus/fork-detection.md)
   is via a centralized
   monitor service that is trusted for liveness to aggregate data from
-  current and past validators, but which produces a proof of misbehaviour (ie.
+  current and past validators, but which produces a proof of misbehavior (ie.
   via amnesia) that can be verified by anyone, including the blockchain.
   Validators must submit all the votes they saw for the relevant consensus
   height to justify their precommits. This is quite specific to the Tendermint

docs/architecture/adr-059-evidence-composition-and-lifecycle.md

@@ -189,7 +189,7 @@ After verification we persist the evidence with the key `height/hash` to the pen
 
 #### ABCI Evidence
 
-Both evidence structures contain data (such as timestamp) that are necessary to be passed to the application but do not strictly constitute evidence of misbehaviour. As such, these fields are verified last. If any of these fields are invalid to a node i.e. they don't correspond with their state, nodes will reconstruct a new evidence struct from the existing fields and repopulate the abci specific fields with their own state data.
+Both evidence structures contain data (such as timestamp) that are necessary to be passed to the application but do not strictly constitute evidence of misbehavior. As such, these fields are verified last. If any of these fields are invalid to a node i.e. they don't correspond with their state, nodes will reconstruct a new evidence struct from the existing fields and repopulate the abci specific fields with their own state data.
 
 #### Broadcasting and receiving evidence
 

docs/architecture/adr-075-rpc-subscription.md

@@ -48,7 +48,7 @@ to the node.  Unlike the other methods of the service, for which each call is
 serviced by a short-lived HTTP round trip, subscription delivers a continuous
 stream of events to the client by hijacking the HTTP channel for a websocket.
 The stream (and hence the HTTP request) persists until either the subscription
-is explicitly cancelled, or the connection is closed.
+is explicitly canceled, or the connection is closed.
 
 There are several problems with this API:
 

docs/introduction/what-is-tendermint.md

@@ -67,7 +67,7 @@ configuration, service discovery, locking, leader-election, and so on.
 Tendermint is in essence similar software, but with two key differences:
 
 - It is Byzantine Fault Tolerant, meaning it can only tolerate up to a
-  1/3 of failures, but those failures can include arbitrary behaviour -
+  1/3 of failures, but those failures can include arbitrary behavior -
   including hacking and malicious attacks. - It does not specify a
   particular application, like a fancy key-value store. Instead, it
   focuses on arbitrary state machine replication, so developers can build
@@ -101,13 +101,13 @@ Another example of a cryptocurrency application built on Tendermint is
 
 [Fabric](https://github.com/hyperledger/fabric) takes a similar approach
 to Tendermint, but is more opinionated about how the state is managed,
-and requires that all application behaviour runs in potentially many
+and requires that all application behavior runs in potentially many
 docker containers, modules it calls "chaincode". It uses an
 implementation of [PBFT](http://pmg.csail.mit.edu/papers/osdi99.pdf).
 from a team at IBM that is [augmented to handle potentially
 non-deterministic
 chaincode](https://www.zurich.ibm.com/~cca/papers/sieve.pdf) It is
-possible to implement this docker-based behaviour as a ABCI app in
+possible to implement this docker-based behavior as a ABCI app in
 Tendermint, though extending Tendermint to handle non-determinism
 remains for future work.
 

docs/presubmit.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+#
+# This script verifies that each document in the docs and architecture
+# directory has a corresponding table-of-contents entry in its README file.
+#
+# This can be run manually from the command line.
+# It is also run in CI via the docs-toc.yml workflow.
+#
+set -euo pipefail
+
+readonly base="$(dirname $0)"
+cd "$base"
+
+readonly workdir="$(mktemp -d)"
+trap "rm -fr -- '$workdir'" EXIT
+
+checktoc() {
+    local dir="$1"
+    local tag="$2"'-*-*'
+    local out="$workdir/${dir}.out.txt"
+    (
+        cd "$dir" >/dev/null
+        find . -maxdepth 1 -type f -name "$tag" -not -exec grep -q "({})" README.md ';' -print
+    ) > "$out"
+    if [[ -s "$out" ]] ; then
+        echo "-- The following files in $dir lack a ToC entry:
+"
+        cat "$out"
+        return 1
+    fi
+}
+
+err=0
+
+# Verify that each RFC and ADR has a ToC entry in its README file.
+checktoc architecture adr || ((err++))
+checktoc rfc rfc || ((err++))
+
+exit $err

docs/rfc/README.md

@@ -59,5 +59,6 @@ sections.
 - [RFC-019: Configuration File Versioning](./rfc-019-config-version.md)
 - [RFC-020: Onboarding Projects](./rfc-020-onboarding-projects.rst)
 - [RFC-021: The Future of the Socket Protocol](./rfc-021-socket-protocol.md)
+- [RFC-023: Semi-permanent Testnet](./rfc-023-semi-permanent-testnet.md)
 
 <!-- - [RFC-NNN: Title](./rfc-NNN-title.md) -->

docs/rfc/rfc-023-semi-permanent-testnet.md

@@ -0,0 +1,263 @@
+# RFC 023: Semi-permanent Testnet
+
+## Changelog
+
+- 2022-07-28: Initial draft (@mark-rushakoff)
+- 2022-07-29: Renumber to 023, minor clarifications (@mark-rushakoff)
+
+## Abstract
+
+This RFC discusses a long-lived testnet, owned and operated by the Tendermint engineers.
+By owning and operating a production-like testnet,
+the team who develops Tendermint becomes more capable of discovering bugs that
+only arise in production-like environments.
+They also build expertise in operating Tendermint;
+this will help guide the development of Tendermint towards operator-friendly design.
+
+The RFC details a rough roadmap towards a semi-permanent testnet, some of the considered tradeoffs,
+and the expected outcomes from following this roadmap.
+
+## Background
+
+The author's understanding -- which is limited as a new contributor to the Tendermint project --
+is that Tendermint development has been largely treated as a library for other projects to consume.
+Of course effort has been spent on unit tests, end-to-end tests, and integration tests.
+But whether developing a library or an application,
+there is no substitute for putting the software under a production-like load.
+
+First, there are classes of bugs that are unrealistic to discover in environments
+that do not resemble production.
+But perhaps more importantly, there are "operational features" that are best designed
+by the authors of a given piece of software.
+For instance, does the software have sufficient observability built-in?
+Are the reported metrics useful?
+Are the log messages clear and sufficiently detailed, without being too noisy?
+
+Furthermore, if the library authors are not only building --
+but also maintaining and operating -- an application built on top of their library,
+the authors will have a greatly increased confidence that their library's API
+is appropriate for other application authors.
+
+Once the decision has been made to run and operate a service,
+one of the next strategic questions is that of deploying said service.
+The author strongly holds the opinion that, when possible,
+a continuous delivery model offers the most compelling set of advantages:
+- The code on a particular branch (likely `main` or `master`) is exactly what is,
+  or what will very soon be, running in production
+- There are no manual steps involved in deploying -- other than merging your pull request,
+  which you had to do anyway
+- A bug discovered in production can be rapidly confirmed as fixed in production
+
+In summary, if the tendermint authors build, maintain, and continuously deliver an application
+intended to serve as a long-lived testnet, they will be able to state with confidence:
+- We operate the software in a production-like environment and we have observed it to be
+  stable and performant to our requirements
+- We have discovered issues in production before any external parties have consumed our software,
+  and we have addressed said issues
+- We have successfully used the observability tooling built into our software
+  (perhaps in conjunction with other off-the-shelf tooling)
+  to diagnose and debug issues in production
+
+## Discussion
+
+The Discussion Section proposes a variety of aspects of maintaining a testnet for Tendermint.
+
+### Number of testnets
+
+There should probably be one testnet per maintained branch of Tendermint,
+i.e. one for the `main` branch
+and one per `v0.N.x` branch that the authors maintain.
+
+There may also exist testnets for long-lived feature branches.
+
+We may eventually discover that there is good reason to run more than one testnet for a branch,
+perhaps due to a significant configuration variation.
+
+### Testnet lifecycle
+
+The document has used the terms "long-lived" and "semi-permanent" somewhat interchangeably.
+The intent of the testnet being discussed in this RFC is to exist indefinitely;
+but there is a practical understanding that there will be testnet instances
+which will be retired due to a variety of reasons.
+For instance, once a release branch is no longer supported,
+its corresponding testnet should be torn down.
+
+In general, new commits to branches with corresponding testnets
+should result in an in-place upgrade of all nodes in the testnet
+without any data loss and without requiring new configuration.
+The mechanism for achieving this is outside the scope of this RFC.
+
+However, it is also expected that there will be
+breaking changes during the development of the `main` branch.
+For instance, suppose there is an unreleased feature involving storage on disk,
+and the developers need to change the storage format.
+It should be at the developers' discretion whether it is feasible and worthwhile
+to introduce an intermediate commit that translates the old format to the new format,
+or if it would be preferable to just destroy the testnet and start from scratch
+without any data in the old format.
+
+Similarly, if a developer inadvertently pushed a breaking change to an unreleased feature,
+they are free to make a judgement call between reverting the change,
+adding a commit to allow a forward migration,
+or simply forcing the testnet to recreate.
+
+### Testnet maintenance investment
+
+While there is certainly engineering effort required to build the tooling and infrastructure
+to get the testnets up and running,
+the intent is that a running testnet requires no manual upkeep under normal conditions.
+
+It is expected that a subset of the Tendermint engineers are familiar with and engaged in
+writing the software to maintain and build the testnet infrastructure,
+but the rest of the team should not need any involvement in authoring that code.
+
+The testnets should be configured to send notifications for events requiring triage,
+such as a chain halt or a node OOMing.
+The time investment necessary to address the underlying issues for those kind of events
+is unpredictable.
+
+Aside from triaging exceptional events, an engineer may choose to spend some time
+collecting metrics or profiles from testnet nodes to check performance details
+before and after a particular change;
+or they may inspect logs associated with an expected behavior change.
+But during day-to-day work, engineers are not expected to spend any considerable time
+directly interacting with the testnets.
+
+If we discover that there are any routine actions engineers must take against the testnet
+that take any substantial focused time,
+those actions should be automated to a one-line command as much as is reasonable.
+
+### Testnet MVP
+
+The minimum viable testnet meets this set of features:
+
+- The testnet self-updates following a new commit pushed to Tendermint's `main` branch on GitHub
+  (there are some omitted steps here, such as CI building appropriate binaries and
+  somehow notifying the testnet that a new build is available)
+- The testnet runs the Tendermint KV store for MVP
+- The testnet operators are notified if:
+    - Any node's process exits for any reason other than a restart for a new binary
+    - Any node stops updating blocks, and by extension if a chain halt occurs
+    - No other observability will be considered for MVP
+- The testnet has a minimum of 1 full node and 3 validators
+- The testnet has a reasonably low, constant throughput of transactions -- say 30 tx/min --
+  and the testnet operators are notified if that throughput drops below 75% of target
+  sustained over 5 minutes
+- The testnet only needs to run in a single datacenter/cloud-region for MVP,
+  i.e. running in multiple datacenters is out of scope for MVP
+- The testnet is running directly on VMs or compute instances;
+  while Kubernetes or other orchestration frameworks may offer many significant advantages,
+  the Tendermint engineers should not be required to learn those tools in order to
+  perform basic debugging
+
+### Testnet medium-term goals
+
+The medium-term goals are intended to be achievable within the 6-12 month time range
+following the launch of MVP.
+These goals could realistically be roadmapped following the launch of the MVP testnet.
+
+- The `main` testnet has more than 20 nodes (completely arbitrary -- 5x more than 1+3 at MVP)
+- In addition to the `main` testnet,
+  there is at least one testnet associated with one release branch
+- The testnet no longer is simply running the Tendermint KV store;
+  now it is built on a more complex, custom application
+  that deliberately exercises a greater portion of the Tendermint stack
+- Each testnet is spread across at least two cloud providers,
+  in order to communicate over a network more closely resembling use of Tendermint in "real" chains
+- The node updates have some "jitter",
+  with some nodes updating immediately when a new build is available,
+  and others delaying up to perhaps 30-60 minutes
+- The team has published some form of dashboards that have served well for debugging,
+  which external parties can copy/modify to their needs
+    - The dashboards must include metrics published by Tendermint nodes;
+      there should be both OS- or runtime-level metrics such as memory in use,
+      and application-level metrics related to the underlying blockchain
+    - "Published" in this context is more in the spirit of "shared with the community",
+      not "produced a supported open source tool" --
+      this could be published to GitHub with a warning that no support is offered,
+      or it could simply be a blog post detailing what has worked for the Tendermint developers
+    - The dashboards will likely be implemented on free and open source tooling,
+      but that is not a hard requirement if paid software is more appropriate
+- The team has produced a reference model of a log aggregation stack that external parties can use
+    - Similar to the "published" dashboards, this only needs to be "shared" rather than "supported"
+- Chaos engineering has begun being integrated into the testnets
+  (this could be periodic CPU limiting or deliberate network interference, etc.
+  but it probably would not be filesystem corruption)
+- Each testnet has at least one node running a build with the Go race detector enabled
+- The testnet contains some kind of generalized notification system built in:
+    - Tendermint code grows "watchdog" systems built in to validate things like
+      subsystems have not deadlocked; e.g. if the watchdog can't acquire and immediately release
+      a particular mutex once in every 5-minute period, it is near certain that the target
+      subsystem has deadlocked, and an alert must be sent to the engineering team.
+      (Outside of the testnet, the watchdogs could be disabled, or they could panic on failure.)
+    - The notification system does some deduplication to minimize spam on system failure
+
+### Testnet long-term vision
+
+The long-term vision includes goals that are not necessary for short- or medium-term success,
+but which would support building an increasingly stable and performant product.
+These goals would generally be beyond the one-year plan,
+and therefore they would not be part of initial planning.
+
+- There is a centralized dashboard to get a quick overview of all testnets,
+  or at least one centralized dashboard per testnet,
+  showing TBD basic information
+- Testnets include cloud spot instances which periodically and abruptly join and leave the network
+- The testnets are a heterogeneous mixture of straight VMs and Docker containers,
+  thereby more closely representing production blockchains
+- Testnets have some manner of continuous profiling,
+  so that we can produce an apples-to-apples comparison of CPU/memory cost of particular operations
+
+### Testnet non-goals
+
+There are some things we are explicitly not trying to achieve with long-lived testnets:
+
+- The Tendermint engineers will NOT be responsible for the testnets' availability
+  outside of working hours; there will not be any kind of on-call schedule
+- As a result of the 8x5 support noted in the previous point,
+  there will be NO guarantee of uptime or availability for any testnet
+- The testnets will NOT be used to gate pull requests;
+  that responsibility belongs to unit tests, end-to-end tests, and integration tests
+- Similarly, the testnet will NOT be used to automate any changes back into Tendermint source code;
+  we will not automatically create a revert commit due to a failed rollout, for instance
+- The testnets are NOT intended to have participation from machines outside of the
+  Tendermint engineering team's control, as the Tendermint engineers are expected
+  to have full access to any instance where they may need to debug an issue
+- While there will certainly be individuals within the Tendermint engineering team
+  who will continue to build out their individual "devops" skills to produce
+  the infrastructure for the testnet, it is NOT a goal that every Tendermint engineer
+  is even _familiar_ with the tech stack involved, whether it is Ansible, Terraform,
+  Kubernetes, etc.
+  As a rule of thumb, all engineers should be able to get shell access on any given instance
+  and should have access to the instance's logs.
+  Little if any further operational skills will be expected.
+- The testnets are not intended to be _created_ for one-off experiments.
+  While there is nothing wrong with an engineer directly interacting with a testnet
+  to try something out,
+  a testnet comes with a considerable amount of "baggage", so end-to-end or integration tests
+  are closer to the intent for "trying something to see what happens".
+  Direct interaction should be limited to standard blockchain operations,
+  _not_ modifying configuration of nodes.
+- Likewise, the purpose of the testnet is not to run specific "tests" per se,
+  but rather to demonstrate that Tendermint blockchains as a whole are stable
+  under a production load.
+  Of course we will inject faults periodically, but the intent is to observe and prove that
+  the testnet is resilient to those faults.
+  It would be the responsibility of a lower-level test to demonstrate e.g.
+  that the network continues when a single validator disappears without warning.
+- The testnet descriptions in this document are scoped only to building directly on Tendermint;
+  integrating with the Cosmos SDK, or any other third-party library, is out of scope
+
+### Team outcomes as a result of maintaining and operating a testnet
+
+Finally, this section reiterates what team growth we expect by running semi-permanent testnets.
+
+- Confidence that Tendermint is stable under a particular production-like load
+- Familiarity with typical production behavior of Tendermint, e.g. what the logs look like,
+  what the memory footprint looks like, and what kind of throughput is reasonable
+  for a network of a particular size
+- Comfort and familiarity in manually inspecting a misbehaving or failing node
+- Confidence that Tendermint ships sufficient tooling for external users
+  to operate their nodes
+- Confidence that Tendermint exposes useful metrics, and comfort interpreting those metrics
+- Produce useful reference documentation that gives operators confidence to run Tendermint nodes

docs/tendermint-core/configuration.md

@@ -324,9 +324,11 @@ temp_dir = ""
 [fastsync]
 
 # Fast Sync version to use:
+#
+# In v0.37, the v1 and v2 fast sync protocols were deprecated.
+# Please use v0 instead.
+#
 #   1) "v0" (default) - the legacy fast sync implementation
-#   2) "v1" - refactor of v0 version for better testability
-#   2) "v2" - complete redesign of v0, optimized for testability & readability
 version = "v0"
 
 #######################################################

docs/tendermint-core/metrics.md

@@ -18,38 +18,42 @@ Listen address can be changed in the config file (see
 
 The following metrics are available:
 
-| **Name**                               | **Type**  | **Tags**      | **Description**                                                        |
-| -------------------------------------- | --------- | ------------- | ---------------------------------------------------------------------- |
-| consensus_height                       | Gauge     |               | Height of the chain                                                    |
-| consensus_validators                   | Gauge     |               | Number of validators                                                   |
-| consensus_validators_power             | Gauge     |               | Total voting power of all validators                                   |
-| consensus_validator_power              | Gauge     |               | Voting power of the node if in the validator set                       |
-| consensus_validator_last_signed_height | Gauge     |               | Last height the node signed a block, if the node is a validator        |
-| consensus_validator_missed_blocks      | Gauge     |               | Total amount of blocks missed for the node, if the node is a validator |
-| consensus_missing_validators           | Gauge     |               | Number of validators who did not sign                                  |
-| consensus_missing_validators_power     | Gauge     |               | Total voting power of the missing validators                           |
-| consensus_byzantine_validators         | Gauge     |               | Number of validators who tried to double sign                          |
-| consensus_byzantine_validators_power   | Gauge     |               | Total voting power of the byzantine validators                         |
-| consensus_block_interval_seconds       | Histogram |               | Time between this and last block (Block.Header.Time) in seconds        |
-| consensus_rounds                       | Gauge     |               | Number of rounds                                                       |
-| consensus_num_txs                      | Gauge     |               | Number of transactions                                                 |
-| consensus_total_txs                    | Gauge     |               | Total number of transactions committed                                 |
-| consensus_block_parts                  | counter   | peer_id       | number of blockparts transmitted by peer                               |
-| consensus_latest_block_height          | gauge     |               | /status sync_info number                                               |
-| consensus_fast_syncing                 | gauge     |               | either 0 (not fast syncing) or 1 (syncing)                             |
-| consensus_state_syncing                | gauge     |               | either 0 (not state syncing) or 1 (syncing)                            |
-| consensus_block_size_bytes             | Gauge     |               | Block size in bytes                                                    |
-| p2p_peers                              | Gauge     |               | Number of peers node's connected to                                    |
-| p2p_peer_receive_bytes_total           | counter   | peer_id, chID | number of bytes per channel received from a given peer                 |
-| p2p_peer_send_bytes_total              | counter   | peer_id, chID | number of bytes per channel sent to a given peer                       |
-| p2p_peer_pending_send_bytes            | gauge     | peer_id       | number of pending bytes to be sent to a given peer                     |
-| p2p_num_txs                            | gauge     | peer_id       | number of transactions submitted by each peer_id                       |
-| p2p_pending_send_bytes                 | gauge     | peer_id       | amount of data pending to be sent to peer                              |
-| mempool_size                           | Gauge     |               | Number of uncommitted transactions                                     |
-| mempool_tx_size_bytes                  | histogram |               | transaction sizes in bytes                                             |
-| mempool_failed_txs                     | counter   |               | number of failed transactions                                          |
-| mempool_recheck_times                  | counter   |               | number of transactions rechecked in the mempool                        |
-| state_block_processing_time            | histogram |               | time between BeginBlock and EndBlock in ms                             |
+| **Name**                               | **Type**  | **Tags**        | **Description**                                                                                                                            |
+|----------------------------------------|-----------|-----------------|--------------------------------------------------------------------------------------------------------------------------------------------|
+| abci_connection_method_timing_seconds  | Histogram | method, type    | Timings for each of the ABCI methods                                                                                                       |
+| consensus_height                       | Gauge     |                 | Height of the chain                                                                                                                        |
+| consensus_validators                   | Gauge     |                 | Number of validators                                                                                                                       |
+| consensus_validators_power             | Gauge     |                 | Total voting power of all validators                                                                                                       |
+| consensus_validator_power              | Gauge     |                 | Voting power of the node if in the validator set                                                                                           |
+| consensus_validator_last_signed_height | Gauge     |                 | Last height the node signed a block, if the node is a validator                                                                            |
+| consensus_validator_missed_blocks      | Gauge     |                 | Total amount of blocks missed for the node, if the node is a validator                                                                     |
+| consensus_missing_validators           | Gauge     |                 | Number of validators who did not sign                                                                                                      |
+| consensus_missing_validators_power     | Gauge     |                 | Total voting power of the missing validators                                                                                               |
+| consensus_byzantine_validators         | Gauge     |                 | Number of validators who tried to double sign                                                                                              |
+| consensus_byzantine_validators_power   | Gauge     |                 | Total voting power of the byzantine validators                                                                                             |
+| consensus_block_interval_seconds       | Histogram |                 | Time between this and last block (Block.Header.Time) in seconds                                                                            |
+| consensus_rounds                       | Gauge     |                 | Number of rounds                                                                                                                           |
+| consensus_num_txs                      | Gauge     |                 | Number of transactions                                                                                                                     |
+| consensus_total_txs                    | Gauge     |                 | Total number of transactions committed                                                                                                     |
+| consensus_block_parts                  | counter   | peer_id         | number of blockparts transmitted by peer                                                                                                   |
+| consensus_latest_block_height          | gauge     |                 | /status sync_info number                                                                                                                   |
+| consensus_fast_syncing                 | gauge     |                 | either 0 (not fast syncing) or 1 (syncing)                                                                                                 |
+| consensus_state_syncing                | gauge     |                 | either 0 (not state syncing) or 1 (syncing)                                                                                                |
+| consensus_block_size_bytes             | Gauge     |                 | Block size in bytes                                                                                                                        |
+| consensus_step_duration                | Histogram | step            | Histogram of durations for each step in the consensus protocol                                                                             |
+| consensus_round_duration               | Histogram |                 | Histogram of durations for all the rounds that have occurred since the process started                                                     |
+| consensus_block_gossip_parts_received  | Counter   | matches_current | Number of block parts received by the node                                                                                                 |
+| p2p_peers                              | Gauge     |                 | Number of peers node's connected to                                                                                                        |
+| p2p_peer_receive_bytes_total           | counter   | peer_id, chID   | number of bytes per channel received from a given peer                                                                                     |
+| p2p_peer_send_bytes_total              | counter   | peer_id, chID   | number of bytes per channel sent to a given peer                                                                                           |
+| p2p_peer_pending_send_bytes            | gauge     | peer_id         | number of pending bytes to be sent to a given peer                                                                                         |
+| p2p_num_txs                            | gauge     | peer_id         | number of transactions submitted by each peer_id                                                                                           |
+| p2p_pending_send_bytes                 | gauge     | peer_id         | amount of data pending to be sent to peer                                                                                                  |
+| mempool_size                           | Gauge     |                 | Number of uncommitted transactions                                                                                                         |
+| mempool_tx_size_bytes                  | histogram |                 | transaction sizes in bytes                                                                                                                 |
+| mempool_failed_txs                     | counter   |                 | number of failed transactions                                                                                                              |
+| mempool_recheck_times                  | counter   |                 | number of transactions rechecked in the mempool                                                                                            |
+| state_block_processing_time            | histogram |                 | time between BeginBlock and EndBlock in ms                                                                                                 |
 
 ## Useful queries