Skip to content

Commit

Permalink
chore: adjust the go module name (#623)
Browse files Browse the repository at this point in the history
  • Loading branch information
cool-develope authored Oct 22, 2024
1 parent 137b11c commit bceca07
Show file tree
Hide file tree
Showing 88 changed files with 298 additions and 300 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ GOBINARY := lagrange-node
GOCMD := $(GOBASE)/cmd/baseapp/
SCRIPTS_FOLDER=$(GOBASE)/scripts

LDFLAGS += -X 'github.com/Lagrange-Labs/lagrange-node.Version=$(VERSION)'
LDFLAGS += -X 'github.com/Lagrange-Labs/lagrange-node.GitRev=$(GITREV)'
LDFLAGS += -X 'github.com/Lagrange-Labs/lagrange-node.GitBranch=$(GITBRANCH)'
LDFLAGS += -X 'github.com/Lagrange-Labs/lagrange-node.BuildDate=$(DATE)'
LDFLAGS += -X 'github.com/Lagrange-Labs/lsc-node.Version=$(VERSION)'
LDFLAGS += -X 'github.com/Lagrange-Labs/lsc-node.GitRev=$(GITREV)'
LDFLAGS += -X 'github.com/Lagrange-Labs/lsc-node.GitBranch=$(GITBRANCH)'
LDFLAGS += -X 'github.com/Lagrange-Labs/lsc-node.BuildDate=$(DATE)'

STOP := docker compose down --remove-orphans

Expand Down
14 changes: 7 additions & 7 deletions client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import (

"google.golang.org/protobuf/proto"

"github.com/Lagrange-Labs/lagrange-node/core"
"github.com/Lagrange-Labs/lagrange-node/core/logger"
"github.com/Lagrange-Labs/lagrange-node/core/telemetry"
"github.com/Lagrange-Labs/lagrange-node/rpcclient"
sequencerv2types "github.com/Lagrange-Labs/lagrange-node/sequencer/types/v2"
"github.com/Lagrange-Labs/lagrange-node/server"
serverv2types "github.com/Lagrange-Labs/lagrange-node/server/types/v2"
"github.com/Lagrange-Labs/lsc-node/core"
"github.com/Lagrange-Labs/lsc-node/core/logger"
"github.com/Lagrange-Labs/lsc-node/core/telemetry"
"github.com/Lagrange-Labs/lsc-node/rpcclient"
sequencerv2types "github.com/Lagrange-Labs/lsc-node/sequencer/types/v2"
"github.com/Lagrange-Labs/lsc-node/server"
serverv2types "github.com/Lagrange-Labs/lsc-node/server/types/v2"
)

var (
Expand Down
12 changes: 6 additions & 6 deletions client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"github.com/ethereum/go-ethereum/crypto"
"github.com/stretchr/testify/require"

contypes "github.com/Lagrange-Labs/lagrange-node/consensus/types"
"github.com/Lagrange-Labs/lagrange-node/core"
corecrypto "github.com/Lagrange-Labs/lagrange-node/core/crypto"
rpctypes "github.com/Lagrange-Labs/lagrange-node/rpcclient/types"
sequencertypes "github.com/Lagrange-Labs/lagrange-node/sequencer/types"
sequencerv2types "github.com/Lagrange-Labs/lagrange-node/sequencer/types/v2"
contypes "github.com/Lagrange-Labs/lsc-node/consensus/types"
"github.com/Lagrange-Labs/lsc-node/core"
corecrypto "github.com/Lagrange-Labs/lsc-node/core/crypto"
rpctypes "github.com/Lagrange-Labs/lsc-node/rpcclient/types"
sequencertypes "github.com/Lagrange-Labs/lsc-node/sequencer/types"
sequencerv2types "github.com/Lagrange-Labs/lsc-node/sequencer/types/v2"
)

func TestECDSASignVerify(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion client/config.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package client

import "github.com/Lagrange-Labs/lagrange-node/core"
import "github.com/Lagrange-Labs/lsc-node/core"

// Config is the configuration for the client node.
type Config struct {
Expand Down
8 changes: 4 additions & 4 deletions client/health.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/health/grpc_health_v1"

"github.com/Lagrange-Labs/lagrange-node/core"
"github.com/Lagrange-Labs/lagrange-node/core/logger"
"github.com/Lagrange-Labs/lagrange-node/core/telemetry"
serverv2types "github.com/Lagrange-Labs/lagrange-node/server/types/v2"
"github.com/Lagrange-Labs/lsc-node/core"
"github.com/Lagrange-Labs/lsc-node/core/logger"
"github.com/Lagrange-Labs/lsc-node/core/telemetry"
serverv2types "github.com/Lagrange-Labs/lsc-node/server/types/v2"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions client/rpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"fmt"
"time"

"github.com/Lagrange-Labs/lagrange-node/core/telemetry"
"github.com/Lagrange-Labs/lagrange-node/rpcclient"
rpctypes "github.com/Lagrange-Labs/lagrange-node/rpcclient/types"
sequencerv2types "github.com/Lagrange-Labs/lagrange-node/sequencer/types/v2"
serverv2types "github.com/Lagrange-Labs/lagrange-node/server/types/v2"
"github.com/Lagrange-Labs/lsc-node/core/telemetry"
"github.com/Lagrange-Labs/lsc-node/rpcclient"
rpctypes "github.com/Lagrange-Labs/lsc-node/rpcclient/types"
sequencerv2types "github.com/Lagrange-Labs/lsc-node/sequencer/types/v2"
serverv2types "github.com/Lagrange-Labs/lsc-node/server/types/v2"
"github.com/ethereum/go-ethereum/common"
)

Expand Down
10 changes: 5 additions & 5 deletions client/signer.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure"

"github.com/Lagrange-Labs/lagrange-node/core"
"github.com/Lagrange-Labs/lagrange-node/core/crypto"
"github.com/Lagrange-Labs/lagrange-node/core/logger"
"github.com/Lagrange-Labs/lagrange-node/signer"
"github.com/Lagrange-Labs/lagrange-node/signer/types"
"github.com/Lagrange-Labs/lsc-node/core"
"github.com/Lagrange-Labs/lsc-node/core/crypto"
"github.com/Lagrange-Labs/lsc-node/core/logger"
"github.com/Lagrange-Labs/lsc-node/signer"
"github.com/Lagrange-Labs/lsc-node/signer/types"
)

var _ SignerCaller = (*SignerClient)(nil)
Expand Down
12 changes: 6 additions & 6 deletions client/verifier.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import (
"github.com/ethereum/go-ethereum/common/lru"
"github.com/ethereum/go-ethereum/ethclient"

"github.com/Lagrange-Labs/lagrange-node/core"
"github.com/Lagrange-Labs/lagrange-node/core/crypto"
"github.com/Lagrange-Labs/lagrange-node/core/logger"
"github.com/Lagrange-Labs/lagrange-node/core/telemetry"
"github.com/Lagrange-Labs/lagrange-node/scinterface/committee"
sequencerv2types "github.com/Lagrange-Labs/lagrange-node/sequencer/types/v2"
"github.com/Lagrange-Labs/lsc-node/core"
"github.com/Lagrange-Labs/lsc-node/core/crypto"
"github.com/Lagrange-Labs/lsc-node/core/logger"
"github.com/Lagrange-Labs/lsc-node/core/telemetry"
"github.com/Lagrange-Labs/lsc-node/scinterface/committee"
sequencerv2types "github.com/Lagrange-Labs/lsc-node/sequencer/types/v2"
)

const (
Expand Down
22 changes: 11 additions & 11 deletions cmd/baseapp/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ import (
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/urfave/cli/v2"

"github.com/Lagrange-Labs/lagrange-node/client"
"github.com/Lagrange-Labs/lagrange-node/config"
"github.com/Lagrange-Labs/lagrange-node/consensus"
"github.com/Lagrange-Labs/lagrange-node/core/logger"
"github.com/Lagrange-Labs/lagrange-node/core/telemetry"
"github.com/Lagrange-Labs/lagrange-node/rpcclient"
"github.com/Lagrange-Labs/lagrange-node/sequencer"
"github.com/Lagrange-Labs/lagrange-node/server"
"github.com/Lagrange-Labs/lagrange-node/signer"
signerlocal "github.com/Lagrange-Labs/lagrange-node/signer/local"
"github.com/Lagrange-Labs/lagrange-node/store"
"github.com/Lagrange-Labs/lsc-node/client"
"github.com/Lagrange-Labs/lsc-node/config"
"github.com/Lagrange-Labs/lsc-node/consensus"
"github.com/Lagrange-Labs/lsc-node/core/logger"
"github.com/Lagrange-Labs/lsc-node/core/telemetry"
"github.com/Lagrange-Labs/lsc-node/rpcclient"
"github.com/Lagrange-Labs/lsc-node/sequencer"
"github.com/Lagrange-Labs/lsc-node/server"
"github.com/Lagrange-Labs/lsc-node/signer"
signerlocal "github.com/Lagrange-Labs/lsc-node/signer/local"
"github.com/Lagrange-Labs/lsc-node/store"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/migrate/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"log"
"os"

"github.com/Lagrange-Labs/lagrange-node/store/mongodb/migrations"
"github.com/Lagrange-Labs/lsc-node/store/mongodb/migrations"
"github.com/urfave/cli/v2"
)

Expand Down
14 changes: 7 additions & 7 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import (
"github.com/spf13/viper"
"github.com/urfave/cli/v2"

"github.com/Lagrange-Labs/lagrange-node/client"
"github.com/Lagrange-Labs/lagrange-node/consensus"
"github.com/Lagrange-Labs/lagrange-node/core/telemetry"
"github.com/Lagrange-Labs/lagrange-node/rpcclient"
"github.com/Lagrange-Labs/lagrange-node/sequencer"
"github.com/Lagrange-Labs/lagrange-node/server"
"github.com/Lagrange-Labs/lagrange-node/store"
"github.com/Lagrange-Labs/lsc-node/client"
"github.com/Lagrange-Labs/lsc-node/consensus"
"github.com/Lagrange-Labs/lsc-node/core/telemetry"
"github.com/Lagrange-Labs/lsc-node/rpcclient"
"github.com/Lagrange-Labs/lsc-node/sequencer"
"github.com/Lagrange-Labs/lsc-node/server"
"github.com/Lagrange-Labs/lsc-node/store"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion config/default.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,6 @@ BLSCurve = "BN254"
[Telemetry]
MetricsEnabled = true
MetricsServerPort = "8080"
ServiceName = "lagrange-node"
ServiceName = "lagrange-state-committee-node"
PrometheusRetentionTime = "60s"
`
2 changes: 1 addition & 1 deletion consensus/config.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package consensus

import "github.com/Lagrange-Labs/lagrange-node/core"
import "github.com/Lagrange-Labs/lsc-node/core"

// Config is the configuration for the consensus module.
type Config struct {
Expand Down
10 changes: 5 additions & 5 deletions consensus/interfaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package consensus
import (
"context"

"github.com/Lagrange-Labs/lagrange-node/consensus/types"
sequencertypes "github.com/Lagrange-Labs/lagrange-node/sequencer/types"
sequencerv2types "github.com/Lagrange-Labs/lagrange-node/sequencer/types/v2"
servertypes "github.com/Lagrange-Labs/lagrange-node/server/types"
storetypes "github.com/Lagrange-Labs/lagrange-node/store/types"
"github.com/Lagrange-Labs/lsc-node/consensus/types"
sequencertypes "github.com/Lagrange-Labs/lsc-node/sequencer/types"
sequencerv2types "github.com/Lagrange-Labs/lsc-node/sequencer/types/v2"
servertypes "github.com/Lagrange-Labs/lsc-node/server/types"
storetypes "github.com/Lagrange-Labs/lsc-node/store/types"
)

var _ storageInterface = (storetypes.Storage)(nil)
Expand Down
16 changes: 8 additions & 8 deletions consensus/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/ethclient"

"github.com/Lagrange-Labs/lagrange-node/consensus/types"
"github.com/Lagrange-Labs/lagrange-node/core"
"github.com/Lagrange-Labs/lagrange-node/core/crypto"
"github.com/Lagrange-Labs/lagrange-node/core/logger"
"github.com/Lagrange-Labs/lagrange-node/core/telemetry"
"github.com/Lagrange-Labs/lagrange-node/scinterface/committee"
sequencerv2types "github.com/Lagrange-Labs/lagrange-node/sequencer/types/v2"
storetypes "github.com/Lagrange-Labs/lagrange-node/store/types"
"github.com/Lagrange-Labs/lsc-node/consensus/types"
"github.com/Lagrange-Labs/lsc-node/core"
"github.com/Lagrange-Labs/lsc-node/core/crypto"
"github.com/Lagrange-Labs/lsc-node/core/logger"
"github.com/Lagrange-Labs/lsc-node/core/telemetry"
"github.com/Lagrange-Labs/lsc-node/scinterface/committee"
sequencerv2types "github.com/Lagrange-Labs/lsc-node/sequencer/types/v2"
storetypes "github.com/Lagrange-Labs/lsc-node/store/types"
)

const CheckInterval = 1 * time.Second
Expand Down
10 changes: 5 additions & 5 deletions consensus/state_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (

"github.com/stretchr/testify/require"

"github.com/Lagrange-Labs/lagrange-node/core"
"github.com/Lagrange-Labs/lagrange-node/core/crypto"
sequencertypes "github.com/Lagrange-Labs/lagrange-node/sequencer/types"
"github.com/Lagrange-Labs/lagrange-node/store/memdb"
"github.com/Lagrange-Labs/lagrange-node/testutil"
"github.com/Lagrange-Labs/lsc-node/core"
"github.com/Lagrange-Labs/lsc-node/core/crypto"
sequencertypes "github.com/Lagrange-Labs/lsc-node/sequencer/types"
"github.com/Lagrange-Labs/lsc-node/store/memdb"
"github.com/Lagrange-Labs/lsc-node/testutil"
)

func createTestState(t *testing.T) (*State, chan *sequencertypes.BlsSignature) {
Expand Down
10 changes: 5 additions & 5 deletions consensus/types/evidence.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"

"github.com/Lagrange-Labs/lagrange-node/core"
corecrypto "github.com/Lagrange-Labs/lagrange-node/core/crypto"
"github.com/Lagrange-Labs/lagrange-node/core/logger"
sequencertypes "github.com/Lagrange-Labs/lagrange-node/sequencer/types"
sequencerv2types "github.com/Lagrange-Labs/lagrange-node/sequencer/types/v2"
"github.com/Lagrange-Labs/lsc-node/core"
corecrypto "github.com/Lagrange-Labs/lsc-node/core/crypto"
"github.com/Lagrange-Labs/lsc-node/core/logger"
sequencertypes "github.com/Lagrange-Labs/lsc-node/sequencer/types"
sequencerv2types "github.com/Lagrange-Labs/lsc-node/sequencer/types/v2"
)

// TODO: refactor the evidence to use the new sequencer types
Expand Down
2 changes: 1 addition & 1 deletion consensus/types/evidence_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package types
import (
"testing"

sequencertypes "github.com/Lagrange-Labs/lagrange-node/sequencer/types"
sequencertypes "github.com/Lagrange-Labs/lsc-node/sequencer/types"
"github.com/ethereum/go-ethereum/common"
"github.com/stretchr/testify/require"
)
Expand Down
10 changes: 5 additions & 5 deletions consensus/types/round_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"sync"

"github.com/Lagrange-Labs/lagrange-node/core"
"github.com/Lagrange-Labs/lagrange-node/core/crypto"
"github.com/Lagrange-Labs/lagrange-node/core/logger"
"github.com/Lagrange-Labs/lagrange-node/core/telemetry"
sequencerv2types "github.com/Lagrange-Labs/lagrange-node/sequencer/types/v2"
"github.com/Lagrange-Labs/lsc-node/core"
"github.com/Lagrange-Labs/lsc-node/core/crypto"
"github.com/Lagrange-Labs/lsc-node/core/logger"
"github.com/Lagrange-Labs/lsc-node/core/telemetry"
sequencerv2types "github.com/Lagrange-Labs/lsc-node/sequencer/types/v2"
)

// RoundState defines the internal consensus state.
Expand Down
8 changes: 4 additions & 4 deletions consensus/types/round_state_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (

"github.com/stretchr/testify/require"

"github.com/Lagrange-Labs/lagrange-node/core"
"github.com/Lagrange-Labs/lagrange-node/core/crypto"
sequencerv2types "github.com/Lagrange-Labs/lagrange-node/sequencer/types/v2"
servertypes "github.com/Lagrange-Labs/lagrange-node/server/types"
"github.com/Lagrange-Labs/lsc-node/core"
"github.com/Lagrange-Labs/lsc-node/core/crypto"
sequencerv2types "github.com/Lagrange-Labs/lsc-node/sequencer/types/v2"
servertypes "github.com/Lagrange-Labs/lsc-node/server/types"
)

func createTestRoundState(blsCurve crypto.BLSCurve) (*RoundState, [][]byte, []servertypes.ClientNode) {
Expand Down
2 changes: 1 addition & 1 deletion consensus/types/validator.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package types

import (
servertypes "github.com/Lagrange-Labs/lagrange-node/server/types"
servertypes "github.com/Lagrange-Labs/lsc-node/server/types"
)

// Validator defines a validator state.
Expand Down
2 changes: 1 addition & 1 deletion core/crypto/keystore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"os"
"testing"

"github.com/Lagrange-Labs/lagrange-node/core"
"github.com/Lagrange-Labs/lsc-node/core"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion core/crypto/merkle_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"

"github.com/Lagrange-Labs/lagrange-node/core"
"github.com/Lagrange-Labs/lsc-node/core"
)

func TestNextPowerOfTwo(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion core/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/Lagrange-Labs/lagrange-node/core
module github.com/Lagrange-Labs/lsc-node/core

go 1.21

Expand Down
2 changes: 1 addition & 1 deletion core/telemetry/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/hashicorp/go-metrics"
metricsprom "github.com/hashicorp/go-metrics/prometheus"

"github.com/Lagrange-Labs/lagrange-node/core"
"github.com/Lagrange-Labs/lsc-node/core"
)

// globalLabels defines the set of global labels that will be applied to all
Expand Down
10 changes: 7 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/Lagrange-Labs/lagrange-node
module github.com/Lagrange-Labs/lsc-node

go 1.21

require (
github.com/Lagrange-Labs/lagrange-node/core v0.1.1
github.com/Lagrange-Labs/lagrange-node/signer v0.1.1
github.com/Lagrange-Labs/lsc-node/core v0.1.1
github.com/Lagrange-Labs/lsc-node/signer v0.1.1
github.com/andybalholm/brotli v1.1.1
github.com/ethereum-optimism/optimism v1.9.1
github.com/ethereum/go-ethereum v1.14.8
Expand Down Expand Up @@ -145,3 +145,7 @@ require (
)

replace github.com/ethereum/go-ethereum v1.14.8 => github.com/ethereum-optimism/op-geth v1.101408.0-rc.4.0.20240827042333-110c433a2469

replace github.com/Lagrange-Labs/lsc-node/core v0.1.1 => ./core

replace github.com/Lagrange-Labs/lsc-node/signer v0.1.1 => ./signer
4 changes: 0 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e h1:ZIWapoIRN1VqT8GR8jAwb1Ie9GyehWjVcGh32Y2MznE=
github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
github.com/Lagrange-Labs/lagrange-node/core v0.1.1 h1:H9AE4zXBgr/PU04R5V/tG9AtyefZdd8cLnb/fwYz1ZU=
github.com/Lagrange-Labs/lagrange-node/core v0.1.1/go.mod h1:UPxFEPhGMt5i7oJbgrr81rlcWu/LBiVg4fxuhVX2dwc=
github.com/Lagrange-Labs/lagrange-node/signer v0.1.1 h1:77S1CUu3205M326hSof1bR+7jUspqgPrZoecRmhBUN8=
github.com/Lagrange-Labs/lagrange-node/signer v0.1.1/go.mod h1:p5t6I+b6/o5sy+a3+rCkQwwIgWXl7gwI9aUe28l4b/8=
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI=
Expand Down
Loading

0 comments on commit bceca07

Please sign in to comment.