diff options
author | Mission Liao <mission.liao@dexon.org> | 2019-05-06 19:31:02 +0800 |
---|---|---|
committer | Mission Liao <mission.liao@dexon.org> | 2019-05-07 15:09:40 +0800 |
commit | b8a4f248f83287bcfb55dab465ad267d8d9c0408 (patch) | |
tree | 9ea98e9925936d210c789aaa51d053d29689b12d | |
parent | 39db303b3381462f11bdc11111d6fb1739d3aa63 (diff) | |
download | dexon-b8a4f248f83287bcfb55dab465ad267d8d9c0408.tar dexon-b8a4f248f83287bcfb55dab465ad267d8d9c0408.tar.gz dexon-b8a4f248f83287bcfb55dab465ad267d8d9c0408.tar.bz2 dexon-b8a4f248f83287bcfb55dab465ad267d8d9c0408.tar.lz dexon-b8a4f248f83287bcfb55dab465ad267d8d9c0408.tar.xz dexon-b8a4f248f83287bcfb55dab465ad267d8d9c0408.tar.zst dexon-b8a4f248f83287bcfb55dab465ad267d8d9c0408.zip |
Fix lint error: duplicated string declaration
-rw-r--r-- | dex/consensus/core/test/marshaller.go | 13 | ||||
-rw-r--r-- | dex/consensus/core/test/network.go | 14 | ||||
-rw-r--r-- | dex/consensus/core/test/tcp-transport.go | 2 |
3 files changed, 17 insertions, 12 deletions
diff --git a/dex/consensus/core/test/marshaller.go b/dex/consensus/core/test/marshaller.go index e07cd3723..da8a0ffc1 100644 --- a/dex/consensus/core/test/marshaller.go +++ b/dex/consensus/core/test/marshaller.go @@ -25,6 +25,11 @@ import ( typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg" ) +const ( + voteType = "vote" + blockType = "block" +) + // DefaultMarshaller is the default marshaller for testing core.Consensus. type DefaultMarshaller struct { fallback Marshaller @@ -41,13 +46,13 @@ func NewDefaultMarshaller(fallback Marshaller) *DefaultMarshaller { func (m *DefaultMarshaller) Unmarshal( msgType string, payload []byte) (msg interface{}, err error) { switch msgType { - case "block": + case blockType: block := &types.Block{} if err = json.Unmarshal(payload, block); err != nil { break } msg = block - case "vote": + case voteType: vote := &types.Vote{} if err = json.Unmarshal(payload, vote); err != nil { break @@ -116,10 +121,10 @@ func (m *DefaultMarshaller) Marshal( msg interface{}) (msgType string, payload []byte, err error) { switch msg.(type) { case *types.Block: - msgType = "block" + msgType = blockType payload, err = json.Marshal(msg) case *types.Vote: - msgType = "vote" + msgType = voteType payload, err = json.Marshal(msg) case *types.AgreementResult: msgType = "agreement-result" diff --git a/dex/consensus/core/test/network.go b/dex/consensus/core/test/network.go index d4979cd4f..fe55bae15 100644 --- a/dex/consensus/core/test/network.go +++ b/dex/consensus/core/test/network.go @@ -77,9 +77,9 @@ func (req *PullRequest) MarshalJSON() (b []byte, err error) { var idAsBytes []byte // Make sure caller prepare correct identity for pull requests. switch req.Type { - case "block": + case blockType: idAsBytes, err = json.Marshal(req.Identity.(common.Hashes)) - case "vote": + case voteType: idAsBytes, err = json.Marshal(req.Identity.(types.Position)) default: err = fmt.Errorf("unknown ID type for pull request: %v", req.Type) @@ -107,13 +107,13 @@ func (req *PullRequest) UnmarshalJSON(data []byte) (err error) { } var ID interface{} switch rawReq.Type { - case "block": + case blockType: hashes := common.Hashes{} if err = json.Unmarshal(rawReq.Identity, &hashes); err != nil { break } ID = hashes - case "vote": + case voteType: pos := types.Position{} if err = json.Unmarshal(rawReq.Identity, &pos); err != nil { break @@ -432,7 +432,7 @@ func (n *Network) dispatchMsg(e *TransportEnvelope) { func (n *Network) handlePullRequest(req *PullRequest) { switch req.Type { - case "block": + case blockType: hashes := req.Identity.(common.Hashes) func() { n.blockCacheLock.Lock() @@ -451,7 +451,7 @@ func (n *Network) handlePullRequest(req *PullRequest) { n.send(req.Requester, b) } }() - case "vote": + case voteType: pos := req.Identity.(types.Position) func() { n.voteCacheLock.Lock() @@ -573,7 +573,7 @@ func (n *Network) pullBlocksAsync(hashes common.Hashes) { }() req := &PullRequest{ Requester: n.ID, - Type: "block", + Type: blockType, Identity: hashes, } // Randomly pick peers to send pull requests. diff --git a/dex/consensus/core/test/tcp-transport.go b/dex/consensus/core/test/tcp-transport.go index 11ca02f6c..75e1c6afc 100644 --- a/dex/consensus/core/test/tcp-transport.go +++ b/dex/consensus/core/test/tcp-transport.go @@ -898,7 +898,7 @@ func (t *TCPTransport) handleThroughputData(msg interface{}, payload []byte) { recordType := "" switch msg.(type) { case *types.Vote: - recordType = "vote" + recordType = voteType case *types.Block: recordType = "block" case *types.AgreementResult: |