Skip to content

Commit

Permalink
fix import
Browse files Browse the repository at this point in the history
  • Loading branch information
@unclezoro
unclezoro committed Oct 28, 2019
1 parent 9f42bb1 commit aaee617
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 18 deletions.
2 changes: 0 additions & 2 deletions app/apptest/match_allocation_overflow_new_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import (
"strings"
"testing"

"github.com/binance-chain/node/plugins/dex/matcheng"

"github.com/stretchr/testify/assert"
abci "github.com/tendermint/tendermint/abci/types"

Expand Down
4 changes: 2 additions & 2 deletions app/pub/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func GetBlockPublished(pool *sdk.Pool, header abci.Header, blockHash []byte) *Bl
Fee: feeStr,
Inputs: inputs,
Outputs: outputs,
BnbTransaction: BnbTransaction{
NativeTransaction: NativeTransaction{
Source: stdTx.Source,
ProposalId: proposalId,
TxType: msg.Type(),
Expand All @@ -156,7 +156,7 @@ func GetBlockPublished(pool *sdk.Pool, header abci.Header, blockHash []byte) *Bl
BlockHeight: header.Height,
Timestamp: timeStamp,
TxTotal: header.TotalTxs,
BnbBlockMeta: BlockMeta{
BlockMeta: NativeBlockMeta{
LastCommitHash: hex.EncodeToString(header.LastCommitHash),
DataHash: hex.EncodeToString(header.DataHash),
ValidatorsHash: hex.EncodeToString(header.ValidatorsHash),
Expand Down
32 changes: 19 additions & 13 deletions app/pub/msgs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/binance-chain/node/common/types"
orderPkg "github.com/binance-chain/node/plugins/dex/order"
)

Expand All @@ -21,6 +22,11 @@ const (
blockTpe
)

var (
nativeBlockMetaKey = fmt.Sprintf("%sBlockMeta",strings.ToLower(types.NativeTokenSymbol))
nativeTransactionKey = fmt.Sprintf("%sTransaction",strings.ToLower(types.NativeTokenSymbol))
)

// the strings should be keep consistence with top level record name in schemas.go
// !!!NOTE!!! Changes of these strings should notice consumers of kafka publisher
func (this msgType) String() string {
Expand Down Expand Up @@ -729,7 +735,7 @@ type CryptoBlock struct {
Timestamp string
TxTotal int64

BnbBlockMeta BlockMeta
BlockMeta NativeBlockMeta
Transactions []Transaction
}

Expand All @@ -741,7 +747,7 @@ func (msg CryptoBlock) ToNativeMap() map[string]interface{} {
native["blockHeight"] = msg.BlockHeight
native["timestamp"] = msg.Timestamp
native["txTotal"] = msg.TxTotal
native["bnbBlockMeta"] = msg.BnbBlockMeta.ToNativeMap()
native[nativeBlockMetaKey] = msg.BlockMeta.ToNativeMap()

transactions := make([]map[string]interface{}, 0, len(msg.Transactions))
for _, t := range msg.Transactions {
Expand All @@ -755,7 +761,7 @@ func (msg CryptoBlock) String() string {
return fmt.Sprintf("CryptoBlock: blockHash: %s, blockHeihgt: %d, numofTx: %d", msg.BlockHash, msg.BlockHeight, len(msg.Transactions))
}

type BlockMeta struct {
type NativeBlockMeta struct {
LastCommitHash string
DataHash string
ValidatorsHash string
Expand All @@ -767,7 +773,7 @@ type BlockMeta struct {
ProposerAddress string
}

func (msg BlockMeta) ToNativeMap() map[string]interface{} {
func (msg NativeBlockMeta) ToNativeMap() map[string]interface{} {
var native = make(map[string]interface{})
native["lastCommitHash"] = msg.LastCommitHash
native["dataHash"] = msg.DataHash
Expand All @@ -781,8 +787,8 @@ func (msg BlockMeta) ToNativeMap() map[string]interface{} {
return native
}

func (msg BlockMeta) String() string {
return fmt.Sprintf("BnbBlockMeta: dataHash: %s, appHash: %s, proposerAddress: %s", msg.DataHash, msg.AppHash, msg.ProposerAddress)
func (msg NativeBlockMeta) String() string {
return fmt.Sprintf("NativeBlockMeta: dataHash: %s, appHash: %s, proposerAddress: %s", msg.DataHash, msg.AppHash, msg.ProposerAddress)
}

type Transaction struct {
Expand All @@ -793,11 +799,11 @@ type Transaction struct {
Inputs []Input
Outputs []Output

BnbTransaction BnbTransaction
NativeTransaction NativeTransaction
}

func (msg Transaction) String() string {
return fmt.Sprintf("Transaction: txHash: %s, fee: %s, source: %d, type: %s, data: %s", msg.TxHash, msg.Fee, msg.BnbTransaction.Source, msg.BnbTransaction.TxType, msg.BnbTransaction.Data)
return fmt.Sprintf("Transaction: txHash: %s, fee: %s, source: %d, type: %s, data: %s", msg.TxHash, msg.Fee, msg.NativeTransaction.Source, msg.NativeTransaction.TxType, msg.NativeTransaction.Data)
}

func (msg Transaction) ToNativeMap() map[string]interface{} {
Expand All @@ -814,7 +820,7 @@ func (msg Transaction) ToNativeMap() map[string]interface{} {
outputs = append(outputs, c.ToNativeMap())
}
native["outputs"] = outputs
native["bnbTransaction"] = msg.BnbTransaction.ToNativeMap()
native[nativeTransactionKey] = msg.NativeTransaction.ToNativeMap()
return native
}

Expand Down Expand Up @@ -858,7 +864,7 @@ func (msg Output) String() string {
return fmt.Sprintf("Output: address: %s, coins: %v", msg.Address, msg.Coins)
}

type BnbTransaction struct {
type NativeTransaction struct {
Source int64
TxType string
TxAsset string
Expand All @@ -868,11 +874,11 @@ type BnbTransaction struct {
ProposalId int64
}

func (msg BnbTransaction) String() string {
return fmt.Sprintf("BbnTransaction: TxType: %s, Code: %d,data: %s", msg.TxType, msg.Code, msg.Data)
func (msg NativeTransaction) String() string {
return fmt.Sprintf("NativeTransaction: TxType: %s, Code: %d,data: %s", msg.TxType, msg.Code, msg.Data)
}

func (msg BnbTransaction) ToNativeMap() map[string]interface{} {
func (msg NativeTransaction) ToNativeMap() map[string]interface{} {
var native = make(map[string]interface{})
native["source"] = msg.Source
native["txType"] = msg.TxType
Expand Down
2 changes: 1 addition & 1 deletion app/pub/schema_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

// This test ensures schema or AvroOrJsonMsg change are consistent and prevent marshal error in runtime
var testBlock = `
{"ChainID":"bnbchain-1000","CryptoBlock":{"BlockHash":"b42e1f89b9986c441a2de425e3c7ce90859276899f7900a2be5b7a24d2123b7a","ParentHash":"dd444e38f1874993ba92b0bb420b0f534e6333a893066207467ea3b6117dabee","BlockHeight":580,"Timestamp":"2019-09-17T07:00:02.678369Z","TxTotal":28,"BnbBlockMeta":{"LastCommitHash":"5ef145920e6714acc4f9bfbca8b51fb11dd82e9704e9a62cc83f6630d5c8a9a2","DataHash":"06381b06d80d6462899656d14cc7898878bbd1bcc3458fc592aa97947396307a","ValidatorsHash":"a8209794d6638a7cd09cfcd8381eb5568ed9b20cf5e0332bec60629409da9f2f","NextValidatorsHash":"a8209794d6638a7cd09cfcd8381eb5568ed9b20cf5e0332bec60629409da9f2f","ConsensusHash":"294d8fbd0b94b767a7eba9840f299a3586da7fe6b5dead3b7eecba193c400f93","AppHash":"15f60c1ca6b5ef6bcac93a7969424ff1e3e330804127586adc7e18cefbc3e33d","LastResultsHash":"","EvidenceHash":"","ProposerAddress":"bca1ry8p38u46jkrfjfmqdg5kx3ymktshyqrqdp3rz"},"Transactions":[{"TxHash":"A495179A39D033ABC3A0BB95526EDCFFC6256D3EBAE62CB79E09774853774DE6","Fee":"37500BNB","Timestamp":"2019-09-17T07:00:02.678369Z","Inputs":[{"Address":"bnb1lag5vw33q99jp73rs4murl35terycjxay07eyg","Coins":null}],"Outputs":null,"BnbTransaction":{"Source":0,"TxType":"HTLT","TxAsset":"","OrderId":"","Code":0,"Data":"{\"from\":\"bnb1lag5vw33q99jp73rs4murl35terycjxay07eyg\",\"to\":\"bnb16unm97grz9m3snejn9nv80th7eu24d02ux6z5g\",\"recipient_other_chain\":\"\",\"sender_other_chain\":\"\",\"random_number_hash\":\"8e740d3d7c2b9450a311bda08dc53225a791f4993544603e02a6949b8bb7afdb\",\"timestamp\":1568703602,\"amount\":[{\"denom\":\"BNB\",\"amount\":100000000}],\"expected_income\":\"10000:ETH-746\",\"height_span\":500,\"cross_chain\":false}"}}]}}
{"ChainID":"bnbchain-1000","CryptoBlock":{"BlockHash":"b42e1f89b9986c441a2de425e3c7ce90859276899f7900a2be5b7a24d2123b7a","ParentHash":"dd444e38f1874993ba92b0bb420b0f534e6333a893066207467ea3b6117dabee","BlockHeight":580,"Timestamp":"2019-09-17T07:00:02.678369Z","TxTotal":28,"NativeBlockMeta":{"LastCommitHash":"5ef145920e6714acc4f9bfbca8b51fb11dd82e9704e9a62cc83f6630d5c8a9a2","DataHash":"06381b06d80d6462899656d14cc7898878bbd1bcc3458fc592aa97947396307a","ValidatorsHash":"a8209794d6638a7cd09cfcd8381eb5568ed9b20cf5e0332bec60629409da9f2f","NextValidatorsHash":"a8209794d6638a7cd09cfcd8381eb5568ed9b20cf5e0332bec60629409da9f2f","ConsensusHash":"294d8fbd0b94b767a7eba9840f299a3586da7fe6b5dead3b7eecba193c400f93","AppHash":"15f60c1ca6b5ef6bcac93a7969424ff1e3e330804127586adc7e18cefbc3e33d","LastResultsHash":"","EvidenceHash":"","ProposerAddress":"bca1ry8p38u46jkrfjfmqdg5kx3ymktshyqrqdp3rz"},"Transactions":[{"TxHash":"A495179A39D033ABC3A0BB95526EDCFFC6256D3EBAE62CB79E09774853774DE6","Fee":"37500BNB","Timestamp":"2019-09-17T07:00:02.678369Z","Inputs":[{"Address":"bnb1lag5vw33q99jp73rs4murl35terycjxay07eyg","Coins":null}],"Outputs":null,"NativeTransaction":{"Source":0,"TxType":"HTLT","TxAsset":"","OrderId":"","Code":0,"Data":"{\"from\":\"bnb1lag5vw33q99jp73rs4murl35terycjxay07eyg\",\"to\":\"bnb16unm97grz9m3snejn9nv80th7eu24d02ux6z5g\",\"recipient_other_chain\":\"\",\"sender_other_chain\":\"\",\"random_number_hash\":\"8e740d3d7c2b9450a311bda08dc53225a791f4993544603e02a6949b8bb7afdb\",\"timestamp\":1568703602,\"amount\":[{\"denom\":\"BNB\",\"amount\":100000000}],\"expected_income\":\"10000:ETH-746\",\"height_span\":500,\"cross_chain\":false}"}}]}}
`

func TestMain(m *testing.M) {
Expand Down

0 comments on commit aaee617

Please sign in to comment.