From 93005ec14a8b6427274240b3f9f36d28491b298a Mon Sep 17 00:00:00 2001 From: kaifei Date: Thu, 9 Jan 2020 15:11:29 +0800 Subject: [PATCH] Merge branch 'irisnet/develop' into kf_dev --- cron/cron_task.go | 8 +++---- cron/cron_task_test.go | 3 +-- go.mod | 44 ++++++++++++++++++------------------- main.go | 2 +- service/handler/proposal.go | 2 +- service/handler/tx.go | 1 - store/document/proposal.go | 8 +++---- store/document/tx.go | 5 ++--- types/msg/bank.go | 10 ++++----- types/msg/coinswap.go | 2 +- types/msg/distribution.go | 2 +- types/msg/gov.go | 1 - types/msg/htlc.go | 4 ++-- types/msg/stake.go | 4 ++-- types/types.go | 18 +++++++-------- types/types_test.go | 4 ++-- util/helper/common.go | 2 +- util/helper/proposal.go | 10 ++++----- 18 files changed, 63 insertions(+), 67 deletions(-) diff --git a/cron/cron_task.go b/cron/cron_task.go index fcd3c77..c72d7ba 100644 --- a/cron/cron_task.go +++ b/cron/cron_task.go @@ -1,15 +1,15 @@ package cron import ( - "time" - "os" - "os/signal" "github.com/irisnet/irishub-sync/logger" "github.com/irisnet/irishub-sync/store" "github.com/irisnet/irishub-sync/store/document" "github.com/irisnet/irishub-sync/util/helper" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" + "os" + "os/signal" + "time" ) type CronService struct{} @@ -149,4 +149,4 @@ func UpdateUnknowOrEmptyTypeTxs(commontx []*document.CommonTx) error { } return nil -} \ No newline at end of file +} diff --git a/cron/cron_task_test.go b/cron/cron_task_test.go index c759888..3415620 100644 --- a/cron/cron_task_test.go +++ b/cron/cron_task_test.go @@ -1,9 +1,9 @@ package cron import ( + "github.com/irisnet/irishub-sync/store" "testing" "time" - "github.com/irisnet/irishub-sync/store" ) func TestUpdateUnknownOrEmptyTypeTxsByPage(t *testing.T) { @@ -28,4 +28,3 @@ func TestCronService_StartCronService(t *testing.T) { new(CronService).StartCronService() time.Sleep(1 * time.Minute) } - diff --git a/go.mod b/go.mod index bdcc274..934eb59 100644 --- a/go.mod +++ b/go.mod @@ -1,26 +1,26 @@ module github.com/irisnet/irishub-sync -go 1.13 + go 1.13 -require ( - github.com/go-kit/kit v0.9.0 - github.com/irisnet/irishub v0.16.0-rc0 - github.com/jolestar/go-commons-pool v2.0.0+incompatible - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.1 // indirect - github.com/pkg/errors v0.8.1 - github.com/prometheus/client_golang v1.2.1 - github.com/robfig/cron v1.2.0 - github.com/stretchr/testify v1.4.0 - github.com/tendermint/tendermint v0.32.7 - go.uber.org/zap v1.12.0 - gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 - gopkg.in/natefinch/lumberjack.v2 v2.0.0 - gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect -) + require ( + github.com/go-kit/kit v0.9.0 + github.com/irisnet/irishub v0.16.0-rc0 + github.com/jolestar/go-commons-pool v2.0.0+incompatible + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/pkg/errors v0.8.1 + github.com/prometheus/client_golang v1.2.1 + github.com/robfig/cron v1.2.0 + github.com/stretchr/testify v1.4.0 + github.com/tendermint/tendermint v0.32.7 + go.uber.org/zap v1.12.0 + gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 + gopkg.in/natefinch/lumberjack.v2 v2.0.0 + gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect + ) -replace ( - github.com/tendermint/iavl => github.com/irisnet/iavl v0.12.3 - github.com/tendermint/tendermint => github.com/irisnet/tendermint v0.32.0 - golang.org/x/crypto => github.com/tendermint/crypto v0.0.0-20180820045704-3764759f34a5 -) + replace ( + github.com/tendermint/iavl => github.com/irisnet/iavl v0.12.3 + github.com/tendermint/tendermint => github.com/irisnet/tendermint v0.32.0 + golang.org/x/crypto => github.com/tendermint/crypto v0.0.0-20180820045704-3764759f34a5 + ) diff --git a/main.go b/main.go index 35bf462..d22109c 100644 --- a/main.go +++ b/main.go @@ -1,12 +1,12 @@ package main import ( + "github.com/irisnet/irishub-sync/cron" "github.com/irisnet/irishub-sync/logger" "github.com/irisnet/irishub-sync/monitor" "github.com/irisnet/irishub-sync/service" "github.com/irisnet/irishub-sync/store" "github.com/irisnet/irishub-sync/util/helper" - "github.com/irisnet/irishub-sync/cron" "os" "os/signal" "syscall" diff --git a/service/handler/proposal.go b/service/handler/proposal.go index 5ded4b9..b7f9ee1 100644 --- a/service/handler/proposal.go +++ b/service/handler/proposal.go @@ -82,7 +82,7 @@ func IsContainVotingEndTag(blockresult document.ResponseEndBlock) (uint64, bool) if len(tags) > 0 { for _, tag := range tags { if tag.Key == constant.BlockTagProposalId { - proposalid,_ := strconv.ParseUint(tag.Value,10,64) + proposalid, _ := strconv.ParseUint(tag.Value, 10, 64) return proposalid, true } } diff --git a/service/handler/tx.go b/service/handler/tx.go index 4c23b0b..133acd6 100644 --- a/service/handler/tx.go +++ b/service/handler/tx.go @@ -33,7 +33,6 @@ func HandleTx(block *types.Block) ([]string, error) { } batch = append(batch, txOp) - // save or update proposal handleProposal(tx) //handleTokenFlow(blockWithTags, tx, &batch) diff --git a/store/document/proposal.go b/store/document/proposal.go index fb0cd54..a47d71d 100644 --- a/store/document/proposal.go +++ b/store/document/proposal.go @@ -41,10 +41,10 @@ type PVote struct { //----------------------------------------------------------- // Tally Results type PTallyResult struct { - Yes string `json:"yes" bson:"yes"` - Abstain string `json:"abstain" bson:"abstain"` - No string `json:"no" bson:"no"` - NoWithVeto string `json:"no_with_veto" bson:"nowithveto"` + Yes string `json:"yes" bson:"yes"` + Abstain string `json:"abstain" bson:"abstain"` + No string `json:"no" bson:"no"` + NoWithVeto string `json:"no_with_veto" bson:"nowithveto"` SystemVotingPower string `json:"system_voting_power" bson:"system_voting_power"` } diff --git a/store/document/tx.go b/store/document/tx.go index a0f9b8d..6aabf3c 100644 --- a/store/document/tx.go +++ b/store/document/tx.go @@ -17,7 +17,6 @@ const ( Tx_Field_Type = "type" Tx_Field_Status = "status" Tx_Field_Height = "height" - ) type CommonTx struct { @@ -43,7 +42,7 @@ type CommonTx struct { //StakeCreateValidator StakeCreateValidator `bson:"stake_create_validator"` //StakeEditValidator StakeEditValidator `bson:"stake_edit_validator"` //Msg store.Msg `bson:"-"` - Signers []Signer `bson:"signers"` + Signers []Signer `bson:"signers"` Msgs []DocTxMsg `bson:"msgs"` } @@ -132,7 +131,7 @@ func (d CommonTx) GetUnknownOrEmptyTypeTxs(skip, limit int) (res []CommonTx, err return c.Find(q).Select(selector).Sort(sorts...).Skip(skip).Limit(limit).All(&res) } - err = store.ExecCollection(CollectionNmCommonTx, fn); + err = store.ExecCollection(CollectionNmCommonTx, fn) if err != nil { return nil, err } diff --git a/types/msg/bank.go b/types/msg/bank.go index 8c3ea7c..ac0cede 100644 --- a/types/msg/bank.go +++ b/types/msg/bank.go @@ -1,9 +1,9 @@ package msg import ( + "github.com/irisnet/irishub-sync/store" itypes "github.com/irisnet/irishub-sync/types" "github.com/irisnet/irishub-sync/util/constant" - "github.com/irisnet/irishub-sync/store" ) type DocTxMsgSetMemoRegexp struct { @@ -56,11 +56,11 @@ func (doctx *DocTxMsgSend) Type() string { func (doctx *DocTxMsgSend) BuildMsg(txMsg interface{}) { msg := txMsg.(itypes.MsgTransfer) doctx.Inputs = append(doctx.Inputs, Data{ - Address:msg.Inputs[0].Address.String(), - Coins:itypes.ParseCoins(msg.Inputs[0].Coins.String()), + Address: msg.Inputs[0].Address.String(), + Coins: itypes.ParseCoins(msg.Inputs[0].Coins.String()), }) doctx.Outputs = append(doctx.Outputs, Data{ - Address:msg.Outputs[0].Address.String(), - Coins:itypes.ParseCoins(msg.Outputs[0].Coins.String()), + Address: msg.Outputs[0].Address.String(), + Coins: itypes.ParseCoins(msg.Outputs[0].Coins.String()), }) } diff --git a/types/msg/coinswap.go b/types/msg/coinswap.go index f30d7e8..dd28a73 100644 --- a/types/msg/coinswap.go +++ b/types/msg/coinswap.go @@ -1,9 +1,9 @@ package msg import ( - "github.com/irisnet/irishub-sync/util/constant" "github.com/irisnet/irishub-sync/store" itypes "github.com/irisnet/irishub-sync/types" + "github.com/irisnet/irishub-sync/util/constant" ) type DocTxMsgAddLiquidity struct { diff --git a/types/msg/distribution.go b/types/msg/distribution.go index 50e8db5..af68a2b 100644 --- a/types/msg/distribution.go +++ b/types/msg/distribution.go @@ -1,8 +1,8 @@ package msg import ( - "github.com/irisnet/irishub-sync/util/constant" itypes "github.com/irisnet/irishub-sync/types" + "github.com/irisnet/irishub-sync/util/constant" ) // msg struct for changing the withdraw address for a delegator (or validator self-delegation) diff --git a/types/msg/gov.go b/types/msg/gov.go index 598fbb1..02c9471 100644 --- a/types/msg/gov.go +++ b/types/msg/gov.go @@ -157,7 +157,6 @@ type DocTxMsgDeposit struct { Amount store.Coins `bson:"amount"` // Coins to add to the proposal's deposit } - func (doctx *DocTxMsgDeposit) Type() string { return constant.TxTypeDeposit } diff --git a/types/msg/htlc.go b/types/msg/htlc.go index 0cb07f4..3ddc022 100644 --- a/types/msg/htlc.go +++ b/types/msg/htlc.go @@ -1,10 +1,10 @@ package msg import ( - "github.com/irisnet/irishub-sync/util/constant" + "encoding/hex" "github.com/irisnet/irishub-sync/store" itypes "github.com/irisnet/irishub-sync/types" - "encoding/hex" + "github.com/irisnet/irishub-sync/util/constant" ) type DocTxMsgCreateHTLC struct { diff --git a/types/msg/stake.go b/types/msg/stake.go index da70dbe..dd4f35c 100644 --- a/types/msg/stake.go +++ b/types/msg/stake.go @@ -1,10 +1,10 @@ package msg import ( - "github.com/irisnet/irishub-sync/util/constant" - itypes "github.com/irisnet/irishub-sync/types" "github.com/irisnet/irishub-sync/store" "github.com/irisnet/irishub-sync/store/document" + itypes "github.com/irisnet/irishub-sync/types" + "github.com/irisnet/irishub-sync/util/constant" "github.com/irisnet/irishub/app/v1/stake" ) diff --git a/types/types.go b/types/types.go index ac316cb..f08020a 100644 --- a/types/types.go +++ b/types/types.go @@ -18,13 +18,13 @@ import ( "github.com/irisnet/irishub/app/v1/rand" "github.com/irisnet/irishub/app/v1/slashing" "github.com/irisnet/irishub/app/v1/stake" - "github.com/irisnet/irishub/app/v2/coinswap" - "github.com/irisnet/irishub/app/v2/htlc" - "github.com/irisnet/irishub/modules/guardian" stags "github.com/irisnet/irishub/app/v1/stake/tags" staketypes "github.com/irisnet/irishub/app/v1/stake/types" + "github.com/irisnet/irishub/app/v2/coinswap" + "github.com/irisnet/irishub/app/v2/htlc" "github.com/irisnet/irishub/client/utils" "github.com/irisnet/irishub/codec" + "github.com/irisnet/irishub/modules/guardian" "github.com/irisnet/irishub/types" abci "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tendermint/libs/common" @@ -64,11 +64,11 @@ type ( Proposal = gov.Proposal SdkVote = gov.Vote - MsgSwapOrder = coinswap.MsgSwapOrder - MsgAddLiquidity = coinswap.MsgAddLiquidity + MsgSwapOrder = coinswap.MsgSwapOrder + MsgAddLiquidity = coinswap.MsgAddLiquidity MsgRemoveLiquidity = coinswap.MsgRemoveLiquidity - MsgClaimHTLC = htlc.MsgClaimHTLC + MsgClaimHTLC = htlc.MsgClaimHTLC MsgCreateHTLC = htlc.MsgCreateHTLC MsgRefundHTLC = htlc.MsgRefundHTLC @@ -82,10 +82,10 @@ type ( AssetEditGateWay = asset.MsgEditGateway AssetTransferGatewayOwner = asset.MsgTransferGatewayOwner - MsgAddProfiler = guardian.MsgAddProfiler - MsgAddTrustee = guardian.MsgAddTrustee + MsgAddProfiler = guardian.MsgAddProfiler + MsgAddTrustee = guardian.MsgAddTrustee MsgDeleteProfiler = guardian.MsgDeleteProfiler - MsgDeleteTrustee = guardian.MsgDeleteTrustee + MsgDeleteTrustee = guardian.MsgDeleteTrustee ResponseDeliverTx = abci.ResponseDeliverTx diff --git a/types/types_test.go b/types/types_test.go index 4c64590..b20926b 100644 --- a/types/types_test.go +++ b/types/types_test.go @@ -2,9 +2,9 @@ package types import ( "encoding/json" - "testing" "fmt" "strconv" + "testing" ) func TestParseCoin(t *testing.T) { @@ -54,4 +54,4 @@ func Test_getPrecision(t *testing.T) { } else { t.Fatal("Failed") } -} \ No newline at end of file +} diff --git a/util/helper/common.go b/util/helper/common.go index a9f3d06..426cbb5 100644 --- a/util/helper/common.go +++ b/util/helper/common.go @@ -98,4 +98,4 @@ func DistinctStringSlice(slice []string) []string { } return res -} \ No newline at end of file +} diff --git a/util/helper/proposal.go b/util/helper/proposal.go index ac42612..9a82964 100644 --- a/util/helper/proposal.go +++ b/util/helper/proposal.go @@ -31,11 +31,11 @@ func GetProposal(proposalID uint64) (proposal document.Proposal, err error) { tallyResult := propo.GetTallyResult() proposal.TallyResult = document.PTallyResult{ - Yes: tallyResult.Yes.String(), - Abstain: tallyResult.Abstain.String(), - No: tallyResult.No.String(), - NoWithVeto: tallyResult.NoWithVeto.String(), - SystemVotingPower:tallyResult.SystemVotingPower.String(), + Yes: tallyResult.Yes.String(), + Abstain: tallyResult.Abstain.String(), + No: tallyResult.No.String(), + NoWithVeto: tallyResult.NoWithVeto.String(), + SystemVotingPower: tallyResult.SystemVotingPower.String(), } return