Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Horcrux go.mod module path #240

Merged
merged 2 commits into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ COMMIT := $(shell git log -1 --format='%H')

all: install

LD_FLAGS = -X github.com/strangelove-ventures/horcrux/cmd/horcrux/cmd.Version=$(VERSION) \
-X github.com/strangelove-ventures/horcrux/cmd/horcrux/cmd.Commit=$(COMMIT)
LD_FLAGS = -X github.com/strangelove-ventures/horcrux/v3/cmd/horcrux/cmd.Version=$(VERSION) \
-X github.com/strangelove-ventures/horcrux/v3/cmd/horcrux/cmd.Commit=$(COMMIT)

LD_FLAGS += $(LDFLAGS)
LD_FLAGS := $(strip $(LD_FLAGS))
Expand Down Expand Up @@ -56,4 +56,4 @@ proto-lint:
@$(protoImage) buf lint --error-format=json


.PHONY: all lint test race msan tools clean build
.PHONY: all lint test race msan tools clean build
2 changes: 1 addition & 1 deletion client/address_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package client_test
import (
"testing"

"github.com/strangelove-ventures/horcrux/client"
"github.com/strangelove-ventures/horcrux/v3/client"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/horcrux/cmd/address.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
cometprivval "github.com/cometbft/cometbft/privval"
"github.com/cosmos/cosmos-sdk/types/bech32"
"github.com/spf13/cobra"
"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/v3/signer"
)

type AddressCmdOutput struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/horcrux/cmd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"

"github.com/spf13/cobra"
"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/v3/signer"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions cmd/horcrux/cmd/leader_election.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (

grpcretry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
"github.com/spf13/cobra"
"github.com/strangelove-ventures/horcrux/client"
"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/signer/multiresolver"
"github.com/strangelove-ventures/horcrux/signer/proto"
"github.com/strangelove-ventures/horcrux/v3/client"
"github.com/strangelove-ventures/horcrux/v3/signer"
"github.com/strangelove-ventures/horcrux/v3/signer/multiresolver"
"github.com/strangelove-ventures/horcrux/v3/signer/proto"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/horcrux/cmd/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
cometcryptoencoding "github.com/cometbft/cometbft/crypto/encoding"
cometprotocrypto "github.com/cometbft/cometbft/proto/tendermint/crypto"
"github.com/spf13/cobra"
"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/v3/signer"
amino "github.com/tendermint/go-amino"
"gopkg.in/yaml.v2"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/horcrux/cmd/migrate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"testing"

"github.com/strangelove-ventures/horcrux/cmd/horcrux/cmd/testdata"
"github.com/strangelove-ventures/horcrux/v3/cmd/horcrux/cmd/testdata"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/horcrux/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
homedir "github.com/mitchellh/go-homedir"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/v3/signer"
"gopkg.in/yaml.v2"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/horcrux/cmd/shards.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"path/filepath"

"github.com/spf13/cobra"
"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/v3/signer"
)

func createCosignerDirectoryIfNecessary(out string, id int) (string, error) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/horcrux/cmd/single_signer.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"io"

"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/v3/signer"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/horcrux/cmd/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
cometlog "github.com/cometbft/cometbft/libs/log"
"github.com/cometbft/cometbft/libs/service"
"github.com/spf13/cobra"
"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/v3/signer"
)

func startCmd() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion cmd/horcrux/cmd/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"time"

"github.com/spf13/cobra"
"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/v3/signer"

cometjson "github.com/cometbft/cometbft/libs/json"
cometlog "github.com/cometbft/cometbft/libs/log"
Expand Down
2 changes: 1 addition & 1 deletion cmd/horcrux/cmd/state_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"
"time"

"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/v3/signer"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/horcrux/cmd/threshold.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

cometlog "github.com/cometbft/cometbft/libs/log"
cometservice "github.com/cometbft/cometbft/libs/service"
"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/v3/signer"
)

const maxWaitForSameBlockAttempts = 3
Expand Down
2 changes: 1 addition & 1 deletion cmd/horcrux/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.
*/
package main

import "github.com/strangelove-ventures/horcrux/cmd/horcrux/cmd"
import "github.com/strangelove-ventures/horcrux/v3/cmd/horcrux/cmd"

func main() {
cmd.Execute()
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/strangelove-ventures/horcrux
module github.com/strangelove-ventures/horcrux/v3

go 1.21

Expand Down
4 changes: 2 additions & 2 deletions proto/strangelove/horcrux/cosigner.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package strangelove.horcrux;

option go_package = "github.com/strangelove-ventures/horcrux/signer/proto";
option go_package = "github.com/strangelove-ventures/horcrux/v3/signer/proto";

service Cosigner {
rpc SignBlock (SignBlockRequest) returns (SignBlockResponse) {}
Expand Down Expand Up @@ -88,4 +88,4 @@ message GetLeaderResponse {
}

message PingRequest {}
message PingResponse {}
message PingResponse {}
2 changes: 1 addition & 1 deletion proto/strangelove/horcrux/remote_signer.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package strangelove.horcrux;

import "strangelove/horcrux/cosigner.proto";

option go_package = "github.com/strangelove-ventures/horcrux/signer/proto";
option go_package = "github.com/strangelove-ventures/horcrux/v3/signer/proto";

service RemoteSigner {
rpc PubKey (PubKeyRequest) returns (PubKeyResponse) {}
Expand Down
2 changes: 1 addition & 1 deletion signer/cond/cond_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sync"
"testing"

"github.com/strangelove-ventures/horcrux/signer/cond"
"github.com/strangelove-ventures/horcrux/v3/signer/cond"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion signer/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
"github.com/cosmos/cosmos-sdk/types/bech32"
"github.com/strangelove-ventures/horcrux/client"
"github.com/strangelove-ventures/horcrux/v3/client"
"gopkg.in/yaml.v2"
)

Expand Down
2 changes: 1 addition & 1 deletion signer/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"
"testing"

"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/v3/signer"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion signer/cosigner.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

cometcrypto "github.com/cometbft/cometbft/crypto"
"github.com/google/uuid"
"github.com/strangelove-ventures/horcrux/signer/proto"
"github.com/strangelove-ventures/horcrux/v3/signer/proto"
)

// Cosigner interface is a set of methods for an m-of-n threshold signature.
Expand Down
2 changes: 1 addition & 1 deletion signer/cosigner_grpc_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/google/uuid"
"github.com/hashicorp/raft"
"github.com/strangelove-ventures/horcrux/signer/proto"
"github.com/strangelove-ventures/horcrux/v3/signer/proto"
)

