Merge branch 'master' into abci++

2026-02-07 20:40:44 +00:00 · 2021-08-12 16:21:36 +02:00
parent 7d30987cff d56a44b884
commit 7494f0e498
173 changed files with 3461 additions and 1356 deletions
--- a/proxy/app_conn.go
+++ b/proxy/app_conn.go
@@ -7,7 +7,7 @@ import (
 	"github.com/tendermint/tendermint/abci/types"
 )

-//go:generate mockery --case underscore --name AppConnConsensus|AppConnMempool|AppConnQuery|AppConnSnapshot
+//go:generate ../scripts/mockery_generate.sh AppConnConsensus|AppConnMempool|AppConnQuery|AppConnSnapshot

 //----------------------------------------------------------------------------------------
 // Enforce which abci msgs can be sent on a connection at the type level
--- a/proxy/client.go
+++ b/proxy/client.go
@@ -10,6 +10,8 @@ import (
 	tmsync "github.com/tendermint/tendermint/internal/libs/sync"
 )

+//go:generate ../scripts/mockery_generate.sh ClientCreator
+
 // ClientCreator creates new ABCI clients.
 type ClientCreator interface {
 	// NewABCIClient returns a new ABCI client.
--- a/proxy/mocks/app_conn_consensus.go
+++ b/proxy/mocks/app_conn_consensus.go
@@ -1,4 +1,4 @@
-// Code generated by mockery 2.7.5. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/proxy/mocks/app_conn_mempool.go
+++ b/proxy/mocks/app_conn_mempool.go
@@ -1,4 +1,4 @@
-// Code generated by mockery 2.7.5. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/proxy/mocks/app_conn_query.go
+++ b/proxy/mocks/app_conn_query.go
@@ -1,4 +1,4 @@
-// Code generated by mockery 2.7.5. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/proxy/mocks/app_conn_snapshot.go
+++ b/proxy/mocks/app_conn_snapshot.go
@@ -1,4 +1,4 @@
-// Code generated by mockery 2.7.5. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks

--- a/proxy/mocks/client_creator.go
+++ b/proxy/mocks/client_creator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v1.1.1. DO NOT EDIT.
+// Code generated by mockery. DO NOT EDIT.

 package mocks