Skip to content

Commit

Permalink
Fix incorrect Relayer module path (#106)
Browse files Browse the repository at this point in the history
* fix go module name

* Update message store doc
  • Loading branch information
ermyas authored Feb 22, 2022
1 parent 34d5c8e commit dbb6c78
Show file tree
Hide file tree
Showing 48 changed files with 117 additions and 119 deletions.
4 changes: 1 addition & 3 deletions docs/message-store-service.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,4 @@ It is defined using the [Open API Specification format](https://swagger.io/speci

#### TODOs
- [ ] Security
- [ ] Deployment considerations
- [ ] Proof aggregation
- [ ] Data Store description
- [ ] Deployment considerations
2 changes: 1 addition & 1 deletion services/relayer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build:
go build -o ./build/admin cmd/admin/*

docker:
docker build -t consensys/gpact/messaging/relayer .
docker build -t consensys/gpact/services/relayer .

clean:
rm -rf ./build/*
Expand Down
6 changes: 3 additions & 3 deletions services/relayer/cmd/admin/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"os"
"strconv"

dispatcherapi "github.com/consensys/gpact/messaging/relayer/internal/msgdispatcher/eth/api"
observerapi "github.com/consensys/gpact/messaging/relayer/internal/msgobserver/eth/api"
relayerapi "github.com/consensys/gpact/messaging/relayer/internal/msgrelayer/eth/api"
dispatcherapi "github.com/consensys/gpact/services/relayer/internal/msgdispatcher/eth/api"
observerapi "github.com/consensys/gpact/services/relayer/internal/msgobserver/eth/api"
relayerapi "github.com/consensys/gpact/services/relayer/internal/msgrelayer/eth/api"
"github.com/ethereum/go-ethereum/common"
"github.com/urfave/cli/v2"
)
Expand Down
20 changes: 10 additions & 10 deletions services/relayer/cmd/dispatcher/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ import (
"os"
"os/signal"

"github.com/consensys/gpact/messaging/relayer/internal/config"
"github.com/consensys/gpact/messaging/relayer/internal/logging"
"github.com/consensys/gpact/messaging/relayer/internal/mqserver"
"github.com/consensys/gpact/messaging/relayer/internal/msgdispatcher/eth/api"
"github.com/consensys/gpact/messaging/relayer/internal/msgdispatcher/eth/dispatcher"
"github.com/consensys/gpact/messaging/relayer/internal/msgdispatcher/eth/mq"
"github.com/consensys/gpact/messaging/relayer/internal/msgdispatcher/eth/node"
"github.com/consensys/gpact/messaging/relayer/internal/msgdispatcher/eth/transactor"
"github.com/consensys/gpact/messaging/relayer/internal/msgdispatcher/eth/verifier"
"github.com/consensys/gpact/messaging/relayer/internal/rpc"
"github.com/consensys/gpact/services/relayer/internal/config"
"github.com/consensys/gpact/services/relayer/internal/logging"
"github.com/consensys/gpact/services/relayer/internal/mqserver"
"github.com/consensys/gpact/services/relayer/internal/msgdispatcher/eth/api"
"github.com/consensys/gpact/services/relayer/internal/msgdispatcher/eth/dispatcher"
"github.com/consensys/gpact/services/relayer/internal/msgdispatcher/eth/mq"
"github.com/consensys/gpact/services/relayer/internal/msgdispatcher/eth/node"
"github.com/consensys/gpact/services/relayer/internal/msgdispatcher/eth/transactor"
"github.com/consensys/gpact/services/relayer/internal/msgdispatcher/eth/verifier"
"github.com/consensys/gpact/services/relayer/internal/rpc"
_ "github.com/joho/godotenv/autoload"
)

Expand Down
14 changes: 7 additions & 7 deletions services/relayer/cmd/observer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ import (
"os"
"os/signal"

"github.com/consensys/gpact/messaging/relayer/internal/config"
"github.com/consensys/gpact/messaging/relayer/internal/logging"
"github.com/consensys/gpact/messaging/relayer/internal/mqserver"
"github.com/consensys/gpact/messaging/relayer/internal/msgobserver/eth/api"
"github.com/consensys/gpact/messaging/relayer/internal/msgobserver/eth/node"
"github.com/consensys/gpact/messaging/relayer/internal/msgobserver/eth/observer"
"github.com/consensys/gpact/messaging/relayer/internal/rpc"
"github.com/consensys/gpact/services/relayer/internal/config"
"github.com/consensys/gpact/services/relayer/internal/logging"
"github.com/consensys/gpact/services/relayer/internal/mqserver"
"github.com/consensys/gpact/services/relayer/internal/msgobserver/eth/api"
"github.com/consensys/gpact/services/relayer/internal/msgobserver/eth/node"
"github.com/consensys/gpact/services/relayer/internal/msgobserver/eth/observer"
"github.com/consensys/gpact/services/relayer/internal/rpc"
_ "github.com/joho/godotenv/autoload"
)

Expand Down
16 changes: 8 additions & 8 deletions services/relayer/cmd/relayer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ import (
"os"
"os/signal"

"github.com/consensys/gpact/messaging/relayer/internal/config"
"github.com/consensys/gpact/messaging/relayer/internal/logging"
"github.com/consensys/gpact/messaging/relayer/internal/mqserver"
"github.com/consensys/gpact/messaging/relayer/internal/msgrelayer/eth/api"
"github.com/consensys/gpact/messaging/relayer/internal/msgrelayer/eth/mq"
"github.com/consensys/gpact/messaging/relayer/internal/msgrelayer/eth/node"
"github.com/consensys/gpact/messaging/relayer/internal/msgrelayer/eth/signer"
"github.com/consensys/gpact/messaging/relayer/internal/rpc"
"github.com/consensys/gpact/services/relayer/internal/config"
"github.com/consensys/gpact/services/relayer/internal/logging"
"github.com/consensys/gpact/services/relayer/internal/mqserver"
"github.com/consensys/gpact/services/relayer/internal/msgrelayer/eth/api"
"github.com/consensys/gpact/services/relayer/internal/msgrelayer/eth/mq"
"github.com/consensys/gpact/services/relayer/internal/msgrelayer/eth/node"
"github.com/consensys/gpact/services/relayer/internal/msgrelayer/eth/signer"
"github.com/consensys/gpact/services/relayer/internal/rpc"
_ "github.com/joho/godotenv/autoload"
)

Expand Down
8 changes: 4 additions & 4 deletions services/relayer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ services:
- bc32node1

observer1:
image: consensys/gpact/messaging/relayer
image: consensys/gpact/services/relayer
container_name: observer1
networks:
- shared
Expand All @@ -72,7 +72,7 @@ services:
restart: on-failure

observer2:
image: consensys/gpact/messaging/relayer
image: consensys/gpact/services/relayer
container_name: observer2
networks:
- shared
Expand All @@ -86,7 +86,7 @@ services:
restart: on-failure

relayer:
image: consensys/gpact/messaging/relayer
image: consensys/gpact/services/relayer
container_name: relayer
networks:
- shared
Expand All @@ -100,7 +100,7 @@ services:
restart: on-failure

dispatcher:
image: consensys/gpact/messaging/relayer
image: consensys/gpact/services/relayer
container_name: dispatcher
networks:
- shared
Expand Down
2 changes: 1 addition & 1 deletion services/relayer/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/consensys/gpact/messaging/relayer
module github.com/consensys/gpact/services/relayer

go 1.17

Expand Down
2 changes: 1 addition & 1 deletion services/relayer/internal/adminserver/adminserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"time"

"github.com/consensys/gpact/messaging/relayer/internal/logging"
"github.com/consensys/gpact/services/relayer/internal/logging"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion services/relayer/internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package config
*/

import (
"github.com/consensys/gpact/messaging/relayer/internal/logging"
"github.com/consensys/gpact/services/relayer/internal/logging"
"github.com/spf13/viper"
)

Expand Down
4 changes: 2 additions & 2 deletions services/relayer/internal/mqserver/mqserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ package mqserver
*/

import (
"github.com/consensys/gpact/messaging/relayer/internal/logging"
"github.com/consensys/gpact/messaging/relayer/internal/messages"
"github.com/consensys/gpact/services/relayer/internal/logging"
"github.com/consensys/gpact/services/relayer/internal/messages"
"github.com/streadway/amqp"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"math/big"

"github.com/consensys/gpact/messaging/relayer/internal/msgdispatcher/eth/node"
"github.com/consensys/gpact/messaging/relayer/internal/rpc"
"github.com/consensys/gpact/services/relayer/internal/msgdispatcher/eth/node"
"github.com/consensys/gpact/services/relayer/internal/rpc"
"github.com/ethereum/go-ethereum/common"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"math/big"

"github.com/consensys/gpact/messaging/relayer/internal/msgdispatcher/eth/node"
"github.com/consensys/gpact/messaging/relayer/internal/rpc"
"github.com/consensys/gpact/services/relayer/internal/msgdispatcher/eth/node"
"github.com/consensys/gpact/services/relayer/internal/rpc"
)

// GetChainAPReq is the request to get chain ap.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"math/big"

"github.com/consensys/gpact/messaging/relayer/internal/msgdispatcher/eth/node"
"github.com/consensys/gpact/messaging/relayer/internal/rpc"
"github.com/consensys/gpact/services/relayer/internal/msgdispatcher/eth/node"
"github.com/consensys/gpact/services/relayer/internal/rpc"
"github.com/ethereum/go-ethereum/common"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"fmt"
"math/big"

"github.com/consensys/gpact/messaging/relayer/internal/rpc"
"github.com/consensys/gpact/services/relayer/internal/rpc"

"github.com/consensys/gpact/messaging/relayer/internal/msgdispatcher/eth/node"
"github.com/consensys/gpact/services/relayer/internal/msgdispatcher/eth/node"
"github.com/ethereum/go-ethereum/ethclient"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"math/big"

"github.com/consensys/gpact/messaging/relayer/internal/msgdispatcher/eth/node"
"github.com/consensys/gpact/messaging/relayer/internal/rpc"
"github.com/consensys/gpact/services/relayer/internal/msgdispatcher/eth/node"
"github.com/consensys/gpact/services/relayer/internal/rpc"
"github.com/ethereum/go-ethereum/common"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"math/big"
"time"

"github.com/consensys/gpact/messaging/relayer/internal/contracts/messaging"
"github.com/consensys/gpact/messaging/relayer/internal/logging"
"github.com/consensys/gpact/services/relayer/internal/contracts/messaging"
"github.com/consensys/gpact/services/relayer/internal/logging"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
Expand Down
8 changes: 4 additions & 4 deletions services/relayer/internal/msgdispatcher/eth/mq/handler_v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ package mq
import (
"encoding/hex"
"encoding/json"
"github.com/consensys/gpact/messaging/relayer/pkg/messages/v1"
"github.com/consensys/gpact/services/relayer/pkg/messages/v1"
"math/big"
"strconv"

"github.com/consensys/gpact/messaging/relayer/internal/logging"
"github.com/consensys/gpact/messaging/relayer/internal/messages"
"github.com/consensys/gpact/messaging/relayer/internal/msgdispatcher/eth/node"
"github.com/consensys/gpact/services/relayer/internal/logging"
"github.com/consensys/gpact/services/relayer/internal/messages"
"github.com/consensys/gpact/services/relayer/internal/msgdispatcher/eth/node"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
)
Expand Down
2 changes: 1 addition & 1 deletion services/relayer/internal/msgdispatcher/eth/mq/mq.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package mq
* SPDX-License-Identifier: Apache-2.0
*/

import "github.com/consensys/gpact/messaging/relayer/internal/messages"
import "github.com/consensys/gpact/services/relayer/internal/messages"

// Handlers store all mq handler.
var Handlers map[string]map[string]func(msg messages.Message)
Expand Down
10 changes: 5 additions & 5 deletions services/relayer/internal/msgdispatcher/eth/node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ package node
import (
"sync"

"github.com/consensys/gpact/messaging/relayer/internal/mqserver"
"github.com/consensys/gpact/messaging/relayer/internal/msgdispatcher/eth/dispatcher"
"github.com/consensys/gpact/messaging/relayer/internal/msgdispatcher/eth/transactor"
"github.com/consensys/gpact/messaging/relayer/internal/msgdispatcher/eth/verifier"
"github.com/consensys/gpact/messaging/relayer/internal/rpc"
"github.com/consensys/gpact/services/relayer/internal/mqserver"
"github.com/consensys/gpact/services/relayer/internal/msgdispatcher/eth/dispatcher"
"github.com/consensys/gpact/services/relayer/internal/msgdispatcher/eth/transactor"
"github.com/consensys/gpact/services/relayer/internal/msgdispatcher/eth/verifier"
"github.com/consensys/gpact/services/relayer/internal/rpc"
)

// Node represents the node core.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"math/big"
"time"

"github.com/consensys/gpact/messaging/relayer/internal/logging"
"github.com/consensys/gpact/services/relayer/internal/logging"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/crypto/secp256k1"
"github.com/ipfs/go-datastore"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"math/big"
"time"

"github.com/consensys/gpact/messaging/relayer/internal/logging"
"github.com/consensys/gpact/services/relayer/internal/logging"
"github.com/ethereum/go-ethereum/common"
"github.com/ipfs/go-datastore"
badgerds "github.com/ipfs/go-ds-badger"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"math/big"

"github.com/consensys/gpact/messaging/relayer/internal/msgobserver/eth/node"
"github.com/consensys/gpact/messaging/relayer/internal/rpc"
"github.com/consensys/gpact/services/relayer/internal/msgobserver/eth/node"
"github.com/consensys/gpact/services/relayer/internal/rpc"
"github.com/ethereum/go-ethereum/common"
)

Expand Down
4 changes: 2 additions & 2 deletions services/relayer/internal/msgobserver/eth/api/stop_observe.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package api
import (
"encoding/json"

"github.com/consensys/gpact/messaging/relayer/internal/msgobserver/eth/node"
"github.com/consensys/gpact/messaging/relayer/internal/rpc"
"github.com/consensys/gpact/services/relayer/internal/msgobserver/eth/node"
"github.com/consensys/gpact/services/relayer/internal/rpc"
)

// StopObserveReq is the request to stop observe.
Expand Down
6 changes: 3 additions & 3 deletions services/relayer/internal/msgobserver/eth/node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package node
import (
"sync"

"github.com/consensys/gpact/messaging/relayer/internal/mqserver"
"github.com/consensys/gpact/messaging/relayer/internal/msgobserver/eth/observer"
"github.com/consensys/gpact/messaging/relayer/internal/rpc"
"github.com/consensys/gpact/services/relayer/internal/mqserver"
"github.com/consensys/gpact/services/relayer/internal/msgobserver/eth/observer"
"github.com/consensys/gpact/services/relayer/internal/rpc"
)

// Node represents the node core.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package observer
*/

import (
"github.com/consensys/gpact/messaging/relayer/internal/logging"
"github.com/consensys/gpact/services/relayer/internal/logging"
)

type EventHandler interface {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/consensys/gpact/messaging/relayer/pkg/messages/v1"
"github.com/consensys/gpact/services/relayer/pkg/messages/v1"
"github.com/ethereum/go-ethereum/core/types"

"github.com/consensys/gpact/messaging/relayer/internal/contracts/functioncall"
"github.com/consensys/gpact/services/relayer/internal/contracts/functioncall"
)

type EventTransformer interface {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"math/big"
"testing"

"github.com/consensys/gpact/messaging/relayer/internal/contracts/functioncall"
"github.com/consensys/gpact/services/relayer/internal/contracts/functioncall"
"github.com/ethereum/go-ethereum/common"
"github.com/stretchr/testify/assert"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"context"
"fmt"
"github.com/avast/retry-go"
"github.com/consensys/gpact/messaging/relayer/internal/contracts/functioncall"
"github.com/consensys/gpact/messaging/relayer/internal/logging"
"github.com/consensys/gpact/services/relayer/internal/contracts/functioncall"
"github.com/consensys/gpact/services/relayer/internal/logging"
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/core/types"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ package observer
*/

import (
"github.com/consensys/gpact/messaging/relayer/internal/contracts/functioncall"
"github.com/consensys/gpact/messaging/relayer/internal/logging"
"github.com/consensys/gpact/services/relayer/internal/contracts/functioncall"
"github.com/consensys/gpact/services/relayer/internal/logging"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
"github.com/ipfs/go-datastore"
Expand Down
Loading

0 comments on commit dbb6c78

Please sign in to comment.