Skip to content

fix: module name dive #365

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.

Sign up for GitHub

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

Merged
shreyasbhat0 merged 1 commit into from
Feb 21, 2024
Merged

fix: module name dive #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 cli/cmd/bridge/bridge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"os"
"slices"

"github.com/hugobyte/dive-core/cli/cmd/bridge/btp"
"github.com/hugobyte/dive-core/cli/cmd/bridge/ibc"
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/cmd/bridge/btp"
"github.com/hugobyte/dive/cli/cmd/bridge/ibc"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/bridge/btp/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package btp
import (
"fmt"

"github.com/hugobyte/dive-core/cli/cmd/bridge/utils"
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/cmd/bridge/utils"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down
12 changes: 6 additions & 6 deletions cli/cmd/bridge/btp/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import (
"fmt"
"strconv"

chainutil "github.com/hugobyte/dive-core/cli/cmd/chains/utils"
chainutil "github.com/hugobyte/dive/cli/cmd/chains/utils"

"github.com/hugobyte/dive-core/cli/cmd/bridge/utils"
"github.com/hugobyte/dive-core/cli/cmd/chains/eth"
"github.com/hugobyte/dive-core/cli/cmd/chains/hardhat"
"github.com/hugobyte/dive-core/cli/cmd/chains/icon"
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/cmd/bridge/utils"
"github.com/hugobyte/dive/cli/cmd/chains/eth"
"github.com/hugobyte/dive/cli/cmd/chains/hardhat"
"github.com/hugobyte/dive/cli/cmd/chains/icon"
"github.com/hugobyte/dive/cli/common"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
)

Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/bridge/ibc/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ibc
import (
"fmt"

"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -56,6 +56,6 @@ func ibcRelay(cmd *cobra.Command, args []string) {
if err != nil {
cliContext.Fatal(err)
}

cliContext.StopSpinnerIfNotVerbose(fmt.Sprintf("IBC Setup Completed between %s and %s. Please find the service details in the output folder present in current working directory - (output/%s/%s)\n", chainA, chainB, common.EnclaveName, serviceFileName), common.DiveLogs)
}
6 changes: 3 additions & 3 deletions cli/cmd/bridge/ibc/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package ibc
import (
"fmt"

chainutil "github.com/hugobyte/dive-core/cli/cmd/chains/utils"
chainutil "github.com/hugobyte/dive/cli/cmd/chains/utils"

"github.com/hugobyte/dive-core/cli/cmd/bridge/utils"
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/cmd/bridge/utils"
"github.com/hugobyte/dive/cli/common"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
)

Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/bridge/utils/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"
"strings"

"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/common"
)

