Skip to content

Commit a1ab65b

Browse files
vipwzwvipwzw
committed
auto ci
1 parent 55a7b21 commit a1ab65b

25 files changed

+357
-105
lines changed

‎blockchain/push.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@ import (
44
"bytes"
55
"compress/gzip"
66
"errors"
7-
"github.com/33cn/chain33/common"
8-
dbm "github.com/33cn/chain33/common/db"
9-
"github.com/33cn/chain33/queue"
10-
"github.com/33cn/chain33/types"
117
"io/ioutil"
128
"net"
139
"net/http"
1410
"strings"
1511
"sync"
1612
"sync/atomic"
1713
"time"
14+
15+
"github.com/33cn/chain33/common"
16+
dbm "github.com/33cn/chain33/common/db"
17+
"github.com/33cn/chain33/queue"
18+
"github.com/33cn/chain33/types"
1819
)
1920

2021
const (

‎blockchain/push_test.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ package blockchain
33
import (
44
"errors"
55
"fmt"
6+
"math/rand"
7+
"os"
8+
"sync/atomic"
9+
"testing"
10+
"time"
11+
612
bcMocks "github.com/33cn/chain33/blockchain/mocks"
713
"github.com/33cn/chain33/client"
814
"github.com/33cn/chain33/common"
@@ -22,11 +28,6 @@ import (
2228
"github.com/stretchr/testify/assert"
2329
"github.com/stretchr/testify/mock"
2430
"github.com/stretchr/testify/require"
25-
"math/rand"
26-
"os"
27-
"sync/atomic"
28-
"testing"
29-
"time"
3031
)
3132

3233
var sendTxWait = time.Millisecond * 5

‎client/rpc_ctx_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ func (c *GrpcCtx) Run() (err error) {
360360
errRet = err
361361

362362
case "GetCoinSymbol":
363-
reply,err:=rpc.GetCoinSymbol(context.Background(),c.Params.(*types.ReqNil))
363+
reply, err := rpc.GetCoinSymbol(context.Background(), c.Params.(*types.ReqNil))
364364
if err == nil {
365365
c.Res = reply
366366
}

‎rpc/grpchandler.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ package rpc
66

77
import (
88
"errors"
9-
"github.com/33cn/chain33/queue"
109
"time"
1110

11+
"github.com/33cn/chain33/queue"
12+
13+
"strings"
14+
1215
"github.com/33cn/chain33/common"
1316
"github.com/33cn/chain33/common/address"
1417
pb "github.com/33cn/chain33/types"
1518
"golang.org/x/net/context"
16-
"strings"
1719
)
1820

1921
// SendTransactionSync send transaction by network and query

‎rpc/grpchandler_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ package rpc
77
import (
88
"encoding/hex"
99
"fmt"
10+
"time"
11+
1012
"github.com/33cn/chain33/queue"
1113
"google.golang.org/grpc"
12-
"time"
1314

1415
//"sync"
1516
"testing"

‎system/dapp/commands/block.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ func addPushSubscribe(cmd *cobra.Command, args []string) {
363363
LastSequence: lastSeq,
364364
LastHeight: lastHeight,
365365
LastBlockHash: lastBlockHash,
366-
Type: int32(pushType),
366+
Type: int32(pushType),
367367
}
368368

369369
var res types.ReplySubscribePush

‎types/account.pb.go

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎types/blockchain.pb.go

+6-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎types/common.pb.go

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎types/db.pb.go

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎types/event.go

+10-11
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,11 @@ const (
201201
//断开指定的节点
202202
EventClosePeer = 364
203203

204-
EventPushBlock = 365
205-
EventPushBlockHeader=366
206-
EventPushTxReceipt=367
207-
EventPushTxResult=368
208-
EventPushEVM=369
209-
204+
EventPushBlock = 365
205+
EventPushBlockHeader = 366
206+
EventPushTxReceipt = 367
207+
EventPushTxResult = 368
208+
EventPushEVM = 369
210209
)
211210

212211
var eventName = map[int]string{
@@ -370,9 +369,9 @@ var eventName = map[int]string{
370369
EventShowBlacklist: "EventShowBlacklist",
371370
EventDialPeer: "EventDialPeer",
372371
EventClosePeer: "EventClosePeer",
373-
EventPushEVM: "EventPushEVM",
374-
EventPushBlock : "EventPushBlock",
375-
EventPushBlockHeader:"EventPushBlockHeader",
376-
EventPushTxReceipt:"EventPushTxReceipt",
377-
EventPushTxResult:"EventPushTxResult",
372+
EventPushEVM: "EventPushEVM",
373+
EventPushBlock: "EventPushBlock",
374+
EventPushBlockHeader: "EventPushBlockHeader",
375+
EventPushTxReceipt: "EventPushTxReceipt",
376+
EventPushTxResult: "EventPushTxResult",
378377
}

‎types/evm_event.pb.go

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎types/executor.pb.go

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)