Skip to content

Commit

Permalink
Use go module name matching the github url
Browse files Browse the repository at this point in the history
We now use github.com/shutter-network/rolling-shutter/rolling-shutter instead of
the old "stolen" name.
  • Loading branch information
schmir committed Apr 30, 2022
1 parent d75f6a0 commit 04d90c0
Show file tree
Hide file tree
Showing 68 changed files with 194 additions and 178 deletions.
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ repos:
"-sStandard",
"-sDefault",
"-sPrefix(github.com/shutter-network/shutter)",
"-sPrefix(github.com/shutter-network/rolling-shutter)",
]
exclude: |
(?x)(
Expand Down
1 change: 1 addition & 0 deletions rolling-shutter/.golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ linters-settings:
- Standard
- Default
- Prefix(github.com/shutter-network/shutter)
- Prefix(github.com/shutter-network/rolling-shutter)
goconst:
min-len: 2
min-occurrences: 2
Expand Down
2 changes: 1 addition & 1 deletion rolling-shutter/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ EXECUTABLE ?= ${BINDIR}/rolling-shutter
build:
@VERSION=`git describe --tags --always --abbrev=4 --dirty --match 'rolling-shutter/v*' | sed -e s#^rolling-shutter/##`; \
echo "Building ${EXECUTABLE} $${VERSION}"; \
${GO} build ${GOFLAGS} -o ${EXECUTABLE} -ldflags "-X github.com/shutter-network/shutter/shuttermint/cmd/shversion.version=$${VERSION}"; \
${GO} build ${GOFLAGS} -o ${EXECUTABLE} -ldflags "-X github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/shversion.version=$${VERSION}"; \

wasm:
GOARCH=wasm GOOS=js ${GO} build ${GOFLAGS} -o ${BINDIR}/shcrypto.wasm ./shcryptowasm/main_wasm.go
Expand Down
4 changes: 2 additions & 2 deletions rolling-shutter/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/tendermint/go-amino"
abcitypes "github.com/tendermint/tendermint/abci/types"

"github.com/shutter-network/shutter/shuttermint/keyper/shutterevents"
"github.com/shutter-network/shutter/shuttermint/shmsg"
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/shutterevents"
"github.com/shutter-network/rolling-shutter/rolling-shutter/shmsg"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion rolling-shutter/app/checktx.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package app
import (
"github.com/ethereum/go-ethereum/common"

"github.com/shutter-network/shutter/shuttermint/shmsg"
"github.com/shutter-network/rolling-shutter/rolling-shutter/shmsg"
)

// MaxTxsPerBlock is the maximum number of txs by a single sender per block.
Expand Down
2 changes: 1 addition & 1 deletion rolling-shutter/app/checktx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"gotest.tools/v3/assert"

"github.com/shutter-network/shutter/shuttermint/shmsg"
"github.com/shutter-network/rolling-shutter/rolling-shutter/shmsg"
)

