From 6171e35a1f1b11ed1bacb931a3adce4a832c4583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Zdyba=C5=82?= <tomek@zdybal.lap.pl>
Date: Thu, 28 Jan 2021 12:06:32 +0100
Subject: [PATCH] Fix linter errors

---
 store/rootmulti/proof.go |  2 +-
 store/smt/proof.go       | 18 +++++++++---------
 store/smt/proof_test.go  |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/store/rootmulti/proof.go b/store/rootmulti/proof.go
index f1139007a407..7aa126dfb862 100644
--- a/store/rootmulti/proof.go
+++ b/store/rootmulti/proof.go
@@ -29,6 +29,6 @@ func DefaultProofRuntime() (prt *merkle.ProofRuntime) {
 
 func SMTProofRuntime() (prt *merkle.ProofRuntime) {
 	prt = merkle.NewProofRuntime()
-	prt.RegisterOpDecoder(smt.SMTProofType, smt.ProofDecoder)
+	prt.RegisterOpDecoder(smt.ProofType, smt.ProofDecoder)
 	return prt
 }
diff --git a/store/smt/proof.go b/store/smt/proof.go
index 131b3f1596bb..1adfcf427066 100644
--- a/store/smt/proof.go
+++ b/store/smt/proof.go
@@ -20,20 +20,20 @@ const (
 )
 
 const (
-	SMTProofType = "smt"
+	ProofType = "smt"
 )
 
-type SMTProof struct {
+type ProofOp struct {
 	Root   []byte
 	Key    []byte
 	Hasher HasherType
 	Proof  smt.SparseMerkleProof
 }
 
-var _ merkle.ProofOperator = &SMTProof{}
+var _ merkle.ProofOperator = &ProofOp{}
 
-func NewSMTProof(root, key []byte, hasher HasherType, proof smt.SparseMerkleProof) *SMTProof {
-	return &SMTProof{
+func NewProofOp(root, key []byte, hasher HasherType, proof smt.SparseMerkleProof) *ProofOp {
+	return &ProofOp{
 		Root:   root,
 		Key:    key,
 		Hasher: hasher,
@@ -41,7 +41,7 @@ func NewSMTProof(root, key []byte, hasher HasherType, proof smt.SparseMerkleProo
 	}
 }
 
-func (p *SMTProof) Run(args [][]byte) ([][]byte, error) {
+func (p *ProofOp) Run(args [][]byte) ([][]byte, error) {
 	switch len(args) {
 	case 0: // non-membership proof
 		if !smt.VerifyProof(p.Proof, p.Root, p.Key, []byte{}, getHasher(p.Hasher)) {
@@ -57,11 +57,11 @@ func (p *SMTProof) Run(args [][]byte) ([][]byte, error) {
 	return [][]byte{p.Root}, nil
 }
 
-func (p *SMTProof) GetKey() []byte {
+func (p *ProofOp) GetKey() []byte {
 	return p.Key
 }
 
-func (p *SMTProof) ProofOp() tmmerkle.ProofOp {
+func (p *ProofOp) ProofOp() tmmerkle.ProofOp {
 	var data bytes.Buffer
 	enc := gob.NewEncoder(&data)
 	enc.Encode(p)
@@ -74,7 +74,7 @@ func (p *SMTProof) ProofOp() tmmerkle.ProofOp {
 
 func ProofDecoder(pop tmmerkle.ProofOp) (merkle.ProofOperator, error) {
 	dec := gob.NewDecoder(bytes.NewBuffer(pop.Data))
-	var proof SMTProof
+	var proof ProofOp
 	err := dec.Decode(&proof)
 	if err != nil {
 		return nil, err
diff --git a/store/smt/proof_test.go b/store/smt/proof_test.go
index 9cec755f7f00..75e7974bc214 100644
--- a/store/smt/proof_test.go
+++ b/store/smt/proof_test.go
@@ -24,7 +24,7 @@ func TestProofOpInterface(t *testing.T) {
 	proof, err := tree.Prove(key)
 	require.True(t, smt.VerifyProof(proof, root, key, value, hasher))
 
-	storeProofOp := smtstore.NewSMTProof(root, key, smtstore.SHA256, proof)
+	storeProofOp := smtstore.NewProofOp(root, key, smtstore.SHA256, proof)
 	require.NotNil(t, storeProofOp)
 	// inclusion proof
 	r, err := storeProofOp.Run([][]byte{value})
@@ -50,7 +50,7 @@ func TestProofOpInterface(t *testing.T) {
 	// encode
 	tmProofOp := storeProofOp.ProofOp()
 	assert.NotNil(t, tmProofOp)
-	assert.Equal(t, smtstore.SMTProofType, tmProofOp.Type)
+	assert.Equal(t, smtstore.ProofType, tmProofOp.Type)
 	assert.Equal(t, key, tmProofOp.Key, key)
 	assert.NotEmpty(t, tmProofOp.Data)