feat: clean up the PublicKey of ostracon/crypto/keys message and …

…`AuthSigMessage` of `ostracon/p2p/conn`

abci/example/kvstore/persistent_kvstore.go

@@ -8,13 +8,13 @@ import (
 	"strings"
 
 	abci "github.com/tendermint/tendermint/abci/types"
+	pc "github.com/tendermint/tendermint/proto/tendermint/crypto"
 	dbm "github.com/tendermint/tm-db"
 
 	"github.com/line/ostracon/abci/example/code"
 	ocabci "github.com/line/ostracon/abci/types"
 	cryptoenc "github.com/line/ostracon/crypto/encoding"
 	"github.com/line/ostracon/libs/log"
-	pc "github.com/line/ostracon/proto/ostracon/crypto"
 )
 
 const (

crypto/encoding/codec.go

@@ -3,11 +3,12 @@ package encoding
 import (
 	"fmt"
 
+	pc "github.com/tendermint/tendermint/proto/tendermint/crypto"
+
 	"github.com/line/ostracon/crypto"
 	"github.com/line/ostracon/crypto/ed25519"
 	"github.com/line/ostracon/crypto/secp256k1"
 	"github.com/line/ostracon/libs/json"
-	pc "github.com/line/ostracon/proto/ostracon/crypto"
 )
 
 func init() {

p2p/conn/evil_secret_connection_test.go

@@ -9,13 +9,13 @@ import (
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/gtank/merlin"
 	"github.com/stretchr/testify/assert"
+	tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p"
 	"golang.org/x/crypto/chacha20poly1305"
 
 	"github.com/line/ostracon/crypto"
 	"github.com/line/ostracon/crypto/ed25519"
 	cryptoenc "github.com/line/ostracon/crypto/encoding"
 	"github.com/line/ostracon/libs/protoio"
-	ocp2p "github.com/line/ostracon/proto/ostracon/p2p"
 )
 
 type buffer struct {
@@ -117,7 +117,7 @@ func (c *evilConn) Read(data []byte) (n int, err error) {
 			if err != nil {
 				panic(err)
 			}
-			bz, err := protoio.MarshalDelimited(&ocp2p.AuthSigMessage{PubKey: pkpb, Sig: signature})
+			bz, err := protoio.MarshalDelimited(&tmp2p.AuthSigMessage{PubKey: pkpb, Sig: signature})
 			if err != nil {
 				panic(err)
 			}

p2p/conn/secret_connection.go

@@ -16,6 +16,7 @@ import (
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/gtank/merlin"
 	pool "github.com/libp2p/go-buffer-pool"
+	tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p"
 	"golang.org/x/crypto/chacha20poly1305"
 	"golang.org/x/crypto/curve25519"
 	"golang.org/x/crypto/hkdf"
@@ -27,7 +28,6 @@ import (
 	"github.com/line/ostracon/libs/async"
 	"github.com/line/ostracon/libs/protoio"
 	tmsync "github.com/line/ostracon/libs/sync"
-	ocp2p "github.com/line/ostracon/proto/ostracon/p2p"
 )
 
 // 4 + 1024 == 1028 total frame size
@@ -406,14 +406,14 @@ func shareAuthSignature(sc io.ReadWriter, pubKey crypto.PubKey, signature []byte
 			if err != nil {
 				return nil, true, err
 			}
-			_, err = protoio.NewDelimitedWriter(sc).WriteMsg(&ocp2p.AuthSigMessage{PubKey: pbpk, Sig: signature})
+			_, err = protoio.NewDelimitedWriter(sc).WriteMsg(&tmp2p.AuthSigMessage{PubKey: pbpk, Sig: signature})
 			if err != nil {
 				return nil, true, err // abort
 			}
 			return nil, false, nil
 		},
 		func(_ int) (val interface{}, abort bool, err error) {
-			var pba ocp2p.AuthSigMessage
+			var pba tmp2p.AuthSigMessage
 			_, err = protoio.NewDelimitedReader(sc, 1024*1024).ReadMsg(&pba)
 			if err != nil {
 				return nil, true, err // abort

privval/msgs_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 	"time"
 
+	cryptoproto "github.com/tendermint/tendermint/proto/tendermint/crypto"
 	tmprivvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
@@ -15,7 +16,6 @@ import (
 	"github.com/line/ostracon/crypto/ed25519"
 	cryptoenc "github.com/line/ostracon/crypto/encoding"
 	"github.com/line/ostracon/crypto/tmhash"
-	cryptoproto "github.com/line/ostracon/proto/ostracon/crypto"
 	privvalproto "github.com/line/ostracon/proto/ostracon/privval"
 	"github.com/line/ostracon/types"
 )

privval/signer_client_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	cryptoproto "github.com/tendermint/tendermint/proto/tendermint/crypto"
 	tmprivvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
@@ -16,7 +17,6 @@ import (
 	"github.com/line/ostracon/crypto/tmhash"
 	"github.com/line/ostracon/crypto/vrf"
 	tmrand "github.com/line/ostracon/libs/rand"
-	cryptoproto "github.com/line/ostracon/proto/ostracon/crypto"
 	privvalproto "github.com/line/ostracon/proto/ostracon/privval"
 	"github.com/line/ostracon/types"
 )

privval/signer_requestHandler.go

@@ -3,12 +3,12 @@ package privval
 import (
 	"fmt"
 
+	cryptoproto "github.com/tendermint/tendermint/proto/tendermint/crypto"
 	tmprivvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
 	"github.com/line/ostracon/crypto"
 	cryptoenc "github.com/line/ostracon/crypto/encoding"
-	cryptoproto "github.com/line/ostracon/proto/ostracon/crypto"
 	privvalproto "github.com/line/ostracon/proto/ostracon/privval"
 	"github.com/line/ostracon/types"
 )

proto/ostracon/abci/types.proto

@@ -9,7 +9,7 @@ import "tendermint/crypto/proof.proto";
 import "tendermint/types/params.proto";
 import "tendermint/abci/types.proto";
 import "ostracon/types/types.proto";
-import "ostracon/crypto/keys.proto";
+import "tendermint/crypto/keys.proto";
 import "google/protobuf/timestamp.proto";
 import "gogoproto/gogo.proto";
 
@@ -368,7 +368,7 @@ message Validator {
 
 // ValidatorUpdate
 message ValidatorUpdate {
-  ostracon.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false];
+  tendermint.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false];
   int64                     power   = 2;  // The voting power
 }