Skip to content

Commit 35215a1

Browse files
dustinxiedustinxie
committed
Move proto to /iotexproject/iotex-proto
1 parent 4ece61d commit 35215a1

File tree

93 files changed

+688
-1492
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+688
-1492
lines changed

‎Gopkg.lock

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

‎Gopkg.toml

+4
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@
5252

5353
[[constraint]]
5454
name = "github.com/iotexproject/iotex-address"
55+
version = "v0.2.0"
56+
57+
[[constraint]]
58+
name = "github.com/iotexproject/iotex-proto"
5559
version = "v0.1.0"
5660

5761
[[constraint]]

‎Makefile

-7
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,6 @@ test-html: test-rich
110110
$(ECHO_V)gocov convert $(COV_REPORT) | gocov-html > $(COV_HTML)
111111
$(ECHO_V)open $(COV_HTML)
112112

113-
.PHONY: protogen
114-
protogen:
115-
@protoc --go_out=plugins=grpc:${GOPATH}/src ./proto/types/*
116-
@protoc -I. -I ./proto/types --go_out=plugins=grpc:${GOPATH}/src ./proto/api/*
117-
@protoc --go_out=plugins=grpc:${GOPATH}/src ./proto/rpc/*
118-
@protoc --go_out=plugins=grpc:${GOPATH}/src ./proto/testing/*
119-
120113
.PHONY: mockgen
121114
mockgen:
122115
@./misc/scripts/mockgen.sh

‎action/action.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/iotexproject/iotex-core/pkg/keypair"
1717
"github.com/iotexproject/iotex-core/pkg/log"
1818
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
19-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
19+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
2020
)
2121

2222
// SignatureLength indicates the length of signature generated by SECP256K1 crypto library

‎action/claimreward.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/pkg/errors"
1515

1616
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
17-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
17+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
1818
)
1919

2020
var (

‎action/createdeposit.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/iotexproject/iotex-core/pkg/keypair"
1616
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
1717
"github.com/iotexproject/iotex-core/pkg/version"
18-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
18+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
1919
)
2020

2121
const (

‎action/depositreward.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/pkg/errors"
1515

1616
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
17-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
17+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
1818
)
1919

2020
var (

‎action/execution.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/iotexproject/iotex-core/pkg/keypair"
1717
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
1818
"github.com/iotexproject/iotex-core/pkg/version"
19-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
19+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
2020
)
2121

2222
const (

‎action/grantreward.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/golang/protobuf/proto"
1313

1414
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
15-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
15+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
1616
)
1717

1818
const (

‎action/putblock.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/iotexproject/iotex-core/pkg/keypair"
1717
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
1818
"github.com/iotexproject/iotex-core/pkg/version"
19-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
19+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
2020
)
2121

2222
// PutBlockIntrinsicGas is the instrinsic gas for put block action.

‎action/putpollresult.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"github.com/iotexproject/iotex-core/pkg/keypair"
1616
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
1717
"github.com/iotexproject/iotex-core/pkg/version"
18-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
1918
"github.com/iotexproject/iotex-core/state"
19+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
2020
)
2121

2222
// PutPollResult represents put the poll result from gravity chain.

‎action/receipt.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/iotexproject/go-pkgs/hash"
1313
"github.com/iotexproject/iotex-core/pkg/log"
14-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
14+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
1515
)
1616

1717
const (

‎action/settledeposit.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/iotexproject/iotex-core/pkg/keypair"
1616
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
1717
"github.com/iotexproject/iotex-core/pkg/version"
18-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
18+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
1919
)
2020

2121
const (

‎action/startsubchain.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/iotexproject/iotex-core/pkg/keypair"
1616
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
1717
"github.com/iotexproject/iotex-core/pkg/version"
18-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
18+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
1919
)
2020

2121
const (

‎action/stopsubchain.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
1616
"github.com/iotexproject/iotex-core/pkg/version"
17-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
17+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
1818
)
1919

2020
const (

‎action/transfer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/iotexproject/iotex-core/pkg/keypair"
1717
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
1818
"github.com/iotexproject/iotex-core/pkg/version"
19-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
19+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
2020
)
2121

2222
const (

‎api/api.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ import (
3838
"github.com/iotexproject/iotex-core/pkg/log"
3939
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
4040
"github.com/iotexproject/iotex-core/pkg/version"
41-
"github.com/iotexproject/iotex-core/protogen/iotexapi"
42-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
4341
"github.com/iotexproject/iotex-core/state"
42+
"github.com/iotexproject/iotex-proto/golang/iotexapi"
43+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
4444
)
4545

4646
var (

‎api/api_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ import (
3838
"github.com/iotexproject/iotex-core/gasstation"
3939
"github.com/iotexproject/iotex-core/pkg/unit"
4040
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
41-
"github.com/iotexproject/iotex-core/protogen/iotexapi"
42-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
4341
"github.com/iotexproject/iotex-core/state"
4442
"github.com/iotexproject/iotex-core/state/factory"
4543
"github.com/iotexproject/iotex-core/test/identityset"
@@ -49,6 +47,8 @@ import (
4947
ta "github.com/iotexproject/iotex-core/test/testaddress"
5048
"github.com/iotexproject/iotex-core/testutil"
5149
"github.com/iotexproject/iotex-election/test/mock/mock_committee"
50+
"github.com/iotexproject/iotex-proto/golang/iotexapi"
51+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
5252
)
5353

5454
const lld = "lifeLongDelegates"

‎blockchain/block/block.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"github.com/iotexproject/iotex-core/action"
1818
"github.com/iotexproject/iotex-core/endorsement"
1919
"github.com/iotexproject/iotex-core/pkg/log"
20-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
2120
"github.com/iotexproject/iotex-core/state/factory"
21+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
2222
)
2323

2424
// Block defines the struct of block

‎blockchain/block/block_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
"github.com/iotexproject/iotex-core/pkg/log"
2525
"github.com/iotexproject/iotex-core/pkg/unit"
2626
"github.com/iotexproject/iotex-core/pkg/version"
27-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
2827
"github.com/iotexproject/iotex-core/test/identityset"
2928
ta "github.com/iotexproject/iotex-core/test/testaddress"
3029
"github.com/iotexproject/iotex-core/testutil"
30+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
3131
)
3232

3333
func TestMerkle(t *testing.T) {

‎blockchain/block/body.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ package block
88

99
import (
1010
"github.com/golang/protobuf/proto"
11-
1211
"github.com/iotexproject/go-pkgs/hash"
12+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
13+
1314
"github.com/iotexproject/iotex-core/action"
14-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
1515
)
1616

1717
// Body defines the struct of body

‎blockchain/block/footer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/golang/protobuf/ptypes"
1414

1515
"github.com/iotexproject/iotex-core/endorsement"
16-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
16+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
1717
)
1818

1919
// Footer defines a set of proof of this block

‎blockchain/block/header.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/iotexproject/iotex-core/pkg/keypair"
2020
"github.com/iotexproject/iotex-core/pkg/log"
2121
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
22-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
22+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
2323
)
2424

2525
// Header defines the struct of block header

‎blockchain/blockdao.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/iotexproject/iotex-core/pkg/lifecycle"
2525
"github.com/iotexproject/iotex-core/pkg/prometheustimer"
2626
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
27-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
27+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
2828
)
2929

3030
const (

‎blockchain/genesis/genesis.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"github.com/iotexproject/iotex-address/address"
2222
"github.com/iotexproject/iotex-core/pkg/log"
2323
"github.com/iotexproject/iotex-core/pkg/unit"
24-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
2524
"github.com/iotexproject/iotex-core/test/identityset"
25+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
2626
)
2727

2828
// Default contains the default genesis config

‎blocksync/blocksync.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/iotexproject/iotex-core/consensus"
2121
"github.com/iotexproject/iotex-core/pkg/lifecycle"
2222
"github.com/iotexproject/iotex-core/pkg/log"
23-
"github.com/iotexproject/iotex-core/protogen/iotexrpc"
23+
"github.com/iotexproject/iotex-proto/golang/iotexrpc"
2424
)
2525

2626
type (

‎blocksync/blocksync_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ import (
1515

1616
"github.com/golang/mock/gomock"
1717
"github.com/golang/protobuf/proto"
18+
"github.com/iotexproject/go-pkgs/hash"
19+
"github.com/iotexproject/iotex-proto/golang/iotexrpc"
1820
peerstore "github.com/libp2p/go-libp2p-peerstore"
1921
"github.com/pkg/errors"
2022
"github.com/stretchr/testify/assert"
2123
"github.com/stretchr/testify/require"
2224

23-
"github.com/iotexproject/go-pkgs/hash"
2425
"github.com/iotexproject/iotex-core/action/protocol"
2526
"github.com/iotexproject/iotex-core/action/protocol/account"
2627
"github.com/iotexproject/iotex-core/action/protocol/rolldpos"
@@ -29,7 +30,6 @@ import (
2930
"github.com/iotexproject/iotex-core/blockchain/block"
3031
"github.com/iotexproject/iotex-core/blockchain/genesis"
3132
"github.com/iotexproject/iotex-core/config"
32-
"github.com/iotexproject/iotex-core/protogen/iotexrpc"
3333
"github.com/iotexproject/iotex-core/test/mock/mock_blockchain"
3434
"github.com/iotexproject/iotex-core/test/mock/mock_blocksync"
3535
"github.com/iotexproject/iotex-core/test/mock/mock_consensus"

‎blocksync/worker.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/iotexproject/iotex-core/config"
1717
"github.com/iotexproject/iotex-core/pkg/log"
1818
"github.com/iotexproject/iotex-core/pkg/routine"
19-
"github.com/iotexproject/iotex-core/protogen/iotexrpc"
19+
"github.com/iotexproject/iotex-proto/golang/iotexrpc"
2020
)
2121

2222
type syncBlocksInterval struct {

‎chainservice/chainservice.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import (
3131
"github.com/iotexproject/iotex-core/dispatcher"
3232
"github.com/iotexproject/iotex-core/p2p"
3333
"github.com/iotexproject/iotex-core/pkg/log"
34-
"github.com/iotexproject/iotex-core/protogen/iotexrpc"
35-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
34+
"github.com/iotexproject/iotex-proto/golang/iotexrpc"
35+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
3636
)
3737

3838
// ChainService is a blockchain service with all blockchain components.

‎cli/ioctl/cmd/account/account.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"github.com/iotexproject/iotex-core/cli/ioctl/util"
2626
"github.com/iotexproject/iotex-core/pkg/keypair"
2727
"github.com/iotexproject/iotex-core/pkg/log"
28-
"github.com/iotexproject/iotex-core/protogen/iotexapi"
29-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
28+
"github.com/iotexproject/iotex-proto/golang/iotexapi"
29+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
3030
)
3131

3232
// Errors

‎cli/ioctl/cmd/action/action.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/iotexproject/iotex-core/cli/ioctl/util"
2727
"github.com/iotexproject/iotex-core/pkg/log"
2828
"github.com/iotexproject/iotex-core/pkg/util/byteutil"
29-
"github.com/iotexproject/iotex-core/protogen/iotexapi"
29+
"github.com/iotexproject/iotex-proto/golang/iotexapi"
3030
)
3131

3232
// Flags

‎cli/ioctl/cmd/action/actionhash.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"github.com/iotexproject/iotex-core/cli/ioctl/util"
2626
"github.com/iotexproject/iotex-core/pkg/keypair"
2727
"github.com/iotexproject/iotex-core/pkg/log"
28-
"github.com/iotexproject/iotex-core/protogen/iotexapi"
29-
"github.com/iotexproject/iotex-core/protogen/iotextypes"
28+
"github.com/iotexproject/iotex-proto/golang/iotexapi"
29+
"github.com/iotexproject/iotex-proto/golang/iotextypes"
3030
)
3131

3232
// actionHashCmd represents the action hash command

0 commit comments

Comments
 (0)