func TestCheckTxStateCouting(t *testing.T) {
Expand Down
5 changes: 3 additions & 2 deletions rolling-shutter/app/messages.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import (
"github.com/pkg/errors"

"github.com/shutter-network/shutter/shlib/shcrypto"
"github.com/shutter-network/shutter/shuttermint/medley"
"github.com/shutter-network/shutter/shuttermint/shmsg"

"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
"github.com/shutter-network/rolling-shutter/rolling-shutter/shmsg"
)

func validateAddress(address []byte) (common.Address, error) {
Expand Down
2 changes: 1 addition & 1 deletion rolling-shutter/app/messages_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"gotest.tools/v3/assert"

"github.com/shutter-network/shutter/shuttermint/shmsg"
"github.com/shutter-network/rolling-shutter/rolling-shutter/shmsg"
)

func TestMessageParsing(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion rolling-shutter/app/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/pkg/errors"

"github.com/shutter-network/shutter/shuttermint/keyper/shutterevents"
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/shutterevents"
)

// GenesisAppState is used to hold the initial list of keypers, who will bootstrap the system by
Expand Down
2 changes: 1 addition & 1 deletion rolling-shutter/build-release
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ for osarch in ${TARGETS}; do
IFS='-' read -r os arch <<< "${osarch}"
target=${BIN}/rolling-shutter-${os}-${arch}-${VERSION}
echo "Building ${target}"
env GOARCH="${arch}" GOOS="${os}" ${GO} build -o "${target}" -ldflags "-X github.com/shutter-network/shutter/shuttermint/cmd/shversion.version=${VERSION}" .
env GOARCH="${arch}" GOOS="${os}" ${GO} build -o "${target}" -ldflags "-X github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/shversion.version=${VERSION}" .
done
12 changes: 6 additions & 6 deletions rolling-shutter/chainobserver/observer.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import (
"github.com/pkg/errors"
"golang.org/x/sync/errgroup"

"github.com/shutter-network/shutter/shuttermint/commondb"
"github.com/shutter-network/shutter/shuttermint/contract"
"github.com/shutter-network/shutter/shuttermint/contract/deployment"
"github.com/shutter-network/shutter/shuttermint/medley"
"github.com/shutter-network/shutter/shuttermint/medley/eventsyncer"
"github.com/shutter-network/shutter/shuttermint/shdb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/commondb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/contract"
"github.com/shutter-network/rolling-shutter/rolling-shutter/contract/deployment"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/eventsyncer"
"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
)

const finalityOffset = 3
Expand Down
2 changes: 1 addition & 1 deletion rolling-shutter/chaintesthelpers/chaintesthelpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"github.com/ethereum/go-ethereum/rpc"
"gotest.tools/assert"

"github.com/shutter-network/shutter/shuttermint/contract/deployment"
"github.com/shutter-network/rolling-shutter/rolling-shutter/contract/deployment"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions rolling-shutter/cmd/bootstrap/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"github.com/spf13/cobra"
"github.com/tendermint/tendermint/rpc/client/http"

"github.com/shutter-network/shutter/shuttermint/contract"
"github.com/shutter-network/shutter/shuttermint/contract/deployment"
"github.com/shutter-network/shutter/shuttermint/keyper/fx"
"github.com/shutter-network/shutter/shuttermint/shmsg"
"github.com/shutter-network/rolling-shutter/rolling-shutter/contract"
"github.com/shutter-network/rolling-shutter/rolling-shutter/contract/deployment"
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/fx"
"github.com/shutter-network/rolling-shutter/rolling-shutter/shmsg"
)

var bootstrapFlags struct {
Expand Down
4 changes: 2 additions & 2 deletions rolling-shutter/cmd/chain/chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"github.com/tendermint/tendermint/libs/service"
"github.com/tendermint/tendermint/node"

"github.com/shutter-network/shutter/shuttermint/app"
"github.com/shutter-network/shutter/shuttermint/cmd/shversion"
"github.com/shutter-network/rolling-shutter/rolling-shutter/app"
"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/shversion"
)

var cfgFile string
Expand Down
2 changes: 1 addition & 1 deletion rolling-shutter/cmd/chain/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/tendermint/tendermint/privval"
"github.com/tendermint/tendermint/types"

"github.com/shutter-network/shutter/shuttermint/app"
"github.com/shutter-network/rolling-shutter/rolling-shutter/app"
)

var (
Expand Down
10 changes: 5 additions & 5 deletions rolling-shutter/cmd/collator/collator.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/shutter-network/shutter/shuttermint/collator"
"github.com/shutter-network/shutter/shuttermint/collator/cltrdb"
"github.com/shutter-network/shutter/shuttermint/medley"
"github.com/shutter-network/shutter/shuttermint/p2p"
"github.com/shutter-network/shutter/shuttermint/shdb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/collator"
"github.com/shutter-network/rolling-shutter/rolling-shutter/collator/cltrdb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"
"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions rolling-shutter/cmd/collator/collator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/spf13/viper"
"gotest.tools/assert"

"github.com/shutter-network/shutter/shuttermint/collator"
"github.com/shutter-network/shutter/shuttermint/medley/comparer"
"github.com/shutter-network/rolling-shutter/rolling-shutter/collator"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/comparer"
)