const (
Expand Down Expand Up @@ -58,7 +58,7 @@ func (chains *Chains) GetIbcRelayParams(src_service_config string, dst_service_c
func (chains *Chains) GetServicesResponse(cli *common.Cli) (string, string, error) {

var serviceConfig = common.Services{}

shortUuid, err := cli.Context().GetShortUuid(common.EnclaveName)
if err != nil {
return "", "", fmt.Errorf("failed to get short uuid of enclave")
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/chains/archway/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package archway
import (
"fmt"

"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cli/cmd/chains/archway/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package archway

import (
"github.com/hugobyte/dive-core/cli/cmd/chains/utils"
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/cmd/chains/utils"
"github.com/hugobyte/dive/cli/common"
)

func RunArchway(cli *common.Cli) (*common.DiveServiceResponse, error) {
Expand All @@ -21,7 +21,7 @@ func RunArchway(cli *common.Cli) (*common.DiveServiceResponse, error) {
if err != nil {
return nil, err
}

encodedServiceConfigDataString, err := serviceConfig.EncodeToString()

if err != nil {
Expand Down
16 changes: 8 additions & 8 deletions cli/cmd/chains/chains.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import (
"os"
"slices"

"github.com/hugobyte/dive-core/cli/cmd/chains/archway"
"github.com/hugobyte/dive-core/cli/cmd/chains/eth"
"github.com/hugobyte/dive-core/cli/cmd/chains/hardhat"
"github.com/hugobyte/dive-core/cli/cmd/chains/icon"
"github.com/hugobyte/dive-core/cli/cmd/chains/kusama"
"github.com/hugobyte/dive-core/cli/cmd/chains/neutron"
"github.com/hugobyte/dive-core/cli/cmd/chains/polkadot"
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/cmd/chains/archway"
"github.com/hugobyte/dive/cli/cmd/chains/eth"
"github.com/hugobyte/dive/cli/cmd/chains/hardhat"
"github.com/hugobyte/dive/cli/cmd/chains/icon"
"github.com/hugobyte/dive/cli/cmd/chains/kusama"
"github.com/hugobyte/dive/cli/cmd/chains/neutron"
"github.com/hugobyte/dive/cli/cmd/chains/polkadot"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/chains/eth/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/chains/eth/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package eth

import (
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/common"
)

func RunEth(cli *common.Cli) (*common.DiveServiceResponse, error) {
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/chains/hardhat/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -48,7 +48,7 @@ func hardhat(cmd *cobra.Command, args []string) {
if err != nil {
cliContext.Fatal(err)
}

stopMessage := fmt.Sprintf("Hardhat Node Started. Please find the service details in the output folder present in current working directory - (output/%s/%s)\n", common.EnclaveName, serviceFileName)
cliContext.StopSpinnerIfNotVerbose(stopMessage, common.DiveLogs)
}
4 changes: 2 additions & 2 deletions cli/cmd/chains/hardhat/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package hardhat

import (
"github.com/hugobyte/dive-core/cli/cmd/chains/utils"
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/cmd/chains/utils"
"github.com/hugobyte/dive/cli/common"
)

func RunHardhat(cli *common.Cli) (*common.DiveServiceResponse, error) {
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/chains/icon/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package icon
import (
"fmt"

"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -97,7 +97,7 @@ func icon(cmd *cobra.Command, args []string) {
cliContext.Context().Exit(1)

}

stopMessage := fmt.Sprintf("Icon Node Started. Please find the service details in the output folder present in current working directory - (output/%s/%s)\n", common.EnclaveName, serviceFileName)
cliContext.StopSpinnerIfNotVerbose(stopMessage, common.DiveLogs)
}
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/chains/icon/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"path/filepath"

"github.com/hugobyte/dive-core/cli/cmd/chains/utils"
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/cmd/chains/utils"
"github.com/hugobyte/dive/cli/common"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
)

Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/chains/kusama/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"strings"

"github.com/hugobyte/dive-core/cli/cmd/chains/utils"
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/cmd/chains/utils"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/chains/kusama/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/starlark_run_config"

"github.com/hugobyte/dive-core/cli/cmd/chains/utils"
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/cmd/chains/utils"
"github.com/hugobyte/dive/cli/common"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/chains/neutron/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package neutron
import (
"fmt"

"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/chains/neutron/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package neutron

import (
"github.com/hugobyte/dive-core/cli/cmd/chains/utils"
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/cmd/chains/utils"
"github.com/hugobyte/dive/cli/common"
)

func RunNeutron(cli *common.Cli) (*common.DiveServiceResponse, error) {
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/chains/polkadot/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"strings"

"github.com/hugobyte/dive-core/cli/cmd/chains/utils"
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/cmd/chains/utils"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/chains/polkadot/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/starlark_run_config"

"github.com/hugobyte/dive-core/cli/cmd/chains/utils"
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/cmd/chains/utils"
"github.com/hugobyte/dive/cli/common"
)

const (
Expand Down
19 changes: 9 additions & 10 deletions cli/cmd/chains/utils/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path/filepath"
"slices"

"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/common"
)

type CosmosServiceConfig struct {
Expand Down Expand Up @@ -219,18 +219,17 @@ type RelayChainConfig struct {
}

type ParaNodeConfig struct {
Name string `json:"name"`
Nodes []NodeConfig `json:"nodes"`
SudoKey Key `json:"sudo_key,omitempty"`

Name string `json:"name"`
Nodes []NodeConfig `json:"nodes"`
SudoKey Key `json:"sudo_key,omitempty"`
}

type PolkadotServiceConfig struct {
ChainType string `json:"chain_type"`
RelayChain RelayChainConfig `json:"relaychain"`
Para []ParaNodeConfig `json:"parachains"`
Explorer bool `json:"explorer"`
WithoutRegistration bool `json:"without_registration"`
ChainType string `json:"chain_type"`
RelayChain RelayChainConfig `json:"relaychain"`
Para []ParaNodeConfig `json:"parachains"`
Explorer bool `json:"explorer"`
WithoutRegistration bool `json:"without_registration"`
}

func (pc *ParaNodeConfig) EncodeToString() (string, error) {
Expand Down
12 changes: 6 additions & 6 deletions cli/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package cmd
import (
"os"

"github.com/hugobyte/dive-core/cli/cmd/bridge"
"github.com/hugobyte/dive-core/cli/cmd/chains"
"github.com/hugobyte/dive-core/cli/cmd/social"
"github.com/hugobyte/dive-core/cli/cmd/utility"
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive-core/cli/styles"
"github.com/hugobyte/dive/cli/cmd/bridge"
"github.com/hugobyte/dive/cli/cmd/chains"
"github.com/hugobyte/dive/cli/cmd/social"
"github.com/hugobyte/dive/cli/cmd/utility"
"github.com/hugobyte/dive/cli/common"
"github.com/hugobyte/dive/cli/styles"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/social/discord.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package social

import (
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/social/twitter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package social
import (
"fmt"

"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/utility/clean.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package utility
import (
"fmt"

"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/utility/enclaves.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"text/tabwriter"

"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/utility/tutorial.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package utility

import (
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/utility/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/fatih/color"
"github.com/google/go-github/github"
"github.com/hugobyte/dive-core/cli/common"
"github.com/hugobyte/dive/cli/common"
"github.com/spf13/cobra"
)

Expand Down
Loading