From 70b91b2afe6d0af937ca352d807ede78df40fc1a Mon Sep 17 00:00:00 2001 From: vipwzw Date: Mon, 18 Oct 2021 19:34:01 +0800 Subject: [PATCH] auto ci --- plugin/consensus/tendermint/types/round_state.go | 2 +- plugin/dapp/echo/types/echo/echo.pb.go | 10 +++++++--- plugin/dapp/evm/commands/evm_test.go | 1 + plugin/dapp/js/command/js.go | 1 + plugin/dapp/multisig/rpc/jrpc_channel_test.go | 1 + plugin/dapp/ticket/plugin.go | 1 + .../token/cmd/signatory-server/signatory/config.pb.go | 10 +++++++--- plugin/dapp/trade/executor/local_order_test.go | 1 + plugin/store/mpt/db/node.pb.go | 10 +++++++--- plugin/store/mpt/db2/database.go | 8 +++++--- 10 files changed, 32 insertions(+), 13 deletions(-) diff --git a/plugin/consensus/tendermint/types/round_state.go b/plugin/consensus/tendermint/types/round_state.go index de34751184..dccc1995c8 100644 --- a/plugin/consensus/tendermint/types/round_state.go +++ b/plugin/consensus/tendermint/types/round_state.go @@ -39,7 +39,7 @@ const ( ProposalPOLID = byte(0x05) VoteID = byte(0x06) HasVoteID = byte(0x07) - VoteSetMaj23ID = byte(0X08) + VoteSetMaj23ID = byte(0x08) VoteSetBitsID = byte(0x09) ProposalHeartbeatID = byte(0x0a) ProposalBlockID = byte(0x0b) diff --git a/plugin/dapp/echo/types/echo/echo.pb.go b/plugin/dapp/echo/types/echo/echo.pb.go index c9cab1e67a..72a67a50d7 100644 --- a/plugin/dapp/echo/types/echo/echo.pb.go +++ b/plugin/dapp/echo/types/echo/echo.pb.go @@ -18,9 +18,13 @@ It has these top-level messages: */ package echo -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + + proto "github.com/golang/protobuf/proto" + + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/plugin/dapp/evm/commands/evm_test.go b/plugin/dapp/evm/commands/evm_test.go index fd155cc6be..f2c875251c 100644 --- a/plugin/dapp/evm/commands/evm_test.go +++ b/plugin/dapp/evm/commands/evm_test.go @@ -8,6 +8,7 @@ import ( "github.com/33cn/chain33/types" "github.com/33cn/chain33/util/testnode" "github.com/stretchr/testify/assert" + // 因为测试程序在外层，而合约类型的初始化在里面，所以需要显示引用，否则不会加载合约插件 _ "github.com/33cn/plugin/plugin/dapp/evm/executor" evmtypes "github.com/33cn/plugin/plugin/dapp/evm/types" diff --git a/plugin/dapp/js/command/js.go b/plugin/dapp/js/command/js.go index 154cf8fd03..eadd36f092 100644 --- a/plugin/dapp/js/command/js.go +++ b/plugin/dapp/js/command/js.go @@ -14,6 +14,7 @@ import ( "github.com/33cn/chain33/types" jsty "github.com/33cn/plugin/plugin/dapp/js/types" "github.com/33cn/plugin/plugin/dapp/js/types/jsproto" + //"github.com/gojson" "github.com/spf13/cobra" ) diff --git a/plugin/dapp/multisig/rpc/jrpc_channel_test.go b/plugin/dapp/multisig/rpc/jrpc_channel_test.go index b04dd9b57a..c60f440eac 100644 --- a/plugin/dapp/multisig/rpc/jrpc_channel_test.go +++ b/plugin/dapp/multisig/rpc/jrpc_channel_test.go @@ -14,6 +14,7 @@ import ( "github.com/33cn/chain33/util/testnode" mty "github.com/33cn/plugin/plugin/dapp/multisig/types" "github.com/stretchr/testify/assert" + // 注册system和plugin 包 rpctypes "github.com/33cn/chain33/rpc/types" _ "github.com/33cn/chain33/system" diff --git a/plugin/dapp/ticket/plugin.go b/plugin/dapp/ticket/plugin.go index 578b85ba2f..4d73a4ec94 100644 --- a/plugin/dapp/ticket/plugin.go +++ b/plugin/dapp/ticket/plugin.go @@ -10,6 +10,7 @@ import ( "github.com/33cn/plugin/plugin/dapp/ticket/executor" "github.com/33cn/plugin/plugin/dapp/ticket/rpc" "github.com/33cn/plugin/plugin/dapp/ticket/types" + // init wallet _ "github.com/33cn/plugin/plugin/dapp/ticket/wallet" ) diff --git a/plugin/dapp/token/cmd/signatory-server/signatory/config.pb.go b/plugin/dapp/token/cmd/signatory-server/signatory/config.pb.go index 6d401d4e8a..09cda897ec 100644 --- a/plugin/dapp/token/cmd/signatory-server/signatory/config.pb.go +++ b/plugin/dapp/token/cmd/signatory-server/signatory/config.pb.go @@ -12,9 +12,13 @@ It has these top-level messages: */ package signatory -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + + proto "github.com/golang/protobuf/proto" + + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/plugin/dapp/trade/executor/local_order_test.go b/plugin/dapp/trade/executor/local_order_test.go index d95f7f9edb..bbfeb2cb03 100644 --- a/plugin/dapp/trade/executor/local_order_test.go +++ b/plugin/dapp/trade/executor/local_order_test.go @@ -5,6 +5,7 @@ import ( "github.com/33cn/chain33/system/dapp" pty "github.com/33cn/plugin/plugin/dapp/trade/types" + //"github.com/33cn/chain33/common/db" //"github.com/33cn/chain33/common/db/table" "github.com/33cn/chain33/util" diff --git a/plugin/store/mpt/db/node.pb.go b/plugin/store/mpt/db/node.pb.go index 0d40dba57a..2abefff4aa 100644 --- a/plugin/store/mpt/db/node.pb.go +++ b/plugin/store/mpt/db/node.pb.go @@ -3,9 +3,13 @@ package mpt -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + + proto "github.com/golang/protobuf/proto" + + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/plugin/store/mpt/db2/database.go b/plugin/store/mpt/db2/database.go index 51da968ffa..4d3ba13f56 100644 --- a/plugin/store/mpt/db2/database.go +++ b/plugin/store/mpt/db2/database.go @@ -117,9 +117,11 @@ type rawShortNode struct { Val node } -func (n rawShortNode) canUnload(uint16, uint16) bool { panic("this should never end up in a live trie") } -func (n rawShortNode) cache() (hashNode, bool) { panic("this should never end up in a live trie") } -func (n rawShortNode) fstring(ind string) string { panic("this should never end up in a live trie") } +func (n rawShortNode) canUnload(uint16, uint16) bool { + panic("this should never end up in a live trie") +} +func (n rawShortNode) cache() (hashNode, bool) { panic("this should never end up in a live trie") } +func (n rawShortNode) fstring(ind string) string { panic("this should never end up in a live trie") } // cachedNode is all the information we know about a single cached node in the // memory database write layer.