func tomlRoundtrip(t *testing.T, cfg *collator.Config) *collator.Config {
Expand Down
12 changes: 6 additions & 6 deletions rolling-shutter/cmd/keyper/keyper.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/shutter-network/shutter/shuttermint/cmd/shversion"
"github.com/shutter-network/shutter/shuttermint/keyper"
"github.com/shutter-network/shutter/shuttermint/keyper/kprdb"
"github.com/shutter-network/shutter/shuttermint/medley"
"github.com/shutter-network/shutter/shuttermint/p2p"
"github.com/shutter-network/shutter/shuttermint/shdb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/shversion"
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper"
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/kprdb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"
"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
)

var (
Expand Down
5 changes: 3 additions & 2 deletions rolling-shutter/cmd/keyper/keyper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ import (
"gotest.tools/assert"

"github.com/shutter-network/shutter/shlib/shtest"
"github.com/shutter-network/shutter/shuttermint/keyper"
"github.com/shutter-network/shutter/shuttermint/medley/comparer"

"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/comparer"
)

func tomlRoundtrip(t *testing.T, cfg *keyper.Config) *keyper.Config {
Expand Down
4 changes: 2 additions & 2 deletions rolling-shutter/cmd/mocknode/mocknode.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/shutter-network/shutter/shuttermint/medley"
"github.com/shutter-network/shutter/shuttermint/mocknode"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
"github.com/shutter-network/rolling-shutter/rolling-shutter/mocknode"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions rolling-shutter/cmd/mocknode/mocknode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/spf13/viper"
"gotest.tools/assert"

"github.com/shutter-network/shutter/shuttermint/medley/comparer"
"github.com/shutter-network/shutter/shuttermint/mocknode"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/comparer"
"github.com/shutter-network/rolling-shutter/rolling-shutter/mocknode"
)

func tomlRoundtrip(t *testing.T, cfg *mocknode.Config) *mocknode.Config {
Expand Down
4 changes: 2 additions & 2 deletions rolling-shutter/cmd/proxy/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/shutter-network/shutter/shuttermint/cmd/shversion"
"github.com/shutter-network/shutter/shuttermint/proxy"
"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/shversion"
"github.com/shutter-network/rolling-shutter/rolling-shutter/proxy"
)

var cfgFile string
Expand Down
22 changes: 11 additions & 11 deletions rolling-shutter/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ import (

"github.com/spf13/cobra"

"github.com/shutter-network/shutter/shuttermint/cmd/bootstrap"
"github.com/shutter-network/shutter/shuttermint/cmd/chain"
"github.com/shutter-network/shutter/shuttermint/cmd/collator"
"github.com/shutter-network/shutter/shuttermint/cmd/completion"
"github.com/shutter-network/shutter/shuttermint/cmd/cryptocmd"
"github.com/shutter-network/shutter/shuttermint/cmd/keyper"
"github.com/shutter-network/shutter/shuttermint/cmd/mocknode"
"github.com/shutter-network/shutter/shuttermint/cmd/proxy"
"github.com/shutter-network/shutter/shuttermint/cmd/shversion"
"github.com/shutter-network/shutter/shuttermint/cmd/snapshot"
"github.com/shutter-network/shutter/shuttermint/medley"
"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/bootstrap"
"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/chain"
"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/collator"
"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/completion"
"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/cryptocmd"
"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/keyper"
"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/mocknode"
"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/proxy"
"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/shversion"
"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/snapshot"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
)

var logformat string
Expand Down
10 changes: 5 additions & 5 deletions rolling-shutter/cmd/snapshot/snapshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/shutter-network/shutter/shuttermint/medley"
"github.com/shutter-network/shutter/shuttermint/p2p"
"github.com/shutter-network/shutter/shuttermint/shdb"
"github.com/shutter-network/shutter/shuttermint/snapshot"
"github.com/shutter-network/shutter/shuttermint/snapshot/snpdb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"
"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/snapshot"
"github.com/shutter-network/rolling-shutter/rolling-shutter/snapshot/snpdb"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions rolling-shutter/cmd/snapshot/snapshot_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/spf13/viper"
"gotest.tools/assert"

"github.com/shutter-network/shutter/shuttermint/medley/comparer"
"github.com/shutter-network/shutter/shuttermint/snapshot"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/comparer"
"github.com/shutter-network/rolling-shutter/rolling-shutter/snapshot"
)

