Move VRF proof from Header to Entropy for compatibity (Finschia#559)

* move proof and round to entropy * fix abci * remove duplicated proto * fix mocks * fix import ordering * fix proto number * fix test
torao · Feb 9, 2023 · bd36bf9 · bd36bf9
1 parent 9bffb13
commit bd36bf9
Show file tree

Hide file tree

Showing 44 changed files with 951 additions and 3,586 deletions.
diff --git a/abci/client/mocks/client.go b/abci/client/mocks/client.go
diff --git a/abci/example/kvstore/kvstore_test.go b/abci/example/kvstore/kvstore_test.go
@@ -10,14 +10,14 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/tendermint/tendermint/abci/types"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
 	abcicli "github.com/line/ostracon/abci/client"
 	"github.com/line/ostracon/abci/example/code"
 	abciserver "github.com/line/ostracon/abci/server"
 	ocabci "github.com/line/ostracon/abci/types"
 	"github.com/line/ostracon/libs/log"
 	"github.com/line/ostracon/libs/service"
-	ocproto "github.com/line/ostracon/proto/ostracon/types"
 )
 
 const (
@@ -105,7 +105,7 @@ func TestPersistentKVStoreInfo(t *testing.T) {
 	// make and apply block
 	height = int64(1)
 	hash := []byte("foo")
-	header := ocproto.Header{
+	header := tmproto.Header{
 		Height: height,
 	}
 	kvstore.BeginBlock(ocabci.RequestBeginBlock{Hash: hash, Header: header})
@@ -198,7 +198,7 @@ func makeApplyBlock(
 	// make and apply block
 	height := int64(heightInt)
 	hash := []byte("foo")
-	header := ocproto.Header{
+	header := tmproto.Header{
 		Height: height,
 	}
 

diff --git a/abci/types/messages_test.go b/abci/types/messages_test.go
@@ -10,8 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/tendermint/tendermint/abci/types"
-
-	tmproto "github.com/line/ostracon/proto/ostracon/types"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 )
 
 func TestMarshalJSON(t *testing.T) {

diff --git a/abci/types/mocks/application.go b/abci/types/mocks/application.go