var _ proto.CosignerServer = &CosignerGRPCServer{}
Expand Down
2 changes: 1 addition & 1 deletion signer/cosigner_health.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

cometlog "github.com/cometbft/cometbft/libs/log"
"github.com/strangelove-ventures/horcrux/signer/proto"
"github.com/strangelove-ventures/horcrux/v3/signer/proto"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion signer/hrs.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package signer

import (
"github.com/strangelove-ventures/horcrux/signer/proto"
"github.com/strangelove-ventures/horcrux/v3/signer/proto"
)

// HRSKey represents the key for the HRS metadata map.
Expand Down
6 changes: 3 additions & 3 deletions signer/multiresolver/multi_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"time"

grpcretry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/signer/multiresolver"
"github.com/strangelove-ventures/horcrux/signer/proto"
"github.com/strangelove-ventures/horcrux/v3/signer"
"github.com/strangelove-ventures/horcrux/v3/signer/multiresolver"
"github.com/strangelove-ventures/horcrux/v3/signer/proto"
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
Expand Down
2 changes: 1 addition & 1 deletion signer/raft_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/cometbft/cometbft/libs/service"
"github.com/hashicorp/raft"
boltdb "github.com/hashicorp/raft-boltdb/v2"
"github.com/strangelove-ventures/horcrux/signer/proto"
"github.com/strangelove-ventures/horcrux/v3/signer/proto"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/reflection"
Expand Down
2 changes: 1 addition & 1 deletion signer/remote_cosigner.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

cometcrypto "github.com/cometbft/cometbft/crypto"
"github.com/google/uuid"
"github.com/strangelove-ventures/horcrux/signer/proto"
"github.com/strangelove-ventures/horcrux/v3/signer/proto"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
)
Expand Down
2 changes: 1 addition & 1 deletion signer/remote_signer_grpc_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
cometlog "github.com/cometbft/cometbft/libs/log"
cometservice "github.com/cometbft/cometbft/libs/service"

"github.com/strangelove-ventures/horcrux/signer/proto"
"github.com/strangelove-ventures/horcrux/v3/signer/proto"
"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
)
Expand Down
2 changes: 1 addition & 1 deletion signer/services_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

cometlog "github.com/cometbft/cometbft/libs/log"
cometservice "github.com/cometbft/cometbft/libs/service"
"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/v3/signer"

fork "github.com/kraken-hpc/go-fork"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion signer/sign_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
cometproto "github.com/cometbft/cometbft/proto/tendermint/types"
comet "github.com/cometbft/cometbft/types"
"github.com/gogo/protobuf/proto"
"github.com/strangelove-ventures/horcrux/signer/cond"
"github.com/strangelove-ventures/horcrux/v3/signer/cond"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion signer/threshold_validator.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/cometbft/cometbft/libs/log"
cometrpcjsontypes "github.com/cometbft/cometbft/rpc/jsonrpc/types"
"github.com/google/uuid"
"github.com/strangelove-ventures/horcrux/signer/proto"
"github.com/strangelove-ventures/horcrux/v3/signer/proto"
"golang.org/x/sync/errgroup"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
Expand Down
2 changes: 1 addition & 1 deletion test/horcrux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/cometbft/cometbft/crypto"
dockertypes "github.com/docker/docker/api/types"
"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/v3/signer"
interchaintest "github.com/strangelove-ventures/interchaintest/v8"
"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
Expand Down
2 changes: 1 addition & 1 deletion test/validator.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/cosmos/cosmos-sdk/types/bech32"
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
"github.com/docker/docker/client"
"github.com/strangelove-ventures/horcrux/signer/proto"
"github.com/strangelove-ventures/horcrux/v3/signer/proto"
interchaintest "github.com/strangelove-ventures/interchaintest/v8"
"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
Expand Down
2 changes: 1 addition & 1 deletion test/validator_single.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
cometjson "github.com/cometbft/cometbft/libs/json"
"github.com/cometbft/cometbft/privval"
"github.com/docker/docker/client"
"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/v3/signer"
interchaintest "github.com/strangelove-ventures/interchaintest/v8"
"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
Expand Down
2 changes: 1 addition & 1 deletion test/validator_threshold.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/docker/docker/client"
dto "github.com/prometheus/client_model/go"
"github.com/prometheus/common/expfmt"
"github.com/strangelove-ventures/horcrux/signer"
"github.com/strangelove-ventures/horcrux/v3/signer"
interchaintest "github.com/strangelove-ventures/interchaintest/v8"
"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
Expand Down
Loading