func tomlRoundtrip(t *testing.T, cfg *snapshot.Config) *snapshot.Config {
Expand Down
2 changes: 1 addition & 1 deletion rolling-shutter/collator/batchsubmission.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/pkg/errors"

"github.com/shutter-network/shutter/shuttermint/medley"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions rolling-shutter/collator/cltrdb/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/jackc/pgx/v4/pgxpool"
"github.com/pkg/errors"

"github.com/shutter-network/shutter/shuttermint/commondb"
"github.com/shutter-network/shutter/shuttermint/shdb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/commondb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
)

//go:embed schema.sql
Expand Down
2 changes: 1 addition & 1 deletion rolling-shutter/collator/cltrtopics/cltrtopics.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cltrtopics

import (
"github.com/shutter-network/shutter/shuttermint/keyper/kprtopics"
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/kprtopics"
)

const (
Expand Down
22 changes: 11 additions & 11 deletions rolling-shutter/collator/collator.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ import (
"github.com/pkg/errors"
"golang.org/x/sync/errgroup"

"github.com/shutter-network/shutter/shuttermint/chainobserver"
"github.com/shutter-network/shutter/shuttermint/collator/cltrdb"
"github.com/shutter-network/shutter/shuttermint/collator/cltrtopics"
"github.com/shutter-network/shutter/shuttermint/collator/oapi"
"github.com/shutter-network/shutter/shuttermint/contract/deployment"
"github.com/shutter-network/shutter/shuttermint/medley"
"github.com/shutter-network/shutter/shuttermint/medley/epochid"
"github.com/shutter-network/shutter/shuttermint/medley/eventsyncer"
"github.com/shutter-network/shutter/shuttermint/p2p"
"github.com/shutter-network/shutter/shuttermint/shdb"
"github.com/shutter-network/shutter/shuttermint/shmsg"
"github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver"
"github.com/shutter-network/rolling-shutter/rolling-shutter/collator/cltrdb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/collator/cltrtopics"
"github.com/shutter-network/rolling-shutter/rolling-shutter/collator/oapi"
"github.com/shutter-network/rolling-shutter/rolling-shutter/contract/deployment"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/epochid"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/eventsyncer"
"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"
"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/shmsg"
)

type collator struct {
Expand Down
2 changes: 1 addition & 1 deletion rolling-shutter/collator/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/pkg/errors"
"github.com/spf13/viper"

"github.com/shutter-network/shutter/shuttermint/medley"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
)

type Config struct {
Expand Down
6 changes: 3 additions & 3 deletions rolling-shutter/collator/eonhandling.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/pkg/errors"
"google.golang.org/protobuf/proto"

"github.com/shutter-network/shutter/shuttermint/collator/cltrdb"
"github.com/shutter-network/shutter/shuttermint/commondb"
"github.com/shutter-network/shutter/shuttermint/shmsg"
"github.com/shutter-network/rolling-shutter/rolling-shutter/collator/cltrdb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/commondb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/shmsg"
)

func (c *collator) getKeyperSet(ctx context.Context, activationBlock int64) (commondb.KeyperSet, error) {
Expand Down
10 changes: 5 additions & 5 deletions rolling-shutter/collator/eonhandling_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
ethcrypto "github.com/ethereum/go-ethereum/crypto"
"gotest.tools/assert"

"github.com/shutter-network/shutter/shuttermint/collator/cltrdb"
"github.com/shutter-network/shutter/shuttermint/commondb"
"github.com/shutter-network/shutter/shuttermint/medley/testdb"
"github.com/shutter-network/shutter/shuttermint/medley/testkeygen"
"github.com/shutter-network/shutter/shuttermint/shmsg"
"github.com/shutter-network/rolling-shutter/rolling-shutter/collator/cltrdb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/commondb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/testdb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/testkeygen"
"github.com/shutter-network/rolling-shutter/rolling-shutter/shmsg"
)

type keyper struct {
Expand Down
Loading

0 comments on commit 04d90c0

Please sign in to comment.