Skip to content
This repository was archived by the owner on Jul 13, 2022. It is now read-only.

Commit 4b2d5e6

Browse files
author
David Ansermino
authored
Remove packages, update utils dependency (#522)
- Replaces blockstore, core, metrics and router with external packages - Updates chainbridge-utils to latest release
1 parent 75b81b0 commit 4b2d5e6

30 files changed

+42
-608
lines changed

‎blockstore/blockstore.go‎

Lines changed: 0 additions & 117 deletions
This file was deleted.

‎blockstore/blockstore_test.go‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎chains/ethereum/chain.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,12 @@ import (
2828
erc20Handler "github.com/ChainSafe/ChainBridge/bindings/ERC20Handler"
2929
erc721Handler "github.com/ChainSafe/ChainBridge/bindings/ERC721Handler"
3030
"github.com/ChainSafe/ChainBridge/bindings/GenericHandler"
31-
"github.com/ChainSafe/ChainBridge/blockstore"
3231
connection "github.com/ChainSafe/ChainBridge/connections/ethereum"
33-
"github.com/ChainSafe/ChainBridge/core"
34-
metrics "github.com/ChainSafe/ChainBridge/metrics/types"
35-
"github.com/ChainSafe/ChainBridge/router"
32+
"github.com/ChainSafe/chainbridge-utils/blockstore"
33+
"github.com/ChainSafe/chainbridge-utils/core"
3634
"github.com/ChainSafe/chainbridge-utils/crypto/secp256k1"
3735
"github.com/ChainSafe/chainbridge-utils/keystore"
36+
metrics "github.com/ChainSafe/chainbridge-utils/metrics/types"
3837
"github.com/ChainSafe/chainbridge-utils/msg"
3938
"github.com/ChainSafe/log15"
4039
"github.com/ethereum/go-ethereum/accounts/abi/bind"
@@ -178,7 +177,7 @@ func InitializeChain(chainCfg *core.ChainConfig, logger log15.Logger, sysErr cha
178177
}, nil
179178
}
180179

181-
func (c *Chain) SetRouter(r *router.Router) {
180+
func (c *Chain) SetRouter(r *core.Router) {
182181
r.Listen(c.cfg.Id, c.writer)
183182
c.listener.setRouter(r)
184183
}

‎chains/ethereum/chain_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ import (
88
"testing"
99
"time"
1010

11-
"github.com/ChainSafe/ChainBridge/core"
12-
"github.com/ChainSafe/ChainBridge/router"
1311
ethtest "github.com/ChainSafe/ChainBridge/shared/ethereum/testing"
12+
"github.com/ChainSafe/chainbridge-utils/core"
1413
"github.com/ChainSafe/chainbridge-utils/keystore"
1514
"github.com/ChainSafe/chainbridge-utils/msg"
1615
"github.com/ethereum/go-ethereum/common"
@@ -103,7 +102,7 @@ func TestChain_WriterShutdownOnFailure(t *testing.T) {
103102
t.Fatal(err)
104103
}
105104

106-
r := router.NewRouter(TestLogger)
105+
r := core.NewRouter(TestLogger)
107106
chain.SetRouter(r)
108107

109108
err = chain.Start()

‎chains/ethereum/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"fmt"
99
"math/big"
1010

11-
"github.com/ChainSafe/ChainBridge/core"
1211
utils "github.com/ChainSafe/ChainBridge/shared/ethereum"
12+
"github.com/ChainSafe/chainbridge-utils/core"
1313
"github.com/ChainSafe/chainbridge-utils/msg"
1414
"github.com/ethereum/go-ethereum/common"
1515
)

‎chains/ethereum/config_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"reflect"
99
"testing"
1010

11-
"github.com/ChainSafe/ChainBridge/core"
11+
"github.com/ChainSafe/chainbridge-utils/core"
1212
"github.com/ethereum/go-ethereum/common"
1313
)
1414

‎chains/ethereum/listener.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"github.com/ChainSafe/ChainBridge/bindings/ERC20Handler"
1515
"github.com/ChainSafe/ChainBridge/bindings/ERC721Handler"
1616
"github.com/ChainSafe/ChainBridge/bindings/GenericHandler"
17-
"github.com/ChainSafe/ChainBridge/blockstore"
1817
"github.com/ChainSafe/ChainBridge/chains"
19-
metrics "github.com/ChainSafe/ChainBridge/metrics/types"
2018
utils "github.com/ChainSafe/ChainBridge/shared/ethereum"
19+
"github.com/ChainSafe/chainbridge-utils/blockstore"
20+
metrics "github.com/ChainSafe/chainbridge-utils/metrics/types"
2121
"github.com/ChainSafe/chainbridge-utils/msg"
2222
"github.com/ChainSafe/log15"
2323
eth "github.com/ethereum/go-ethereum"

‎chains/ethereum/listener_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"github.com/ChainSafe/ChainBridge/bindings/ERC20Handler"
1515
"github.com/ChainSafe/ChainBridge/bindings/ERC721Handler"
1616
"github.com/ChainSafe/ChainBridge/bindings/GenericHandler"
17-
"github.com/ChainSafe/ChainBridge/blockstore"
1817
utils "github.com/ChainSafe/ChainBridge/shared/ethereum"
1918
ethtest "github.com/ChainSafe/ChainBridge/shared/ethereum/testing"
19+
"github.com/ChainSafe/chainbridge-utils/blockstore"
2020
"github.com/ChainSafe/chainbridge-utils/msg"
2121
"github.com/ChainSafe/log15"
2222
"github.com/ethereum/go-ethereum/common"

‎chains/ethereum/writer.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ package ethereum
55

66
import (
77
"github.com/ChainSafe/ChainBridge/bindings/Bridge"
8-
"github.com/ChainSafe/ChainBridge/chains"
9-
metrics "github.com/ChainSafe/ChainBridge/metrics/types"
8+
"github.com/ChainSafe/chainbridge-utils/core"
9+
metrics "github.com/ChainSafe/chainbridge-utils/metrics/types"
1010
"github.com/ChainSafe/chainbridge-utils/msg"
1111
"github.com/ChainSafe/log15"
1212
)
1313

14-
var _ chains.Writer = &writer{}
14+
var _ core.Writer = &writer{}
1515

1616
// https://github.com/ChainSafe/chainbridge-solidity/blob/b5ed13d9798feb7c340e737a726dd415b8815366/contracts/Bridge.sol#L20
1717
var PassedStatus uint8 = 2

‎chains/interfaces.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ type Router interface {
1111
Send(message msg.Message) error
1212
}
1313

14-
type Writer interface {
15-
ResolveMessage(message msg.Message) bool
16-
}
14+
//type Writer interface {
15+
// ResolveMessage(message msg.Message) bool
16+
//}

0 commit comments

Comments
 (0)