diff --git a/.github/PULL_REQUEST/pull_request.go b/.github/PULL_REQUEST/pull_request.go index 98ce0d67c8..685ce67123 100644 --- a/.github/PULL_REQUEST/pull_request.go +++ b/.github/PULL_REQUEST/pull_request.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/lib/utils" ) func main() { diff --git a/.gitignore b/.gitignore index ced8461d0e..78da196b0d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,6 @@ !devnet/alice.node.key *.wasm -test_data tmp tests/utils/config* diff --git a/Dockerfile b/Dockerfile index cc79eef274..0dc721d375 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,8 @@ RUN wget -O /usr/local/bin/subkey https://chainbridge.ams3.digitaloceanspaces.co chmod +x /usr/local/bin/subkey # Polkadot JS dependencies -WORKDIR /go/src/github.com/ChainSafe/gossamer/tests/polkadotjs_test -COPY tests/polkadotjs_test/package.json tests/polkadotjs_test/package-lock.json ./ +WORKDIR /go/src/github.com/ChainSafe/gossamer/internal/tests/polkadotjs_test +COPY internal/tests/polkadotjs_test/package.json internal/tests/polkadotjs_test/package-lock.json ./ RUN npm install WORKDIR /go/src/github.com/ChainSafe/gossamer diff --git a/Makefile b/Makefile index d12d358db9..7b648c68c8 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ format: proto: go install google.golang.org/protobuf/cmd/protoc-gen-go - protoc -I=./dot/network/proto --go_out=./dot/network/proto dot/network/proto/api.v1.proto + protoc -I=./internal/dot/network/proto --go_out=./internal/dot/network/proto dot/network/proto/api.v1.proto ## test: Runs `go test` on project test files. test: @@ -47,28 +47,28 @@ it-stable: ## it-stress: Runs Integration Tests stress mode it-stress: build @echo " > \033[32mRunning stress tests...\033[0m " - HOSTNAME=0.0.0.0 MODE=stress go test ./tests/stress/... -timeout=15m -v -short -run TestSync_ + HOSTNAME=0.0.0.0 MODE=stress go test ./internal/tests/stress/... -timeout=15m -v -short -run TestSync_ it-grandpa: build @echo " > \033[32mRunning GRANDPA stress tests...\033[0m " - HOSTNAME=0.0.0.0 MODE=stress go test ./tests/stress/... -timeout=12m -v -short -run TestStress_Grandpa_ + HOSTNAME=0.0.0.0 MODE=stress go test ./internal/tests/stress/... -timeout=12m -v -short -run TestStress_Grandpa_ it-rpc: build @echo " > \033[32mRunning Integration Tests RPC Specs mode...\033[0m " - HOSTNAME=0.0.0.0 MODE=rpc go test ./tests/rpc/... -timeout=10m -v + HOSTNAME=0.0.0.0 MODE=rpc go test ./internal/tests/rpc/... -timeout=10m -v it-sync: build @echo " > \033[32mRunning Integration Tests sync mode...\033[0m " - HOSTNAME=0.0.0.0 MODE=sync go test ./tests/sync/... -timeout=5m -v + HOSTNAME=0.0.0.0 MODE=sync go test ./internal/tests/sync/... -timeout=5m -v it-polkadotjs: build @echo " > \033[32mRunning Integration Tests polkadot.js/api mode...\033[0m " - HOSTNAME=0.0.0.0 MODE=polkadot go test ./tests/polkadotjs_test/... -timeout=5m -v + HOSTNAME=0.0.0.0 MODE=polkadot go test ./internal/tests/polkadotjs_test/... -timeout=5m -v ## test: Runs `go test -race` on project test files. test-state-race: @echo " > \033[32mRunning race tests...\033[0m " - go test ./dot/state/... -short -race -timeout=5m + go test ./internal/dot/state/... -short -race -timeout=5m ## deps: Install missing dependencies. Runs `go mod download` internally. deps: diff --git a/cmd/gossamer/README.md b/cmd/gossamer/README.md index f71ac24f2f..97ed4c1291 100644 --- a/cmd/gossamer/README.md +++ b/cmd/gossamer/README.md @@ -20,7 +20,7 @@ This is the default Gossamer execution method, which invokes the `gossamerAction blockchain client are [described below in the Client Components section](#client-components). - `--basepath` - the path to the directory where Gossamer will store its data -- `--chain` - specifies the [chain configuration](../../chain) that the +- `--chain` - specifies the [chain configuration](../../internal/chain) that the [Gossamer host node](https://chainsafe.github.io/gossamer/getting-started/overview/host-architecture/) should load - `--key` - specifies a test keyring account to use (e.g. `--key=alice`) - `--log` - supports levels `crit` (silent), `error`, `warn`, `info`, `debug`, and `trce` (detailed), default is `info` @@ -39,7 +39,7 @@ This subcommand accepts a genesis configuration file and uses it to initialise t The `account` subcommand provides the user with capabilities related to generating and using `ed25519`, `secp256k1`, and `sr25519` [account keys](https://wiki.polkadot.network/docs/learn-keys), and managing the keys present in the [Gossamer keystore](#keystore). The `accountAction` function is defined in [account.go](account.go); it is an interface -to the capabilities defined in the [`lib/crypto`](../../lib/crypto) and [`lib/keystore`](../../lib/keystore) packages. +to the capabilities defined in the [`lib/crypto`](../../internal/lib/crypto) and [`lib/keystore`](../../internal/lib/keystore) packages. This subcommand provides capabilities that are similar to [Parity's Subkey utility](https://docs.substrate.io/v3/tools/subkey). @@ -68,7 +68,7 @@ in [`main.go`](main.go). ### Import State Subcommand -The `import-state` subcommand allows a user to seed [Gossamer storage](../../dot/state) with key-value pairs in the form +The `import-state` subcommand allows a user to seed [Gossamer storage](../../internal/dot/state) with key-value pairs in the form of a JSON file. The input for this subcommand can be retrieved from [the `state_getPairs` RPC endpoint](https://github.com/w3f/PSPs/blob/master/PSPs/drafts/psp-6.md#1114-state_getpairs). The `importStateAction` function is defined in [`main.go`](main.go). @@ -86,7 +86,7 @@ The `importStateAction` function is defined in [`main.go`](main.go). The `export` subcommand transforms a genesis configuration and Gossamer state into a TOML configuration file. This subcommand invokes the `exportAction` function defined in [`export.go`](export.go). -- `--config` - path to a TOML configuration file (e.g. those defined in [the `chain` directory](../../chain)) +- `--config` - path to a TOML configuration file (e.g. those defined in [the `chain` directory](../../internal/chain)) - `--basepath` - path to the Gossamer data directory that defines the state to export ## Client Components @@ -96,8 +96,8 @@ In its default method of execution, Gossamer orchestrates a number of modular se a blockchain network. Alongside these services, Gossamer manages [a keystore](#keystore), [a runtime](#runtime), and [monitoring utilities](#monitoring), all of which are described in greater detail below. The entry point to the Gossamer blockchain client capabilities is the `gossamerAction` function that is defined in [main.go](main.go), which in turn -invokes the `NewNode` function in [dot/node.go](../../dot/node.go). `NewNode` calls into functions that are defined in -[dot/services.go](../../dot/services.go) and starts the services that power a Gossamer node. +invokes the `NewNode` function in [dot/node.go](../../internal/dot/node.go). `NewNode` calls into functions that are defined in +[dot/services.go](../../internal/dot/services.go) and starts the services that power a Gossamer node. ### Services & Capabilities @@ -108,11 +108,11 @@ What follows is a list that describes the services and capabilities that inform This service is a wrapper around an instance of [`chaindb`](https://github.com/ChainSafe/chaindb), a key-value database that is built on top of [BadgerDB](https://github.com/dgraph-io/badger) from [Dgraph](https://dgraph.io/). The state service provides storage capabilities for the other Gossamer services - each service is assigned a prefix that is added -to its storage keys. The state service is defined in [dot/state/service.go](../../dot/state/service.go). +to its storage keys. The state service is defined in [dot/state/service.go](../../internal/dot/state/service.go). #### Network -The network service, which is defined in [dot/network/service.go](../../dot/network/service.go), is built on top of +The network service, which is defined in [dot/network/service.go](../../internal/dot/network/service.go), is built on top of [the Go implementation](https://github.com/libp2p/go-libp2p) of [the `libp2p` protocol](https://libp2p.io/). This service manages a `libp2p` "host", a peer-to-peer networking term for a network participant that is providing both client _and_ server capabilities to a peer-to-peer network. Gossamer's network service manages the discovery of other @@ -120,7 +120,7 @@ hosts as well as the connections with these hosts that allow Gossamer to communi #### Digest Handler -The digest handler ([dot/digest/digest.go](../../dot/digest/digest.go)) manages the verification of the +The digest handler ([dot/digest/digest.go](../../internal/dot/digest/digest.go)) manages the verification of the [digests](https://docs.substrate.io/v3/getting-started/glossary/#digest) that are present in block headers. #### Consensus @@ -128,40 +128,40 @@ The digest handler ([dot/digest/digest.go](../../dot/digest/digest.go)) manages The BABE and GRANDPA services work together to provide Gossamer with its [hybrid consensus](https://wiki.polkadot.network/docs/learn-consensus#hybrid-consensus) capabilities. The term "hybrid consensus" refers to the fact that block _production_ is decoupled from block _finalisation_. Block production is -handled by the BABE service, which is defined in [lib/babe/babe.go](../../lib/babe/babe.go); block finalisation is -handled by the GRANDPA service, which is defined in [lib/grandpa/grandpa.go](../../lib/grandpa/grandpa.go). +handled by the BABE service, which is defined in [lib/babe/babe.go](../../internal/lib/babe/babe.go); block finalisation is +handled by the GRANDPA service, which is defined in [lib/grandpa/grandpa.go](../../internal/lib/grandpa/grandpa.go). #### Sync This service is concerned with keeping Gossamer in sync with a blockchain - it implements a "bootstrap" mode, to download and verify blocks that are part of an existing chain's history, and a "tip-syncing" mode that manages the multiple candidate forks that may exist at the head of a live chain. The sync service makes use of -[a block verification utility](../../lib/babe/verify.go) that implements BABE logic and is used by Gossamer to verify +[a block verification utility](../../internal/lib/babe/verify.go) that implements BABE logic and is used by Gossamer to verify blocks that were produced by other other nodes in the network. The sync service is defined in -[dot/sync/syncer.go](../../dot/sync/syncer.go). +[dot/sync/syncer.go](../../internal/dot/sync/syncer.go). #### RPC -This service, which is defined in [dot/rpc/service.go](../../dot/rpc/service.go), exposes a JSON-RPC interface that is +This service, which is defined in [dot/rpc/service.go](../../internal/dot/rpc/service.go), exposes a JSON-RPC interface that is used by client applications like [Polkadot JS Apps UI](https://polkadot.js.org/apps/). The RPC interface is used to interact with Gossamer to perform administrative tasks such as key management, as well as for interacting with the runtime by querying storage and submitting transactions, and inspecting the chain's history. #### System -The system service is defined in [dot/system/service.go](../../dot/system/service.go) and exposes metadata about the +The system service is defined in [dot/system/service.go](../../internal/dot/system/service.go) and exposes metadata about the Gossamer system, such as the names and versions of the protocols that it implements. #### Core -As its name implies, the core service ([dot/core/service.go](../../dot/core/service.go)) encapsulates a range of +As its name implies, the core service ([dot/core/service.go](../../internal/dot/core/service.go)) encapsulates a range of capabilities that are central to the functioning of a Gossamer node. In general, the core service is a type of dispatcher that coordinates interactions between services, e.g. writing blocks to the database, reloading [the runtime](#runtime) when its definition is updated, etc. ### Keystore -The Gossamer keystore ([lib/keystore](../../lib/keystore)) is used for managing the public/private cryptographic key +The Gossamer keystore ([lib/keystore](../../internal/lib/keystore)) is used for managing the public/private cryptographic key pairs that are used for participating in a blockchain network. Public keys are used to identify network participants; network participants use their private keys to sign messages in order to authorise privileged actions. In addition to informing the Gossamer blockchain client capabilities, the Gossamer keystore is accessible by way of the `account` @@ -177,16 +177,16 @@ subcommand. The Gossamer keystore manages a number of key types, some of which a In addition to the above-described services, Gossamer hosts a Wasm execution environment that is used to manage an upgradeable blockchain runtime. The runtime must be implemented in Wasm, and must expose an interface that is specified -in [lib/runtime/interface.go](../../lib/runtime/interface.go). The runtime defines the blockchain's state transition +in [lib/runtime/interface.go](../../internal/lib/runtime/interface.go). The runtime defines the blockchain's state transition function, and the various Gossamer services consume this capability in order to author blocks, as well as to verify blocks that were authored by network peers. The runtime is dependent on a [Wasm host interface](https://docs.wasmer.io/integrations/examples/host-functions), which Gossamer implements and is -defined in [lib/runtime/wasmer/exports.go](../../lib/runtime/wasmer/exports.go). +defined in [lib/runtime/wasmer/exports.go](../../internal/lib/runtime/wasmer/exports.go). ### Monitoring Gossamer publishes telemetry data and also includes an embedded Prometheus server that reports metrics. The metrics -capabilities are defined in the [dot/metrics](../../dot/metrics) package and build on +capabilities are defined in the [dot/metrics](../../internal/dot/metrics) package and build on [the metrics library that is included with Go Ethereum](https://github.com/ethereum/go-ethereum/blob/master/metrics/README.md). The default port for Prometheus metrics is 9090, and Gossamer allows the user to configure this parameter with the `--metrics-port` command-line parameter. The Gossamer telemetry server publishes telemetry data that is compatible with diff --git a/cmd/gossamer/account.go b/cmd/gossamer/account.go index e1280820e7..0a5a47d93d 100644 --- a/cmd/gossamer/account.go +++ b/cmd/gossamer/account.go @@ -7,9 +7,9 @@ import ( "fmt" "strings" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/urfave/cli" ) diff --git a/cmd/gossamer/account_test.go b/cmd/gossamer/account_test.go index b77b1ec432..625670483c 100644 --- a/cmd/gossamer/account_test.go +++ b/cmd/gossamer/account_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/stretchr/testify/require" ) diff --git a/cmd/gossamer/config.go b/cmd/gossamer/config.go index fe7db3a0f4..33b8c95644 100644 --- a/cmd/gossamer/config.go +++ b/cmd/gossamer/config.go @@ -10,29 +10,29 @@ import ( "strings" "time" - "github.com/ChainSafe/gossamer/chain/dev" - "github.com/ChainSafe/gossamer/chain/gssmr" - "github.com/ChainSafe/gossamer/dot" - ctoml "github.com/ChainSafe/gossamer/dot/config/toml" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/state/pruner" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/chain/dev" + "github.com/ChainSafe/gossamer/internal/chain/gssmr" + "github.com/ChainSafe/gossamer/internal/dot" + ctoml "github.com/ChainSafe/gossamer/internal/dot/config/toml" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/state/pruner" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/runtime/life" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/runtime/life" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/utils" "github.com/urfave/cli" ) var ( // DefaultCfg is the default configuration for the node. DefaultCfg = dot.GssmrConfig - defaultGssmrConfigPath = "./chain/gssmr/config.toml" - defaultKusamaConfigPath = "./chain/kusama/config.toml" - defaultPolkadotConfigPath = "./chain/polkadot/config.toml" - defaultDevConfigPath = "./chain/dev/config.toml" + defaultGssmrConfigPath = "./internal/chain/gssmr/config.toml" + defaultKusamaConfigPath = "./internal/chain/kusama/config.toml" + defaultPolkadotConfigPath = "./internal/chain/polkadot/config.toml" + defaultDevConfigPath = "./internal/chain/dev/config.toml" gossamerName = "gssmr" kusamaName = "kusama" diff --git a/cmd/gossamer/config_test.go b/cmd/gossamer/config_test.go index 1d2e80a292..7b444eebe2 100644 --- a/cmd/gossamer/config_test.go +++ b/cmd/gossamer/config_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/chain/dev" - "github.com/ChainSafe/gossamer/chain/gssmr" - "github.com/ChainSafe/gossamer/dot" - ctoml "github.com/ChainSafe/gossamer/dot/config/toml" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/chain/dev" + "github.com/ChainSafe/gossamer/internal/chain/gssmr" + "github.com/ChainSafe/gossamer/internal/dot" + ctoml "github.com/ChainSafe/gossamer/internal/dot/config/toml" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cmd/gossamer/export.go b/cmd/gossamer/export.go index c99c7b89dd..fb3883b151 100644 --- a/cmd/gossamer/export.go +++ b/cmd/gossamer/export.go @@ -7,9 +7,9 @@ import ( "fmt" "time" - "github.com/ChainSafe/gossamer/dot" - ctoml "github.com/ChainSafe/gossamer/dot/config/toml" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot" + ctoml "github.com/ChainSafe/gossamer/internal/dot/config/toml" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/urfave/cli" ) diff --git a/cmd/gossamer/export_test.go b/cmd/gossamer/export_test.go index a1e8f0955b..e3d282a57e 100644 --- a/cmd/gossamer/export_test.go +++ b/cmd/gossamer/export_test.go @@ -7,11 +7,11 @@ import ( "io" "testing" - "github.com/ChainSafe/gossamer/chain/gssmr" - "github.com/ChainSafe/gossamer/dot" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/chain/gssmr" + "github.com/ChainSafe/gossamer/internal/dot" + "github.com/ChainSafe/gossamer/internal/lib/utils" - ctoml "github.com/ChainSafe/gossamer/dot/config/toml" + ctoml "github.com/ChainSafe/gossamer/internal/dot/config/toml" "github.com/ChainSafe/gossamer/internal/log" "github.com/stretchr/testify/require" "github.com/urfave/cli" diff --git a/cmd/gossamer/flags.go b/cmd/gossamer/flags.go index 91b504091f..b47314047c 100644 --- a/cmd/gossamer/flags.go +++ b/cmd/gossamer/flags.go @@ -4,7 +4,7 @@ package main import ( - "github.com/ChainSafe/gossamer/chain/dev" + "github.com/ChainSafe/gossamer/internal/chain/dev" "github.com/urfave/cli" ) diff --git a/cmd/gossamer/flags_test.go b/cmd/gossamer/flags_test.go index ba81750f2e..4e87d9c210 100644 --- a/cmd/gossamer/flags_test.go +++ b/cmd/gossamer/flags_test.go @@ -7,9 +7,9 @@ import ( "io" "testing" - "github.com/ChainSafe/gossamer/chain/dev" - "github.com/ChainSafe/gossamer/dot" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/chain/dev" + "github.com/ChainSafe/gossamer/internal/dot" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/stretchr/testify/require" "github.com/urfave/cli" diff --git a/cmd/gossamer/import_runtime.go b/cmd/gossamer/import_runtime.go index 5e4619a7d3..3d00ec5911 100644 --- a/cmd/gossamer/import_runtime.go +++ b/cmd/gossamer/import_runtime.go @@ -9,10 +9,10 @@ import ( "os" "path/filepath" - "github.com/ChainSafe/gossamer/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/genesis" ) -var defaultGenesisSpecPath = "./chain/gssmr/genesis-spec.json" +var defaultGenesisSpecPath = "./internal/chain/gssmr/genesis-spec.json" func createGenesisWithRuntime(fp string) (string, error) { runtime, err := os.ReadFile(filepath.Clean(fp)) diff --git a/cmd/gossamer/import_runtime_test.go b/cmd/gossamer/import_runtime_test.go index 083b5c5abe..22e9a67c16 100644 --- a/cmd/gossamer/import_runtime_test.go +++ b/cmd/gossamer/import_runtime_test.go @@ -8,14 +8,14 @@ import ( "os" "testing" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/genesis" "github.com/stretchr/testify/require" ) func TestCreateGenesisWithRuntime(t *testing.T) { - defaultGenesisSpecPath = "../../chain/gssmr/genesis-spec.json" + defaultGenesisSpecPath = "../../internal/chain/gssmr/genesis-spec.json" testCode := []byte("somecode") testHex := common.BytesToHex(testCode) diff --git a/cmd/gossamer/main.go b/cmd/gossamer/main.go index a42cfcbf17..c3fbc29f91 100644 --- a/cmd/gossamer/main.go +++ b/cmd/gossamer/main.go @@ -8,11 +8,11 @@ import ( "fmt" "os" - "github.com/ChainSafe/gossamer/dot" - "github.com/ChainSafe/gossamer/dot/state" + "github.com/ChainSafe/gossamer/internal/dot" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/utils" "github.com/urfave/cli" ) diff --git a/cmd/gossamer/main_test.go b/cmd/gossamer/main_test.go index 56144f76cf..4eaced9648 100644 --- a/cmd/gossamer/main_test.go +++ b/cmd/gossamer/main_test.go @@ -16,8 +16,8 @@ import ( "text/template" "time" - "github.com/ChainSafe/gossamer/dot" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/docker/docker/pkg/reexec" "github.com/stretchr/testify/require" ) @@ -195,10 +195,10 @@ func TestMain(m *testing.M) { if reexec.Init() { return } - defaultGssmrConfigPath = "../../chain/gssmr/config.toml" - defaultKusamaConfigPath = "../../chain/kusama/config.toml" - defaultPolkadotConfigPath = "../../chain/polkadot/config.toml" - defaultDevConfigPath = "../../chain/dev/config.toml" + defaultGssmrConfigPath = "../../internal/chain/gssmr/config.toml" + defaultKusamaConfigPath = "../../internal/chain/kusama/config.toml" + defaultPolkadotConfigPath = "../../internal/chain/polkadot/config.toml" + defaultDevConfigPath = "../../internal/chain/dev/config.toml" os.Exit(m.Run()) } @@ -259,7 +259,7 @@ func TestBuildSpecCommandWithOutput(t *testing.T) { buildSpecCommand := runTestGossamer(t, "build-spec", "--raw", - "--genesis-spec", "../../chain/gssmr/genesis-spec.json", + "--genesis-spec", "../../internal/chain/gssmr/genesis-spec.json", "--output", tmpOutputfile) time.Sleep(5 * time.Second) diff --git a/cmd/gossamer/prune_test.go b/cmd/gossamer/prune_test.go index 91f410a0f1..c93bd2b6a1 100644 --- a/cmd/gossamer/prune_test.go +++ b/cmd/gossamer/prune_test.go @@ -28,8 +28,8 @@ func TestPruneState(t *testing.T) { } var ( - inputDBPath = "../../tests/data/db" - configFile = "../../tests/data/db/config.toml" + inputDBPath = "../../internal/tests/data/db" + configFile = "../../internal/tests/data/db/config.toml" prunedDBPath = fmt.Sprintf("%s/%s", t.TempDir(), "pruned") storagePrefix = "storage" ) diff --git a/cmd/gossamer/toml_config.go b/cmd/gossamer/toml_config.go index f57b72104a..bf283cb8a0 100644 --- a/cmd/gossamer/toml_config.go +++ b/cmd/gossamer/toml_config.go @@ -12,7 +12,7 @@ import ( "github.com/naoina/toml" - ctoml "github.com/ChainSafe/gossamer/dot/config/toml" + ctoml "github.com/ChainSafe/gossamer/internal/dot/config/toml" ) // loadConfig loads the values from the toml configuration file into the provided configuration diff --git a/cmd/gossamer/toml_config_test.go b/cmd/gossamer/toml_config_test.go index feae45a401..332caa70cf 100644 --- a/cmd/gossamer/toml_config_test.go +++ b/cmd/gossamer/toml_config_test.go @@ -6,17 +6,17 @@ package main import ( "testing" - "github.com/ChainSafe/gossamer/dot" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/stretchr/testify/require" ) -const GssmrConfigPath = "../../chain/gssmr/config.toml" -const GssmrGenesisPath = "../../chain/gssmr/genesis.json" +const GssmrConfigPath = "../../internal/chain/gssmr/config.toml" +const GssmrGenesisPath = "../../internal/chain/gssmr/genesis.json" -const KusamaConfigPath = "../../chain/kusama/config.toml" -const KusamaGenesisPath = "../../chain/kusama/genesis.json" +const KusamaConfigPath = "../../internal/chain/kusama/config.toml" +const KusamaGenesisPath = "../../internal/chain/kusama/genesis.json" // TestLoadConfig tests loading a toml configuration file func TestLoadConfig(t *testing.T) { diff --git a/cmd/gossamer/utils.go b/cmd/gossamer/utils.go index d464e9d43c..56324b8e53 100644 --- a/cmd/gossamer/utils.go +++ b/cmd/gossamer/utils.go @@ -11,9 +11,9 @@ import ( "syscall" "testing" - "github.com/ChainSafe/gossamer/dot" + "github.com/ChainSafe/gossamer/internal/dot" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/utils" "github.com/stretchr/testify/require" "github.com/urfave/cli" terminal "golang.org/x/term" diff --git a/docs/docs/usage/configuration.md b/docs/docs/usage/configuration.md index 99c0230d18..e735e12f2c 100644 --- a/docs/docs/usage/configuration.md +++ b/docs/docs/usage/configuration.md @@ -31,7 +31,7 @@ grandpa = " | trace | debug | info | warn | error | crit" sync = " | trace | debug | info | warn | error | crit" [init] -genesis-raw = "./chain/gssmr/genesis-raw.json" +genesis-raw = "./internal/chain/gssmr/genesis-raw.json" [account] key = "" diff --git a/chain/dev/config.toml b/internal/chain/dev/config.toml similarity index 92% rename from chain/dev/config.toml rename to internal/chain/dev/config.toml index 9e30f02c91..1aee75847b 100644 --- a/chain/dev/config.toml +++ b/internal/chain/dev/config.toml @@ -14,7 +14,7 @@ grandpa = "" sync = "" [init] -genesis = "./chain/dev/genesis-spec.json" +genesis = "./internal/chain/dev/genesis-spec.json" [account] key = "alice" diff --git a/chain/dev/defaults.go b/internal/chain/dev/defaults.go similarity index 92% rename from chain/dev/defaults.go rename to internal/chain/dev/defaults.go index 8c242f616f..a3663af7b2 100644 --- a/chain/dev/defaults.go +++ b/internal/chain/dev/defaults.go @@ -4,9 +4,9 @@ package dev import ( + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" ) var ( @@ -17,7 +17,7 @@ var ( // DefaultID is the chain ID DefaultID = string("dev") // DefaultConfig is the toml configuration path - DefaultConfig = string("./chain/dev/config.toml") + DefaultConfig = string("./internal/chain/dev/config.toml") // DefaultBasePath is the node base directory path DefaultBasePath = string("~/.gossamer/dev") @@ -38,7 +38,7 @@ var ( // InitConfig // DefaultGenesis is the default genesis configuration path - DefaultGenesis = string("./chain/dev/genesis-spec.json") + DefaultGenesis = string("./internal/chain/dev/genesis-spec.json") // AccountConfig diff --git a/chain/dev/genesis-spec.json b/internal/chain/dev/genesis-spec.json similarity index 100% rename from chain/dev/genesis-spec.json rename to internal/chain/dev/genesis-spec.json diff --git a/chain/dev/genesis.json b/internal/chain/dev/genesis.json similarity index 100% rename from chain/dev/genesis.json rename to internal/chain/dev/genesis.json diff --git a/chain/gssmr/config.toml b/internal/chain/gssmr/config.toml similarity index 92% rename from chain/gssmr/config.toml rename to internal/chain/gssmr/config.toml index 80301de7d2..e3837e5b33 100644 --- a/chain/gssmr/config.toml +++ b/internal/chain/gssmr/config.toml @@ -14,7 +14,7 @@ grandpa = "" sync = "" [init] -genesis = "./chain/gssmr/genesis-spec.json" +genesis = "./internal/chain/gssmr/genesis-spec.json" [account] key = "" diff --git a/chain/gssmr/defaults.go b/internal/chain/gssmr/defaults.go similarity index 93% rename from chain/gssmr/defaults.go rename to internal/chain/gssmr/defaults.go index 806a86f5b9..cc2a6e089a 100644 --- a/chain/gssmr/defaults.go +++ b/internal/chain/gssmr/defaults.go @@ -6,9 +6,9 @@ package gssmr import ( "time" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" ) var ( @@ -19,7 +19,7 @@ var ( // DefaultID Default chain ID DefaultID = string("gssmr") // DefaultConfig Default toml configuration path - DefaultConfig = string("./chain/gssmr/config.toml") + DefaultConfig = string("./internal/chain/gssmr/config.toml") // DefaultBasePath Default node base directory path DefaultBasePath = string("~/.gossamer/gssmr") @@ -40,7 +40,7 @@ var ( // InitConfig // DefaultGenesis is the default genesis configuration path - DefaultGenesis = string("./chain/gssmr/genesis-spec.json") + DefaultGenesis = string("./internal/chain/gssmr/genesis-spec.json") // AccountConfig diff --git a/chain/gssmr/genesis-spec.json b/internal/chain/gssmr/genesis-spec.json similarity index 100% rename from chain/gssmr/genesis-spec.json rename to internal/chain/gssmr/genesis-spec.json diff --git a/chain/gssmr/genesis.json b/internal/chain/gssmr/genesis.json similarity index 100% rename from chain/gssmr/genesis.json rename to internal/chain/gssmr/genesis.json diff --git a/chain/kusama/config.toml b/internal/chain/kusama/config.toml similarity index 93% rename from chain/kusama/config.toml rename to internal/chain/kusama/config.toml index 37aabc8165..6d39e5da0d 100644 --- a/chain/kusama/config.toml +++ b/internal/chain/kusama/config.toml @@ -14,7 +14,7 @@ grandpa = "" sync = "" [init] -genesis = "./chain/kusama/genesis.json" +genesis = "./internal/chain/kusama/genesis.json" [account] key = "" diff --git a/chain/kusama/defaults.go b/internal/chain/kusama/defaults.go similarity index 91% rename from chain/kusama/defaults.go rename to internal/chain/kusama/defaults.go index f312ef7e9e..b7bc807336 100644 --- a/chain/kusama/defaults.go +++ b/internal/chain/kusama/defaults.go @@ -4,9 +4,9 @@ package kusama import ( + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" ) var ( @@ -17,7 +17,7 @@ var ( // DefaultID Default chain ID DefaultID = string("ksmcc3") // DefaultConfig Default toml configuration path - DefaultConfig = string("./chain/kusama/config.toml") + DefaultConfig = string("./internal/chain/kusama/config.toml") // DefaultBasePath Default node base directory path DefaultBasePath = string("~/.gossamer/kusama") @@ -38,7 +38,7 @@ var ( // InitConfig // DefaultGenesis is the default genesis configuration path - DefaultGenesis = string("./chain/kusama/genesis.json") + DefaultGenesis = string("./internal/chain/kusama/genesis.json") // AccountConfig diff --git a/chain/kusama/genesis.json b/internal/chain/kusama/genesis.json similarity index 100% rename from chain/kusama/genesis.json rename to internal/chain/kusama/genesis.json diff --git a/chain/polkadot/config.toml b/internal/chain/polkadot/config.toml similarity index 92% rename from chain/polkadot/config.toml rename to internal/chain/polkadot/config.toml index 86dc72ad6e..f0719fdbd6 100644 --- a/chain/polkadot/config.toml +++ b/internal/chain/polkadot/config.toml @@ -14,7 +14,7 @@ grandpa = "" sync = "" [init] -genesis = "./chain/polkadot/genesis.json" +genesis = "./internal/chain/polkadot/genesis.json" [account] key = "" diff --git a/chain/polkadot/defaults.go b/internal/chain/polkadot/defaults.go similarity index 92% rename from chain/polkadot/defaults.go rename to internal/chain/polkadot/defaults.go index 4ae826c5e1..9340b3dedc 100644 --- a/chain/polkadot/defaults.go +++ b/internal/chain/polkadot/defaults.go @@ -4,9 +4,9 @@ package polkadot import ( + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" ) var ( @@ -17,7 +17,7 @@ var ( // DefaultID Default chain ID DefaultID = string("polkadot") // DefaultConfig Default toml configuration path - DefaultConfig = string("./chain/polkadot/config.toml") + DefaultConfig = string("./internal/chain/polkadot/config.toml") // DefaultBasePath Default node base directory path DefaultBasePath = string("~/.gossamer/polkadot") @@ -35,7 +35,7 @@ var ( // InitConfig // DefaultGenesis is the default genesis configuration path - DefaultGenesis = string("./chain/polkadot/genesis.json") + DefaultGenesis = string("./internal/chain/polkadot/genesis.json") // AccountConfig diff --git a/chain/polkadot/genesis.json b/internal/chain/polkadot/genesis.json similarity index 100% rename from chain/polkadot/genesis.json rename to internal/chain/polkadot/genesis.json diff --git a/dot/build_spec.go b/internal/dot/build_spec.go similarity index 93% rename from dot/build_spec.go rename to internal/dot/build_spec.go index fe5c4cf737..cff946b260 100644 --- a/dot/build_spec.go +++ b/internal/dot/build_spec.go @@ -9,11 +9,11 @@ import ( "os" "path/filepath" - "github.com/ChainSafe/gossamer/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/utils" ) // BuildSpec object for working with building genesis JSON files diff --git a/dot/build_spec_test.go b/internal/dot/build_spec_test.go similarity index 98% rename from dot/build_spec_test.go rename to internal/dot/build_spec_test.go index b00683ccea..183b393434 100644 --- a/dot/build_spec_test.go +++ b/internal/dot/build_spec_test.go @@ -10,7 +10,7 @@ import ( "os" "testing" - "github.com/ChainSafe/gossamer/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/genesis" "github.com/stretchr/testify/require" ) diff --git a/dot/config.go b/internal/dot/config.go similarity index 96% rename from dot/config.go rename to internal/dot/config.go index a8ee61f947..a1c7547c51 100644 --- a/dot/config.go +++ b/internal/dot/config.go @@ -8,15 +8,15 @@ import ( "strings" "time" - "github.com/ChainSafe/gossamer/chain/dev" - "github.com/ChainSafe/gossamer/chain/gssmr" - "github.com/ChainSafe/gossamer/chain/kusama" - "github.com/ChainSafe/gossamer/chain/polkadot" - "github.com/ChainSafe/gossamer/dot/state/pruner" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/chain/dev" + "github.com/ChainSafe/gossamer/internal/chain/gssmr" + "github.com/ChainSafe/gossamer/internal/chain/kusama" + "github.com/ChainSafe/gossamer/internal/chain/polkadot" + "github.com/ChainSafe/gossamer/internal/dot/state/pruner" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/genesis" "github.com/ChainSafe/gossamer/internal/log" "github.com/ChainSafe/gossamer/internal/pprof" - "github.com/ChainSafe/gossamer/lib/genesis" ) // TODO: update config to have toml rules and perhaps un-export some fields, since we don't want to expose all diff --git a/dot/config/toml/config.go b/internal/dot/config/toml/config.go similarity index 100% rename from dot/config/toml/config.go rename to internal/dot/config/toml/config.go diff --git a/dot/config_test.go b/internal/dot/config_test.go similarity index 91% rename from dot/config_test.go rename to internal/dot/config_test.go index 68dea23389..532955b6d8 100644 --- a/dot/config_test.go +++ b/internal/dot/config_test.go @@ -6,7 +6,7 @@ package dot import ( "testing" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/stretchr/testify/require" ) diff --git a/dot/core/errors.go b/internal/dot/core/errors.go similarity index 100% rename from dot/core/errors.go rename to internal/dot/core/errors.go diff --git a/dot/core/interface.go b/internal/dot/core/interface.go similarity index 89% rename from dot/core/interface.go rename to internal/dot/core/interface.go index 35b66cc36b..6a7a8fea4e 100644 --- a/dot/core/interface.go +++ b/internal/dot/core/interface.go @@ -9,13 +9,13 @@ import ( "github.com/libp2p/go-libp2p-core/peer" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/peerset" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/runtime" - rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/transaction" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/peerset" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + rtstorage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/transaction" ) //go:generate mockery --name BlockState --structname BlockState --case underscore --keeptree diff --git a/dot/core/messages.go b/internal/dot/core/messages.go similarity index 90% rename from dot/core/messages.go rename to internal/dot/core/messages.go index 53e9834cea..958c7d874c 100644 --- a/dot/core/messages.go +++ b/internal/dot/core/messages.go @@ -8,11 +8,11 @@ import ( "github.com/libp2p/go-libp2p-core/peer" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/peerset" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/transaction" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/peerset" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/transaction" ) // HandleTransactionMessage validates each transaction in the message and diff --git a/dot/core/messages_test.go b/internal/dot/core/messages_test.go similarity index 89% rename from dot/core/messages_test.go rename to internal/dot/core/messages_test.go index b42cae8674..291474f43d 100644 --- a/dot/core/messages_test.go +++ b/internal/dot/core/messages_test.go @@ -12,15 +12,15 @@ import ( ctypes "github.com/centrifuge/go-substrate-rpc-client/v3/types" "github.com/stretchr/testify/require" - "github.com/ChainSafe/gossamer/dot/core/mocks" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/sync" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" + "github.com/ChainSafe/gossamer/internal/dot/core/mocks" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/sync" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/core/mocks/block_state.go b/internal/dot/core/mocks/block_state.go similarity index 97% rename from dot/core/mocks/block_state.go rename to internal/dot/core/mocks/block_state.go index 43f779983c..96588bbe1d 100644 --- a/dot/core/mocks/block_state.go +++ b/internal/dot/core/mocks/block_state.go @@ -5,15 +5,15 @@ package mocks import ( big "math/big" - common "github.com/ChainSafe/gossamer/lib/common" + common "github.com/ChainSafe/gossamer/internal/lib/common" mock "github.com/stretchr/testify/mock" - runtime "github.com/ChainSafe/gossamer/lib/runtime" + runtime "github.com/ChainSafe/gossamer/internal/lib/runtime" - storage "github.com/ChainSafe/gossamer/lib/runtime/storage" + storage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" - types "github.com/ChainSafe/gossamer/dot/types" + types "github.com/ChainSafe/gossamer/internal/dot/types" ) // BlockState is an autogenerated mock type for the BlockState type diff --git a/dot/core/mocks/digest_handler.go b/internal/dot/core/mocks/digest_handler.go similarity index 86% rename from dot/core/mocks/digest_handler.go rename to internal/dot/core/mocks/digest_handler.go index c6f23a4c3c..3ac2efa6a9 100644 --- a/dot/core/mocks/digest_handler.go +++ b/internal/dot/core/mocks/digest_handler.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/ChainSafe/gossamer/dot/types" + types "github.com/ChainSafe/gossamer/internal/dot/types" mock "github.com/stretchr/testify/mock" ) diff --git a/dot/core/mocks/network.go b/internal/dot/core/mocks/network.go similarity index 86% rename from dot/core/mocks/network.go rename to internal/dot/core/mocks/network.go index 37cd0c072f..232a80e634 100644 --- a/dot/core/mocks/network.go +++ b/internal/dot/core/mocks/network.go @@ -3,12 +3,11 @@ package mocks import ( - network "github.com/ChainSafe/gossamer/dot/network" - mock "github.com/stretchr/testify/mock" - + network "github.com/ChainSafe/gossamer/internal/dot/network" peer "github.com/libp2p/go-libp2p-core/peer" + mock "github.com/stretchr/testify/mock" - peerset "github.com/ChainSafe/gossamer/dot/peerset" + peerset "github.com/ChainSafe/gossamer/internal/dot/peerset" ) // Network is an autogenerated mock type for the Network type diff --git a/dot/core/mocks/storage_state.go b/internal/dot/core/mocks/storage_state.go similarity index 95% rename from dot/core/mocks/storage_state.go rename to internal/dot/core/mocks/storage_state.go index 320a6165d0..476fafb9cf 100644 --- a/dot/core/mocks/storage_state.go +++ b/internal/dot/core/mocks/storage_state.go @@ -3,13 +3,13 @@ package mocks import ( - common "github.com/ChainSafe/gossamer/lib/common" + common "github.com/ChainSafe/gossamer/internal/lib/common" mock "github.com/stretchr/testify/mock" - storage "github.com/ChainSafe/gossamer/lib/runtime/storage" + storage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" - types "github.com/ChainSafe/gossamer/dot/types" + types "github.com/ChainSafe/gossamer/internal/dot/types" ) // StorageState is an autogenerated mock type for the StorageState type diff --git a/dot/core/service.go b/internal/dot/core/service.go similarity index 96% rename from dot/core/service.go rename to internal/dot/core/service.go index 91b97aff49..76eaa57026 100644 --- a/dot/core/service.go +++ b/internal/dot/core/service.go @@ -9,18 +9,18 @@ import ( "math/big" "sync" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/blocktree" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + rtstorage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" + "github.com/ChainSafe/gossamer/internal/lib/services" + "github.com/ChainSafe/gossamer/internal/lib/transaction" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/blocktree" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" - rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/services" - "github.com/ChainSafe/gossamer/lib/transaction" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/core/service_test.go b/internal/dot/core/service_test.go similarity index 97% rename from dot/core/service_test.go rename to internal/dot/core/service_test.go index 46f38188cf..d1f699248d 100644 --- a/dot/core/service_test.go +++ b/internal/dot/core/service_test.go @@ -12,20 +12,20 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/core/mocks" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/sync" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/core/mocks" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/sync" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + runtimemocks "github.com/ChainSafe/gossamer/internal/lib/runtime/mocks" + rtstorage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" + "github.com/ChainSafe/gossamer/internal/lib/transaction" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" - runtimemocks "github.com/ChainSafe/gossamer/lib/runtime/mocks" - rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/transaction" - "github.com/ChainSafe/gossamer/lib/trie" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/dot/core/test_helpers.go b/internal/dot/core/test_helpers.go similarity index 84% rename from dot/core/test_helpers.go rename to internal/dot/core/test_helpers.go index db91b0172c..dfc0718070 100644 --- a/dot/core/test_helpers.go +++ b/internal/dot/core/test_helpers.go @@ -7,17 +7,17 @@ import ( "path/filepath" "testing" - coremocks "github.com/ChainSafe/gossamer/dot/core/mocks" - "github.com/ChainSafe/gossamer/dot/state" + coremocks "github.com/ChainSafe/gossamer/internal/dot/core/mocks" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + rtstorage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" - rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/utils" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/dot/digest/digest.go b/internal/dot/digest/digest.go similarity index 98% rename from dot/digest/digest.go rename to internal/dot/digest/digest.go index d8f4e674ae..86676c82a3 100644 --- a/dot/digest/digest.go +++ b/internal/dot/digest/digest.go @@ -9,9 +9,9 @@ import ( "math" "math/big" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/services" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/services" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/digest/digest_test.go b/internal/dot/digest/digest_test.go similarity index 96% rename from dot/digest/digest_test.go rename to internal/dot/digest/digest_test.go index 256ff7fdda..8c48f53608 100644 --- a/dot/digest/digest_test.go +++ b/internal/dot/digest/digest_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/keystore" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/keystore" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" diff --git a/dot/digest/interface.go b/internal/dot/digest/interface.go similarity index 90% rename from dot/digest/interface.go rename to internal/dot/digest/interface.go index 22c8201e3f..21b04d6dc4 100644 --- a/dot/digest/interface.go +++ b/internal/dot/digest/interface.go @@ -6,8 +6,8 @@ package digest import ( "math/big" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/grandpa" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/grandpa" ) // BlockState interface for block state methods diff --git a/dot/errors.go b/internal/dot/errors.go similarity index 100% rename from dot/errors.go rename to internal/dot/errors.go diff --git a/dot/import.go b/internal/dot/import.go similarity index 93% rename from dot/import.go rename to internal/dot/import.go index 7cbc7c7bd1..95e5814c18 100644 --- a/dot/import.go +++ b/internal/dot/import.go @@ -9,10 +9,10 @@ import ( "os" "path/filepath" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/ChainSafe/gossamer/internal/log" diff --git a/dot/import_test.go b/internal/dot/import_test.go similarity index 94% rename from dot/import_test.go rename to internal/dot/import_test.go index 94448eaa17..8c46ca6d8b 100644 --- a/dot/import_test.go +++ b/internal/dot/import_test.go @@ -9,16 +9,16 @@ import ( "os" "testing" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" ) func setupStateFile(t *testing.T) string { - filename := "../lib/runtime/test_data/kusama/block1482002.out" + const filename = "../lib/runtime/test_data/kusama/block1482002.json" data, err := os.ReadFile(filename) require.NoError(t, err) diff --git a/dot/metrics/collector.go b/internal/dot/metrics/collector.go similarity index 100% rename from dot/metrics/collector.go rename to internal/dot/metrics/collector.go diff --git a/dot/metrics/metrics.go b/internal/dot/metrics/metrics.go similarity index 100% rename from dot/metrics/metrics.go rename to internal/dot/metrics/metrics.go diff --git a/dot/network/README.md b/internal/dot/network/README.md similarity index 99% rename from dot/network/README.md rename to internal/dot/network/README.md index da3db2efe4..e662dfd8e9 100644 --- a/dot/network/README.md +++ b/internal/dot/network/README.md @@ -39,7 +39,7 @@ is distributed to network peers to allow for the verification of messages signed may be constructive to think about a public key as a username and private key as a password, such as for a banking or social media website. Participants in P2P networks that use asymmetric cryptography must protect their private keys, as well as keep track of the public keys that belong to the other participants in the network. Gossamer provides a -[keystore](../../lib/keystore) for securely storing one's private keys. There are a number of Gossamer processes that +[keystore](../../internal/lib/keystore) for securely storing one's private keys. There are a number of Gossamer processes that manage the public keys of network peers - some of these, such as [peer discovery and management](#peer-discovery--management), are described in this document, but there are other packages (most notably [`peerset`](../peerset)) that also interact with the public keys of network peers. One of the diff --git a/dot/network/block_announce.go b/internal/dot/network/block_announce.go similarity index 98% rename from dot/network/block_announce.go rename to internal/dot/network/block_announce.go index 5edf37f104..f3c5381d4b 100644 --- a/dot/network/block_announce.go +++ b/internal/dot/network/block_announce.go @@ -8,8 +8,8 @@ import ( "fmt" "math/big" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/libp2p/go-libp2p-core/peer" diff --git a/dot/network/block_announce_test.go b/internal/dot/network/block_announce_test.go similarity index 97% rename from dot/network/block_announce_test.go rename to internal/dot/network/block_announce_test.go index f81b984a24..f7ea55f280 100644 --- a/dot/network/block_announce_test.go +++ b/internal/dot/network/block_announce_test.go @@ -8,9 +8,9 @@ import ( "sync" "testing" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/libp2p/go-libp2p-core/peer" diff --git a/dot/network/config.go b/internal/dot/network/config.go similarity index 100% rename from dot/network/config.go rename to internal/dot/network/config.go diff --git a/dot/network/config_test.go b/internal/dot/network/config_test.go similarity index 95% rename from dot/network/config_test.go rename to internal/dot/network/config_test.go index cd2e2d9162..9d3ab798e7 100644 --- a/dot/network/config_test.go +++ b/internal/dot/network/config_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" "github.com/stretchr/testify/require" diff --git a/dot/network/connmgr.go b/internal/dot/network/connmgr.go similarity index 98% rename from dot/network/connmgr.go rename to internal/dot/network/connmgr.go index 81db9d9f1d..57caed6b60 100644 --- a/dot/network/connmgr.go +++ b/internal/dot/network/connmgr.go @@ -12,7 +12,7 @@ import ( "github.com/libp2p/go-libp2p-core/peer" ma "github.com/multiformats/go-multiaddr" - "github.com/ChainSafe/gossamer/dot/peerset" + "github.com/ChainSafe/gossamer/internal/dot/peerset" ) // ConnManager implements connmgr.ConnManager diff --git a/dot/network/connmgr_test.go b/internal/dot/network/connmgr_test.go similarity index 98% rename from dot/network/connmgr_test.go rename to internal/dot/network/connmgr_test.go index f67a99f77a..d26b9427a4 100644 --- a/dot/network/connmgr_test.go +++ b/internal/dot/network/connmgr_test.go @@ -12,8 +12,8 @@ import ( "github.com/libp2p/go-libp2p-core/peerstore" "github.com/stretchr/testify/require" - "github.com/ChainSafe/gossamer/dot/peerset" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot/peerset" + "github.com/ChainSafe/gossamer/internal/lib/utils" ) func TestMinPeers(t *testing.T) { diff --git a/dot/network/discovery.go b/internal/dot/network/discovery.go similarity index 100% rename from dot/network/discovery.go rename to internal/dot/network/discovery.go diff --git a/dot/network/discovery_test.go b/internal/dot/network/discovery_test.go similarity index 98% rename from dot/network/discovery_test.go rename to internal/dot/network/discovery_test.go index 7c9bc856e0..8a1a179564 100644 --- a/dot/network/discovery_test.go +++ b/internal/dot/network/discovery_test.go @@ -14,7 +14,7 @@ import ( "github.com/libp2p/go-libp2p-core/routing" "github.com/stretchr/testify/require" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/lib/utils" ) func newTestDiscovery(t *testing.T, num int) []*discovery { diff --git a/dot/network/errors.go b/internal/dot/network/errors.go similarity index 100% rename from dot/network/errors.go rename to internal/dot/network/errors.go diff --git a/dot/network/gossip.go b/internal/dot/network/gossip.go similarity index 100% rename from dot/network/gossip.go rename to internal/dot/network/gossip.go diff --git a/dot/network/gossip_test.go b/internal/dot/network/gossip_test.go similarity index 98% rename from dot/network/gossip_test.go rename to internal/dot/network/gossip_test.go index 2f2e27b594..57c60ccd05 100644 --- a/dot/network/gossip_test.go +++ b/internal/dot/network/gossip_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/stretchr/testify/require" ) diff --git a/dot/network/host.go b/internal/dot/network/host.go similarity index 99% rename from dot/network/host.go rename to internal/dot/network/host.go index 1dbdda5d9c..924cfa5f18 100644 --- a/dot/network/host.go +++ b/internal/dot/network/host.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/ChainSafe/gossamer/dot/peerset" + "github.com/ChainSafe/gossamer/internal/dot/peerset" "github.com/chyeh/pubip" "github.com/dgraph-io/ristretto" badger "github.com/ipfs/go-ds-badger2" diff --git a/dot/network/host_test.go b/internal/dot/network/host_test.go similarity index 99% rename from dot/network/host_test.go rename to internal/dot/network/host_test.go index a39bfcbed2..56d2557378 100644 --- a/dot/network/host_test.go +++ b/internal/dot/network/host_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/peerset" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot/peerset" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/libp2p/go-libp2p-core/peerstore" "github.com/libp2p/go-libp2p-core/protocol" ma "github.com/multiformats/go-multiaddr" diff --git a/dot/network/inbound.go b/internal/dot/network/inbound.go similarity index 100% rename from dot/network/inbound.go rename to internal/dot/network/inbound.go diff --git a/dot/network/light.go b/internal/dot/network/light.go similarity index 99% rename from dot/network/light.go rename to internal/dot/network/light.go index d782568133..2f42ecacfb 100644 --- a/dot/network/light.go +++ b/internal/dot/network/light.go @@ -6,8 +6,8 @@ package network import ( "fmt" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" libp2pnetwork "github.com/libp2p/go-libp2p-core/network" diff --git a/dot/network/light_test.go b/internal/dot/network/light_test.go similarity index 96% rename from dot/network/light_test.go rename to internal/dot/network/light_test.go index 313166760e..0f0707f61c 100644 --- a/dot/network/light_test.go +++ b/internal/dot/network/light_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/libp2p/go-libp2p-core/peer" "github.com/stretchr/testify/require" diff --git a/dot/network/mdns.go b/internal/dot/network/mdns.go similarity index 100% rename from dot/network/mdns.go rename to internal/dot/network/mdns.go diff --git a/dot/network/mdns_test.go b/internal/dot/network/mdns_test.go similarity index 96% rename from dot/network/mdns_test.go rename to internal/dot/network/mdns_test.go index e63bdf6404..4f6db16e65 100644 --- a/dot/network/mdns_test.go +++ b/internal/dot/network/mdns_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/lib/utils" ) // wait time to discover and connect using mdns discovery diff --git a/dot/network/message.go b/internal/dot/network/message.go similarity index 97% rename from dot/network/message.go rename to internal/dot/network/message.go index fe42657acd..246b26d669 100644 --- a/dot/network/message.go +++ b/internal/dot/network/message.go @@ -10,10 +10,10 @@ import ( "google.golang.org/protobuf/proto" - pb "github.com/ChainSafe/gossamer/dot/network/proto" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/common/variadic" + pb "github.com/ChainSafe/gossamer/internal/dot/network/proto" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common/variadic" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/network/message_cache.go b/internal/dot/network/message_cache.go similarity index 97% rename from dot/network/message_cache.go rename to internal/dot/network/message_cache.go index c3a1da3692..cfb5eb7929 100644 --- a/dot/network/message_cache.go +++ b/internal/dot/network/message_cache.go @@ -7,7 +7,7 @@ import ( "errors" "time" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/dgraph-io/ristretto" "github.com/libp2p/go-libp2p-core/peer" ) diff --git a/dot/network/message_cache_test.go b/internal/dot/network/message_cache_test.go similarity index 94% rename from dot/network/message_cache_test.go rename to internal/dot/network/message_cache_test.go index 347ed15967..c4528aee7a 100644 --- a/dot/network/message_cache_test.go +++ b/internal/dot/network/message_cache_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/dgraph-io/ristretto" "github.com/libp2p/go-libp2p-core/peer" "github.com/stretchr/testify/require" diff --git a/dot/network/message_test.go b/internal/dot/network/message_test.go similarity index 98% rename from dot/network/message_test.go rename to internal/dot/network/message_test.go index efa5d3dc07..57304a8746 100644 --- a/dot/network/message_test.go +++ b/internal/dot/network/message_test.go @@ -8,9 +8,9 @@ import ( "math/big" "testing" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/common/variadic" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common/variadic" "github.com/stretchr/testify/require" ) diff --git a/dot/network/mock_block_state.go b/internal/dot/network/mock_block_state.go similarity index 95% rename from dot/network/mock_block_state.go rename to internal/dot/network/mock_block_state.go index f403cf4421..85337ca662 100644 --- a/dot/network/mock_block_state.go +++ b/internal/dot/network/mock_block_state.go @@ -5,10 +5,10 @@ package network import ( big "math/big" - common "github.com/ChainSafe/gossamer/lib/common" + common "github.com/ChainSafe/gossamer/internal/lib/common" mock "github.com/stretchr/testify/mock" - types "github.com/ChainSafe/gossamer/dot/types" + types "github.com/ChainSafe/gossamer/internal/dot/types" ) // MockBlockState is an autogenerated mock type for the BlockState type diff --git a/dot/network/mock_syncer.go b/internal/dot/network/mock_syncer.go similarity index 100% rename from dot/network/mock_syncer.go rename to internal/dot/network/mock_syncer.go diff --git a/dot/network/mock_transaction_handler.go b/internal/dot/network/mock_transaction_handler.go similarity index 100% rename from dot/network/mock_transaction_handler.go rename to internal/dot/network/mock_transaction_handler.go diff --git a/dot/network/notifications.go b/internal/dot/network/notifications.go similarity index 99% rename from dot/network/notifications.go rename to internal/dot/network/notifications.go index f803e89ed1..7132f5cf9a 100644 --- a/dot/network/notifications.go +++ b/internal/dot/network/notifications.go @@ -15,7 +15,7 @@ import ( "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/protocol" - "github.com/ChainSafe/gossamer/dot/peerset" + "github.com/ChainSafe/gossamer/internal/dot/peerset" ) const handshakeTimeout = time.Second * 10 diff --git a/dot/network/notifications_test.go b/internal/dot/network/notifications_test.go similarity index 98% rename from dot/network/notifications_test.go rename to internal/dot/network/notifications_test.go index e0d7b4fc77..549ccb03aa 100644 --- a/dot/network/notifications_test.go +++ b/internal/dot/network/notifications_test.go @@ -16,9 +16,9 @@ import ( "github.com/libp2p/go-libp2p-core/peer" "github.com/stretchr/testify/require" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/utils" ) func TestCreateDecoder_BlockAnnounce(t *testing.T) { diff --git a/dot/network/pool.go b/internal/dot/network/pool.go similarity index 100% rename from dot/network/pool.go rename to internal/dot/network/pool.go diff --git a/dot/network/pool_test.go b/internal/dot/network/pool_test.go similarity index 100% rename from dot/network/pool_test.go rename to internal/dot/network/pool_test.go diff --git a/dot/network/proto/api.v1.pb.go b/internal/dot/network/proto/api.v1.pb.go similarity index 100% rename from dot/network/proto/api.v1.pb.go rename to internal/dot/network/proto/api.v1.pb.go diff --git a/dot/network/proto/api.v1.proto b/internal/dot/network/proto/api.v1.proto similarity index 96% rename from dot/network/proto/api.v1.proto rename to internal/dot/network/proto/api.v1.proto index 2c68c7619e..90fe3cfb7f 100644 --- a/dot/network/proto/api.v1.proto +++ b/internal/dot/network/proto/api.v1.proto @@ -8,7 +8,7 @@ syntax = "proto3"; package api.v1; // This file is copied from https://github.com/paritytech/substrate/blob/9b08105b8c7106d723c4f470304ad9e2868569d9/client/network/src/schema/api.v1.proto -option go_package = "github.com/ChainSafe/gossamer/dot/network/proto"; +option go_package = "github.com/ChainSafe/gossamer/internal/dot/network/proto"; // Block enumeration direction. enum Direction { diff --git a/dot/network/service.go b/internal/dot/network/service.go similarity index 98% rename from dot/network/service.go rename to internal/dot/network/service.go index f6ad9d0727..e4d1e642b0 100644 --- a/dot/network/service.go +++ b/internal/dot/network/service.go @@ -16,12 +16,12 @@ import ( "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/protocol" - gssmrmetrics "github.com/ChainSafe/gossamer/dot/metrics" - "github.com/ChainSafe/gossamer/dot/peerset" - "github.com/ChainSafe/gossamer/dot/telemetry" + gssmrmetrics "github.com/ChainSafe/gossamer/internal/dot/metrics" + "github.com/ChainSafe/gossamer/internal/dot/peerset" + "github.com/ChainSafe/gossamer/internal/dot/telemetry" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/services" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/services" ) const ( diff --git a/dot/network/service_test.go b/internal/dot/network/service_test.go similarity index 99% rename from dot/network/service_test.go rename to internal/dot/network/service_test.go index a33dd8dec9..0a01c135e3 100644 --- a/dot/network/service_test.go +++ b/internal/dot/network/service_test.go @@ -14,7 +14,7 @@ import ( mock "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/lib/utils" ) var TestProtocolID = "/gossamer/test/0" diff --git a/dot/network/state.go b/internal/dot/network/state.go similarity index 94% rename from dot/network/state.go rename to internal/dot/network/state.go index b9467d02f3..cdec0af204 100644 --- a/dot/network/state.go +++ b/internal/dot/network/state.go @@ -8,9 +8,9 @@ import ( "github.com/libp2p/go-libp2p-core/peer" - "github.com/ChainSafe/gossamer/dot/peerset" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/peerset" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" ) //go:generate mockery --name BlockState --structname MockBlockState --case underscore --inpackage diff --git a/dot/network/stream_manager.go b/internal/dot/network/stream_manager.go similarity index 100% rename from dot/network/stream_manager.go rename to internal/dot/network/stream_manager.go diff --git a/dot/network/stream_manager_test.go b/internal/dot/network/stream_manager_test.go similarity index 100% rename from dot/network/stream_manager_test.go rename to internal/dot/network/stream_manager_test.go diff --git a/dot/network/sync.go b/internal/dot/network/sync.go similarity index 98% rename from dot/network/sync.go rename to internal/dot/network/sync.go index 4c260dad2f..77bc64e199 100644 --- a/dot/network/sync.go +++ b/internal/dot/network/sync.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/ChainSafe/gossamer/dot/peerset" + "github.com/ChainSafe/gossamer/internal/dot/peerset" libp2pnetwork "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" ) diff --git a/dot/network/sync_test.go b/internal/dot/network/sync_test.go similarity index 100% rename from dot/network/sync_test.go rename to internal/dot/network/sync_test.go diff --git a/dot/network/test_helpers.go b/internal/dot/network/test_helpers.go similarity index 97% rename from dot/network/test_helpers.go rename to internal/dot/network/test_helpers.go index 73c2fbcad8..727165da5a 100644 --- a/dot/network/test_helpers.go +++ b/internal/dot/network/test_helpers.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/mock" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/common/variadic" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common/variadic" libp2pnetwork "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" diff --git a/dot/network/transaction.go b/internal/dot/network/transaction.go similarity index 97% rename from dot/network/transaction.go rename to internal/dot/network/transaction.go index cad849f3d5..1b84301c35 100644 --- a/dot/network/transaction.go +++ b/internal/dot/network/transaction.go @@ -10,8 +10,8 @@ import ( "github.com/libp2p/go-libp2p-core/peer" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/network/transaction_test.go b/internal/dot/network/transaction_test.go similarity index 92% rename from dot/network/transaction_test.go rename to internal/dot/network/transaction_test.go index 49f0cbf4b6..7e7f4c3369 100644 --- a/dot/network/transaction_test.go +++ b/internal/dot/network/transaction_test.go @@ -8,8 +8,8 @@ import ( "github.com/libp2p/go-libp2p-core/peer" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/dot/network/utils.go b/internal/dot/network/utils.go similarity index 100% rename from dot/network/utils.go rename to internal/dot/network/utils.go diff --git a/dot/network/utils_test.go b/internal/dot/network/utils_test.go similarity index 98% rename from dot/network/utils_test.go rename to internal/dot/network/utils_test.go index 047c491dca..359cbb4c2c 100644 --- a/dot/network/utils_test.go +++ b/internal/dot/network/utils_test.go @@ -7,7 +7,7 @@ import ( "bytes" "testing" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/stretchr/testify/require" ) diff --git a/dot/node.go b/internal/dot/node.go similarity index 94% rename from dot/node.go rename to internal/dot/node.go index 057aad7794..a6c6250c24 100644 --- a/dot/node.go +++ b/internal/dot/node.go @@ -15,20 +15,20 @@ import ( "syscall" "time" - "github.com/ChainSafe/gossamer/dot/metrics" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/rpc" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/state/pruner" - "github.com/ChainSafe/gossamer/dot/telemetry" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/metrics" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/rpc" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/state/pruner" + "github.com/ChainSafe/gossamer/internal/dot/telemetry" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/services" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/services" - "github.com/ChainSafe/gossamer/lib/utils" ) var logger = log.NewFromGlobal(log.AddContext("pkg", "dot")) diff --git a/dot/node_test.go b/internal/dot/node_test.go similarity index 93% rename from dot/node_test.go rename to internal/dot/node_test.go index 32fd72f7c5..4748f133ca 100644 --- a/dot/node_test.go +++ b/internal/dot/node_test.go @@ -8,17 +8,17 @@ import ( "reflect" "testing" - "github.com/ChainSafe/gossamer/dot/core" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/babe" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/grandpa" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/trie" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot/core" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/babe" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/grandpa" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" "github.com/stretchr/testify/require" diff --git a/dot/peerset/constants.go b/internal/dot/peerset/constants.go similarity index 100% rename from dot/peerset/constants.go rename to internal/dot/peerset/constants.go diff --git a/dot/peerset/errors.go b/internal/dot/peerset/errors.go similarity index 100% rename from dot/peerset/errors.go rename to internal/dot/peerset/errors.go diff --git a/dot/peerset/handler.go b/internal/dot/peerset/handler.go similarity index 100% rename from dot/peerset/handler.go rename to internal/dot/peerset/handler.go diff --git a/dot/peerset/peerset.go b/internal/dot/peerset/peerset.go similarity index 100% rename from dot/peerset/peerset.go rename to internal/dot/peerset/peerset.go diff --git a/dot/peerset/peerset_test.go b/internal/dot/peerset/peerset_test.go similarity index 100% rename from dot/peerset/peerset_test.go rename to internal/dot/peerset/peerset_test.go diff --git a/dot/peerset/peerstate.go b/internal/dot/peerset/peerstate.go similarity index 100% rename from dot/peerset/peerstate.go rename to internal/dot/peerset/peerstate.go diff --git a/dot/peerset/peerstate_test.go b/internal/dot/peerset/peerstate_test.go similarity index 100% rename from dot/peerset/peerstate_test.go rename to internal/dot/peerset/peerstate_test.go diff --git a/dot/peerset/test_helpers.go b/internal/dot/peerset/test_helpers.go similarity index 100% rename from dot/peerset/test_helpers.go rename to internal/dot/peerset/test_helpers.go diff --git a/dot/rpc/dot_up_codec.go b/internal/dot/rpc/dot_up_codec.go similarity index 96% rename from dot/rpc/dot_up_codec.go rename to internal/dot/rpc/dot_up_codec.go index 3ab7b6574d..fd0d6b9ccd 100644 --- a/dot/rpc/dot_up_codec.go +++ b/internal/dot/rpc/dot_up_codec.go @@ -10,8 +10,8 @@ import ( "unicode" "unicode/utf8" - "github.com/ChainSafe/gossamer/dot/rpc/json2" - "github.com/ChainSafe/gossamer/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/dot/rpc/json2" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" "github.com/gorilla/rpc/v2" ) diff --git a/dot/rpc/dot_up_codec_test.go b/internal/dot/rpc/dot_up_codec_test.go similarity index 100% rename from dot/rpc/dot_up_codec_test.go rename to internal/dot/rpc/dot_up_codec_test.go diff --git a/dot/rpc/helpers.go b/internal/dot/rpc/helpers.go similarity index 97% rename from dot/rpc/helpers.go rename to internal/dot/rpc/helpers.go index 2c0f2aa04a..ebabc22f2e 100644 --- a/dot/rpc/helpers.go +++ b/internal/dot/rpc/helpers.go @@ -9,7 +9,7 @@ import ( "net" "strings" - "github.com/ChainSafe/gossamer/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" "github.com/go-playground/validator/v10" "github.com/gorilla/rpc/v2" "github.com/jpillora/ipfilter" diff --git a/dot/rpc/http.go b/internal/dot/rpc/http.go similarity index 96% rename from dot/rpc/http.go rename to internal/dot/rpc/http.go index 0729cd02d0..b30c00b0ef 100644 --- a/dot/rpc/http.go +++ b/internal/dot/rpc/http.go @@ -9,11 +9,11 @@ import ( "net/http" "time" - "github.com/ChainSafe/gossamer/dot/rpc/modules" - "github.com/ChainSafe/gossamer/dot/rpc/subscription" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/dot/rpc/subscription" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/runtime" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/runtime" "github.com/go-playground/validator/v10" "github.com/gorilla/mux" "github.com/gorilla/rpc/v2" diff --git a/dot/rpc/http_test.go b/internal/dot/rpc/http_test.go similarity index 96% rename from dot/rpc/http_test.go rename to internal/dot/rpc/http_test.go index 49a7e98a55..39ac7fa8b1 100644 --- a/dot/rpc/http_test.go +++ b/internal/dot/rpc/http_test.go @@ -13,12 +13,12 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/core" - "github.com/ChainSafe/gossamer/dot/rpc/modules" - "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" - "github.com/ChainSafe/gossamer/dot/system" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/core" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" + "github.com/ChainSafe/gossamer/internal/dot/system" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/btcsuite/btcutil/base58" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/dot/rpc/json2/server.go b/internal/dot/rpc/json2/server.go similarity index 100% rename from dot/rpc/json2/server.go rename to internal/dot/rpc/json2/server.go diff --git a/dot/rpc/modules/api.go b/internal/dot/rpc/modules/api.go similarity index 89% rename from dot/rpc/modules/api.go rename to internal/dot/rpc/modules/api.go index 4d1940bda4..f851195fe0 100644 --- a/dot/rpc/modules/api.go +++ b/internal/dot/rpc/modules/api.go @@ -6,17 +6,17 @@ package modules import ( "math/big" - "github.com/ChainSafe/gossamer/dot/core" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/grandpa" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/transaction" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/core" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/grandpa" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/transaction" + "github.com/ChainSafe/gossamer/internal/lib/trie" ) //go:generate mockery --name StorageAPI --structname StorageAPI --case underscore --keeptree diff --git a/dot/rpc/modules/api_mocks.go b/internal/dot/rpc/modules/api_mocks.go similarity index 92% rename from dot/rpc/modules/api_mocks.go rename to internal/dot/rpc/modules/api_mocks.go index cbe05b5a0c..fe3ee5a6dd 100644 --- a/dot/rpc/modules/api_mocks.go +++ b/internal/dot/rpc/modules/api_mocks.go @@ -4,11 +4,11 @@ package modules import ( - modulesmocks "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - runtimemocks "github.com/ChainSafe/gossamer/lib/runtime/mocks" - "github.com/ChainSafe/gossamer/lib/transaction" + modulesmocks "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + runtimemocks "github.com/ChainSafe/gossamer/internal/lib/runtime/mocks" + "github.com/ChainSafe/gossamer/internal/lib/transaction" "github.com/stretchr/testify/mock" ) diff --git a/dot/rpc/modules/api_mocks_test.go b/internal/dot/rpc/modules/api_mocks_test.go similarity index 100% rename from dot/rpc/modules/api_mocks_test.go rename to internal/dot/rpc/modules/api_mocks_test.go diff --git a/dot/rpc/modules/author.go b/internal/dot/rpc/modules/author.go similarity index 97% rename from dot/rpc/modules/author.go rename to internal/dot/rpc/modules/author.go index 310a370f49..0891d8b56f 100644 --- a/dot/rpc/modules/author.go +++ b/internal/dot/rpc/modules/author.go @@ -8,10 +8,10 @@ import ( "net/http" "strings" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/keystore" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/keystore" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/rpc/modules/author_integration_test.go b/internal/dot/rpc/modules/author_integration_test.go similarity index 94% rename from dot/rpc/modules/author_integration_test.go rename to internal/dot/rpc/modules/author_integration_test.go index 092804c8c8..dc8dd4b224 100644 --- a/dot/rpc/modules/author_integration_test.go +++ b/internal/dot/rpc/modules/author_integration_test.go @@ -13,16 +13,16 @@ import ( "reflect" "testing" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" + "github.com/ChainSafe/gossamer/internal/lib/transaction" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/transaction" "github.com/stretchr/testify/require" ) diff --git a/dot/rpc/modules/author_test.go b/internal/dot/rpc/modules/author_test.go similarity index 97% rename from dot/rpc/modules/author_test.go rename to internal/dot/rpc/modules/author_test.go index e32e524adb..43dc72be5f 100644 --- a/dot/rpc/modules/author_test.go +++ b/internal/dot/rpc/modules/author_test.go @@ -10,14 +10,14 @@ import ( "net/http" "testing" - "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/transaction" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/transaction" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/dot/rpc/modules/chain.go b/internal/dot/rpc/modules/chain.go similarity index 98% rename from dot/rpc/modules/chain.go rename to internal/dot/rpc/modules/chain.go index 4b0f9f8ad2..a1fc757088 100644 --- a/dot/rpc/modules/chain.go +++ b/internal/dot/rpc/modules/chain.go @@ -9,8 +9,8 @@ import ( "net/http" "regexp" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/rpc/modules/chain_integration_test.go b/internal/dot/rpc/modules/chain_integration_test.go similarity index 95% rename from dot/rpc/modules/chain_integration_test.go rename to internal/dot/rpc/modules/chain_integration_test.go index 5eb55697c4..97a0b5226a 100644 --- a/dot/rpc/modules/chain_integration_test.go +++ b/internal/dot/rpc/modules/chain_integration_test.go @@ -11,19 +11,19 @@ import ( "path/filepath" "testing" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" + "github.com/ChainSafe/gossamer/internal/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/trie" - "github.com/ChainSafe/gossamer/lib/utils" "github.com/ChainSafe/gossamer/pkg/scale" database "github.com/ChainSafe/chaindb" - rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" + rtstorage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" "github.com/stretchr/testify/require" ) diff --git a/dot/rpc/modules/chain_test.go b/internal/dot/rpc/modules/chain_test.go similarity index 98% rename from dot/rpc/modules/chain_test.go rename to internal/dot/rpc/modules/chain_test.go index 0cb98954bd..a109838f50 100644 --- a/dot/rpc/modules/chain_test.go +++ b/internal/dot/rpc/modules/chain_test.go @@ -9,9 +9,9 @@ import ( "net/http" "testing" - "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/dot/rpc/modules/childstate.go b/internal/dot/rpc/modules/childstate.go similarity index 98% rename from dot/rpc/modules/childstate.go rename to internal/dot/rpc/modules/childstate.go index 270e2cb54b..dd45a68bb9 100644 --- a/dot/rpc/modules/childstate.go +++ b/internal/dot/rpc/modules/childstate.go @@ -6,7 +6,7 @@ package modules import ( "net/http" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // GetKeysRequest represents the request to retrieve the keys of a child storage diff --git a/dot/rpc/modules/childstate_integration_test.go b/internal/dot/rpc/modules/childstate_integration_test.go similarity index 97% rename from dot/rpc/modules/childstate_integration_test.go rename to internal/dot/rpc/modules/childstate_integration_test.go index e09dd3b51d..9c28a0e130 100644 --- a/dot/rpc/modules/childstate_integration_test.go +++ b/internal/dot/rpc/modules/childstate_integration_test.go @@ -25,9 +25,9 @@ import ( "testing" "github.com/ChainSafe/chaindb" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/stretchr/testify/require" ) diff --git a/dot/rpc/modules/childstate_test.go b/internal/dot/rpc/modules/childstate_test.go similarity index 98% rename from dot/rpc/modules/childstate_test.go rename to internal/dot/rpc/modules/childstate_test.go index 7d3d41afba..c72b196e66 100644 --- a/dot/rpc/modules/childstate_test.go +++ b/internal/dot/rpc/modules/childstate_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - apimocks "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/genesis" - rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/trie" + apimocks "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + rtstorage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/dot/rpc/modules/dev.go b/internal/dot/rpc/modules/dev.go similarity index 97% rename from dot/rpc/modules/dev.go rename to internal/dot/rpc/modules/dev.go index 44560a3115..8ab3de8ee3 100644 --- a/dot/rpc/modules/dev.go +++ b/internal/dot/rpc/modules/dev.go @@ -8,7 +8,7 @@ import ( "errors" "net/http" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) var blockProducerStoppedMsg = "babe service stopped" diff --git a/dot/rpc/modules/dev_integration_test.go b/internal/dot/rpc/modules/dev_integration_test.go similarity index 87% rename from dot/rpc/modules/dev_integration_test.go rename to internal/dot/rpc/modules/dev_integration_test.go index 0c1dc83e21..d4d9ca3e67 100644 --- a/dot/rpc/modules/dev_integration_test.go +++ b/internal/dot/rpc/modules/dev_integration_test.go @@ -10,17 +10,17 @@ import ( "encoding/binary" "testing" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/babe" - babemocks "github.com/ChainSafe/gossamer/lib/babe/mocks" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/babe" + babemocks "github.com/ChainSafe/gossamer/internal/lib/babe/mocks" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/stretchr/testify/require" ) diff --git a/dot/rpc/modules/dev_test.go b/internal/dot/rpc/modules/dev_test.go similarity index 98% rename from dot/rpc/modules/dev_test.go rename to internal/dot/rpc/modules/dev_test.go index c15d5a6535..947c2d59e2 100644 --- a/dot/rpc/modules/dev_test.go +++ b/internal/dot/rpc/modules/dev_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" "github.com/stretchr/testify/assert" ) diff --git a/dot/rpc/modules/errors.go b/internal/dot/rpc/modules/errors.go similarity index 100% rename from dot/rpc/modules/errors.go rename to internal/dot/rpc/modules/errors.go diff --git a/dot/rpc/modules/grandpa.go b/internal/dot/rpc/modules/grandpa.go similarity index 97% rename from dot/rpc/modules/grandpa.go rename to internal/dot/rpc/modules/grandpa.go index 012bd9cd61..f5108d79e8 100644 --- a/dot/rpc/modules/grandpa.go +++ b/internal/dot/rpc/modules/grandpa.go @@ -6,8 +6,8 @@ package modules import ( "net/http" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" ) // GrandpaModule init parameters diff --git a/dot/rpc/modules/grandpa_integration_test.go b/internal/dot/rpc/modules/grandpa_integration_test.go similarity index 91% rename from dot/rpc/modules/grandpa_integration_test.go rename to internal/dot/rpc/modules/grandpa_integration_test.go index ae6282ce84..770d50918f 100644 --- a/dot/rpc/modules/grandpa_integration_test.go +++ b/internal/dot/rpc/modules/grandpa_integration_test.go @@ -23,14 +23,14 @@ import ( "reflect" "testing" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/grandpa" - "github.com/ChainSafe/gossamer/lib/keystore" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/grandpa" + "github.com/ChainSafe/gossamer/internal/lib/keystore" "github.com/stretchr/testify/require" - rpcmocks "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" + rpcmocks "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" ) var kr, _ = keystore.NewEd25519Keyring() diff --git a/dot/rpc/modules/grandpa_test.go b/internal/dot/rpc/modules/grandpa_test.go similarity index 94% rename from dot/rpc/modules/grandpa_test.go rename to internal/dot/rpc/modules/grandpa_test.go index 1c50ae3648..33d65a31f8 100644 --- a/dot/rpc/modules/grandpa_test.go +++ b/internal/dot/rpc/modules/grandpa_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/grandpa" - "github.com/ChainSafe/gossamer/lib/keystore" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/grandpa" + "github.com/ChainSafe/gossamer/internal/lib/keystore" "github.com/stretchr/testify/assert" ) diff --git a/dot/rpc/modules/mocks/block_api.go b/internal/dot/rpc/modules/mocks/block_api.go similarity index 97% rename from dot/rpc/modules/mocks/block_api.go rename to internal/dot/rpc/modules/mocks/block_api.go index 3bd095768e..f0e097a4eb 100644 --- a/dot/rpc/modules/mocks/block_api.go +++ b/internal/dot/rpc/modules/mocks/block_api.go @@ -5,12 +5,12 @@ package mocks import ( big "math/big" - common "github.com/ChainSafe/gossamer/lib/common" + common "github.com/ChainSafe/gossamer/internal/lib/common" mock "github.com/stretchr/testify/mock" - runtime "github.com/ChainSafe/gossamer/lib/runtime" + runtime "github.com/ChainSafe/gossamer/internal/lib/runtime" - types "github.com/ChainSafe/gossamer/dot/types" + types "github.com/ChainSafe/gossamer/internal/dot/types" ) // BlockAPI is an autogenerated mock type for the BlockAPI type diff --git a/dot/rpc/modules/mocks/block_finality_api.go b/internal/dot/rpc/modules/mocks/block_finality_api.go similarity index 93% rename from dot/rpc/modules/mocks/block_finality_api.go rename to internal/dot/rpc/modules/mocks/block_finality_api.go index e4eed4ed38..564069dc12 100644 --- a/dot/rpc/modules/mocks/block_finality_api.go +++ b/internal/dot/rpc/modules/mocks/block_finality_api.go @@ -3,10 +3,10 @@ package mocks import ( - ed25519 "github.com/ChainSafe/gossamer/lib/crypto/ed25519" + ed25519 "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" mock "github.com/stretchr/testify/mock" - types "github.com/ChainSafe/gossamer/dot/types" + types "github.com/ChainSafe/gossamer/internal/dot/types" ) // BlockFinalityAPI is an autogenerated mock type for the BlockFinalityAPI type diff --git a/dot/rpc/modules/mocks/block_producer_api.go b/internal/dot/rpc/modules/mocks/block_producer_api.go similarity index 100% rename from dot/rpc/modules/mocks/block_producer_api.go rename to internal/dot/rpc/modules/mocks/block_producer_api.go diff --git a/dot/rpc/modules/mocks/core_api.go b/internal/dot/rpc/modules/mocks/core_api.go similarity index 93% rename from dot/rpc/modules/mocks/core_api.go rename to internal/dot/rpc/modules/mocks/core_api.go index 3d669330c1..07a17f2f0b 100644 --- a/dot/rpc/modules/mocks/core_api.go +++ b/internal/dot/rpc/modules/mocks/core_api.go @@ -3,16 +3,16 @@ package mocks import ( - core "github.com/ChainSafe/gossamer/dot/core" - common "github.com/ChainSafe/gossamer/lib/common" + core "github.com/ChainSafe/gossamer/internal/dot/core" + common "github.com/ChainSafe/gossamer/internal/lib/common" - crypto "github.com/ChainSafe/gossamer/lib/crypto" + crypto "github.com/ChainSafe/gossamer/internal/lib/crypto" mock "github.com/stretchr/testify/mock" - runtime "github.com/ChainSafe/gossamer/lib/runtime" + runtime "github.com/ChainSafe/gossamer/internal/lib/runtime" - types "github.com/ChainSafe/gossamer/dot/types" + types "github.com/ChainSafe/gossamer/internal/dot/types" ) // CoreAPI is an autogenerated mock type for the CoreAPI type diff --git a/dot/rpc/modules/mocks/network_api.go b/internal/dot/rpc/modules/mocks/network_api.go similarity index 98% rename from dot/rpc/modules/mocks/network_api.go rename to internal/dot/rpc/modules/mocks/network_api.go index d9dd66275a..2e977cf83f 100644 --- a/dot/rpc/modules/mocks/network_api.go +++ b/internal/dot/rpc/modules/mocks/network_api.go @@ -3,7 +3,7 @@ package mocks import ( - common "github.com/ChainSafe/gossamer/lib/common" + common "github.com/ChainSafe/gossamer/internal/lib/common" mock "github.com/stretchr/testify/mock" ) diff --git a/dot/rpc/modules/mocks/rpcapi.go b/internal/dot/rpc/modules/mocks/rpcapi.go similarity index 100% rename from dot/rpc/modules/mocks/rpcapi.go rename to internal/dot/rpc/modules/mocks/rpcapi.go diff --git a/dot/rpc/modules/mocks/runtime_storage_api.go b/internal/dot/rpc/modules/mocks/runtime_storage_api.go similarity index 100% rename from dot/rpc/modules/mocks/runtime_storage_api.go rename to internal/dot/rpc/modules/mocks/runtime_storage_api.go diff --git a/dot/rpc/modules/mocks/storage_api.go b/internal/dot/rpc/modules/mocks/storage_api.go similarity index 96% rename from dot/rpc/modules/mocks/storage_api.go rename to internal/dot/rpc/modules/mocks/storage_api.go index 2a33b3db88..272ab37781 100644 --- a/dot/rpc/modules/mocks/storage_api.go +++ b/internal/dot/rpc/modules/mocks/storage_api.go @@ -3,12 +3,12 @@ package mocks import ( - common "github.com/ChainSafe/gossamer/lib/common" + common "github.com/ChainSafe/gossamer/internal/lib/common" mock "github.com/stretchr/testify/mock" - state "github.com/ChainSafe/gossamer/dot/state" + state "github.com/ChainSafe/gossamer/internal/dot/state" - trie "github.com/ChainSafe/gossamer/lib/trie" + trie "github.com/ChainSafe/gossamer/internal/lib/trie" ) // StorageAPI is an autogenerated mock type for the StorageAPI type diff --git a/dot/rpc/modules/mocks/sync_state_api.go b/internal/dot/rpc/modules/mocks/sync_state_api.go similarity index 91% rename from dot/rpc/modules/mocks/sync_state_api.go rename to internal/dot/rpc/modules/mocks/sync_state_api.go index ca7c0aba8f..100bfa1e69 100644 --- a/dot/rpc/modules/mocks/sync_state_api.go +++ b/internal/dot/rpc/modules/mocks/sync_state_api.go @@ -3,7 +3,7 @@ package mocks import ( - genesis "github.com/ChainSafe/gossamer/lib/genesis" + genesis "github.com/ChainSafe/gossamer/internal/lib/genesis" mock "github.com/stretchr/testify/mock" ) diff --git a/dot/rpc/modules/mocks/system_api.go b/internal/dot/rpc/modules/mocks/system_api.go similarity index 100% rename from dot/rpc/modules/mocks/system_api.go rename to internal/dot/rpc/modules/mocks/system_api.go diff --git a/dot/rpc/modules/mocks/transaction_state_api.go b/internal/dot/rpc/modules/mocks/transaction_state_api.go similarity index 92% rename from dot/rpc/modules/mocks/transaction_state_api.go rename to internal/dot/rpc/modules/mocks/transaction_state_api.go index e07c4994ae..73890a30a0 100644 --- a/dot/rpc/modules/mocks/transaction_state_api.go +++ b/internal/dot/rpc/modules/mocks/transaction_state_api.go @@ -3,12 +3,12 @@ package mocks import ( - common "github.com/ChainSafe/gossamer/lib/common" + common "github.com/ChainSafe/gossamer/internal/lib/common" mock "github.com/stretchr/testify/mock" - transaction "github.com/ChainSafe/gossamer/lib/transaction" + transaction "github.com/ChainSafe/gossamer/internal/lib/transaction" - types "github.com/ChainSafe/gossamer/dot/types" + types "github.com/ChainSafe/gossamer/internal/dot/types" ) // TransactionStateAPI is an autogenerated mock type for the TransactionStateAPI type diff --git a/dot/rpc/modules/offchain.go b/internal/dot/rpc/modules/offchain.go similarity index 97% rename from dot/rpc/modules/offchain.go rename to internal/dot/rpc/modules/offchain.go index c6950d45ed..4eae18c08d 100644 --- a/dot/rpc/modules/offchain.go +++ b/internal/dot/rpc/modules/offchain.go @@ -7,7 +7,7 @@ import ( "fmt" "net/http" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) const ( diff --git a/dot/rpc/modules/offchain_integration_test.go b/internal/dot/rpc/modules/offchain_integration_test.go similarity index 95% rename from dot/rpc/modules/offchain_integration_test.go rename to internal/dot/rpc/modules/offchain_integration_test.go index d41339dd41..6f4c4e4679 100644 --- a/dot/rpc/modules/offchain_integration_test.go +++ b/internal/dot/rpc/modules/offchain_integration_test.go @@ -10,8 +10,8 @@ import ( "errors" "testing" - "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/dot/rpc/modules/offchain_test.go b/internal/dot/rpc/modules/offchain_test.go similarity index 97% rename from dot/rpc/modules/offchain_test.go rename to internal/dot/rpc/modules/offchain_test.go index cf1ba01137..5225e9029f 100644 --- a/dot/rpc/modules/offchain_test.go +++ b/internal/dot/rpc/modules/offchain_test.go @@ -9,8 +9,8 @@ import ( "net/http" "testing" - "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/stretchr/testify/assert" ) diff --git a/dot/rpc/modules/payment.go b/internal/dot/rpc/modules/payment.go similarity index 96% rename from dot/rpc/modules/payment.go rename to internal/dot/rpc/modules/payment.go index 9e4a1fb8a5..7988f770e0 100644 --- a/dot/rpc/modules/payment.go +++ b/internal/dot/rpc/modules/payment.go @@ -6,7 +6,7 @@ package modules import ( "net/http" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // PaymentQueryInfoRequest represents the request to get the fee of an extrinsic in a given block diff --git a/dot/rpc/modules/payment_integration_test.go b/internal/dot/rpc/modules/payment_integration_test.go similarity index 94% rename from dot/rpc/modules/payment_integration_test.go rename to internal/dot/rpc/modules/payment_integration_test.go index 4e8b7a81df..bbe0cb4bd6 100644 --- a/dot/rpc/modules/payment_integration_test.go +++ b/internal/dot/rpc/modules/payment_integration_test.go @@ -10,14 +10,14 @@ import ( "errors" "testing" - "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" + "github.com/ChainSafe/gossamer/internal/dot/types" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/ChainSafe/gossamer/lib/common" - mocksruntime "github.com/ChainSafe/gossamer/lib/runtime/mocks" + "github.com/ChainSafe/gossamer/internal/lib/common" + mocksruntime "github.com/ChainSafe/gossamer/internal/lib/runtime/mocks" ) func TestPaymentQueryInfo(t *testing.T) { diff --git a/dot/rpc/modules/payment_test.go b/internal/dot/rpc/modules/payment_test.go similarity index 93% rename from dot/rpc/modules/payment_test.go rename to internal/dot/rpc/modules/payment_test.go index 16f0c70d25..b0b353a3cd 100644 --- a/dot/rpc/modules/payment_test.go +++ b/internal/dot/rpc/modules/payment_test.go @@ -9,10 +9,10 @@ import ( "net/http" "testing" - "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - mocksruntime "github.com/ChainSafe/gossamer/lib/runtime/mocks" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + mocksruntime "github.com/ChainSafe/gossamer/internal/lib/runtime/mocks" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/assert" diff --git a/dot/rpc/modules/rpc.go b/internal/dot/rpc/modules/rpc.go similarity index 100% rename from dot/rpc/modules/rpc.go rename to internal/dot/rpc/modules/rpc.go diff --git a/dot/rpc/modules/state.go b/internal/dot/rpc/modules/state.go similarity index 99% rename from dot/rpc/modules/state.go rename to internal/dot/rpc/modules/state.go index d22230b965..704469067b 100644 --- a/dot/rpc/modules/state.go +++ b/internal/dot/rpc/modules/state.go @@ -10,8 +10,8 @@ import ( "net/http" "strings" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/runtime" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/rpc/modules/state_integration_test.go b/internal/dot/rpc/modules/state_integration_test.go similarity index 98% rename from dot/rpc/modules/state_integration_test.go rename to internal/dot/rpc/modules/state_integration_test.go index 1c12766e95..2a0914c90b 100644 --- a/dot/rpc/modules/state_integration_test.go +++ b/internal/dot/rpc/modules/state_integration_test.go @@ -28,10 +28,10 @@ import ( "strings" "testing" - "github.com/ChainSafe/gossamer/dot/core" - "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/core" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/dot/rpc/modules/state_test.go b/internal/dot/rpc/modules/state_test.go similarity index 98% rename from dot/rpc/modules/state_test.go rename to internal/dot/rpc/modules/state_test.go index 3983c0129e..b93c59cd17 100644 --- a/dot/rpc/modules/state_test.go +++ b/internal/dot/rpc/modules/state_test.go @@ -20,11 +20,11 @@ import ( "net/http" "testing" - "github.com/ChainSafe/gossamer/dot/core" - "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" - testdata "github.com/ChainSafe/gossamer/dot/rpc/modules/test_data" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/runtime" + "github.com/ChainSafe/gossamer/internal/dot/core" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" + testdata "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/test_data" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/runtime" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/assert" diff --git a/dot/rpc/modules/sync_state.go b/internal/dot/rpc/modules/sync_state.go similarity index 95% rename from dot/rpc/modules/sync_state.go rename to internal/dot/rpc/modules/sync_state.go index 5d08a87a2c..e7b85e097a 100644 --- a/dot/rpc/modules/sync_state.go +++ b/internal/dot/rpc/modules/sync_state.go @@ -6,8 +6,8 @@ package modules import ( "net/http" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/genesis" ) // GenSyncSpecRequest represents request to get chain specification. diff --git a/dot/rpc/modules/sync_state_integration_test.go b/internal/dot/rpc/modules/sync_state_integration_test.go similarity index 93% rename from dot/rpc/modules/sync_state_integration_test.go rename to internal/dot/rpc/modules/sync_state_integration_test.go index db8cca71c8..4a24247e61 100644 --- a/dot/rpc/modules/sync_state_integration_test.go +++ b/internal/dot/rpc/modules/sync_state_integration_test.go @@ -12,7 +12,7 @@ import ( "path/filepath" "testing" - "github.com/ChainSafe/gossamer/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/genesis" "github.com/stretchr/testify/require" ) diff --git a/dot/rpc/modules/sync_state_test.go b/internal/dot/rpc/modules/sync_state_test.go similarity index 95% rename from dot/rpc/modules/sync_state_test.go rename to internal/dot/rpc/modules/sync_state_test.go index ccc5681490..0e06f9bd65 100644 --- a/dot/rpc/modules/sync_state_test.go +++ b/internal/dot/rpc/modules/sync_state_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/genesis" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/genesis" "github.com/stretchr/testify/assert" ) diff --git a/dot/rpc/modules/system.go b/internal/dot/rpc/modules/system.go similarity index 98% rename from dot/rpc/modules/system.go rename to internal/dot/rpc/modules/system.go index 23a99f27be..f407619059 100644 --- a/dot/rpc/modules/system.go +++ b/internal/dot/rpc/modules/system.go @@ -10,8 +10,8 @@ import ( "net/http" "strings" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/btcsuite/btcutil/base58" ctypes "github.com/centrifuge/go-substrate-rpc-client/v3/types" diff --git a/dot/rpc/modules/system_integration_test.go b/internal/dot/rpc/modules/system_integration_test.go similarity index 95% rename from dot/rpc/modules/system_integration_test.go rename to internal/dot/rpc/modules/system_integration_test.go index ef78bc5c82..ab0a088c3d 100644 --- a/dot/rpc/modules/system_integration_test.go +++ b/internal/dot/rpc/modules/system_integration_test.go @@ -32,19 +32,19 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/ChainSafe/gossamer/dot/core" - coremocks "github.com/ChainSafe/gossamer/dot/core/mocks" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/transaction" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/core" + coremocks "github.com/ChainSafe/gossamer/internal/dot/core/mocks" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" + "github.com/ChainSafe/gossamer/internal/lib/transaction" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/rpc/modules/system_test.go b/internal/dot/rpc/modules/system_test.go similarity index 98% rename from dot/rpc/modules/system_test.go rename to internal/dot/rpc/modules/system_test.go index 6adfde9706..3f4bd88807 100644 --- a/dot/rpc/modules/system_test.go +++ b/internal/dot/rpc/modules/system_test.go @@ -8,11 +8,11 @@ import ( "net/http" "testing" - "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" - testdata "github.com/ChainSafe/gossamer/dot/rpc/modules/test_data" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/transaction" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" + testdata "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/test_data" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/transaction" "github.com/multiformats/go-multiaddr" "github.com/stretchr/testify/assert" diff --git a/dot/rpc/modules/test_data/expected_metadata b/internal/dot/rpc/modules/test_data/expected_metadata similarity index 100% rename from dot/rpc/modules/test_data/expected_metadata rename to internal/dot/rpc/modules/test_data/expected_metadata diff --git a/dot/rpc/modules/test_data/test_metadata.go b/internal/dot/rpc/modules/test_data/test_metadata.go similarity index 100% rename from dot/rpc/modules/test_data/test_metadata.go rename to internal/dot/rpc/modules/test_data/test_metadata.go diff --git a/dot/rpc/modules/test_data/test_metadata.zip b/internal/dot/rpc/modules/test_data/test_metadata.zip similarity index 100% rename from dot/rpc/modules/test_data/test_metadata.zip rename to internal/dot/rpc/modules/test_data/test_metadata.zip diff --git a/dot/rpc/service.go b/internal/dot/rpc/service.go similarity index 100% rename from dot/rpc/service.go rename to internal/dot/rpc/service.go diff --git a/dot/rpc/service_test.go b/internal/dot/rpc/service_test.go similarity index 97% rename from dot/rpc/service_test.go rename to internal/dot/rpc/service_test.go index be27181b20..8c60a92e1f 100644 --- a/dot/rpc/service_test.go +++ b/internal/dot/rpc/service_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "github.com/ChainSafe/gossamer/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" "github.com/gorilla/rpc/v2" "github.com/stretchr/testify/require" ) diff --git a/dot/rpc/subscription/listeners.go b/internal/dot/rpc/subscription/listeners.go similarity index 97% rename from dot/rpc/subscription/listeners.go rename to internal/dot/rpc/subscription/listeners.go index 125438705b..36a67f9da0 100644 --- a/dot/rpc/subscription/listeners.go +++ b/internal/dot/rpc/subscription/listeners.go @@ -10,12 +10,12 @@ import ( "reflect" "time" - "github.com/ChainSafe/gossamer/dot/rpc/modules" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/transaction" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/transaction" ) const ( diff --git a/dot/rpc/subscription/listeners_test.go b/internal/dot/rpc/subscription/listeners_test.go similarity index 95% rename from dot/rpc/subscription/listeners_test.go rename to internal/dot/rpc/subscription/listeners_test.go index 6592bc0f31..58a815fd8e 100644 --- a/dot/rpc/subscription/listeners_test.go +++ b/internal/dot/rpc/subscription/listeners_test.go @@ -16,15 +16,15 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/rpc/modules" - "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/grandpa" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/transaction" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/grandpa" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" + "github.com/ChainSafe/gossamer/internal/lib/transaction" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/gorilla/websocket" "github.com/stretchr/testify/mock" diff --git a/dot/rpc/subscription/messages.go b/internal/dot/rpc/subscription/messages.go similarity index 100% rename from dot/rpc/subscription/messages.go rename to internal/dot/rpc/subscription/messages.go diff --git a/dot/rpc/subscription/subscription.go b/internal/dot/rpc/subscription/subscription.go similarity index 100% rename from dot/rpc/subscription/subscription.go rename to internal/dot/rpc/subscription/subscription.go diff --git a/dot/rpc/subscription/websocket.go b/internal/dot/rpc/subscription/websocket.go similarity index 98% rename from dot/rpc/subscription/websocket.go rename to internal/dot/rpc/subscription/websocket.go index cb53b91438..246a53f37a 100644 --- a/dot/rpc/subscription/websocket.go +++ b/internal/dot/rpc/subscription/websocket.go @@ -15,10 +15,10 @@ import ( "sync" "sync/atomic" - "github.com/ChainSafe/gossamer/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/runtime" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/runtime" "github.com/gorilla/websocket" ) diff --git a/dot/rpc/subscription/websocket_test.go b/internal/dot/rpc/subscription/websocket_test.go similarity index 97% rename from dot/rpc/subscription/websocket_test.go rename to internal/dot/rpc/subscription/websocket_test.go index 496807d555..9694024e89 100644 --- a/dot/rpc/subscription/websocket_test.go +++ b/internal/dot/rpc/subscription/websocket_test.go @@ -9,14 +9,14 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/rpc/modules/mocks" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules/mocks" "github.com/ChainSafe/gossamer/pkg/scale" - "github.com/ChainSafe/gossamer/dot/rpc/modules" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/grandpa" - "github.com/ChainSafe/gossamer/lib/runtime" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/grandpa" + "github.com/ChainSafe/gossamer/internal/lib/runtime" "github.com/gorilla/websocket" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/dot/rpc/websocket_test.go b/internal/dot/rpc/websocket_test.go similarity index 93% rename from dot/rpc/websocket_test.go rename to internal/dot/rpc/websocket_test.go index 3336c95c9d..c308acadd0 100644 --- a/dot/rpc/websocket_test.go +++ b/internal/dot/rpc/websocket_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/core" - "github.com/ChainSafe/gossamer/dot/rpc/modules" - "github.com/ChainSafe/gossamer/dot/system" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/core" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/dot/system" + "github.com/ChainSafe/gossamer/internal/dot/types" "github.com/gorilla/websocket" "github.com/stretchr/testify/require" ) diff --git a/dot/services.go b/internal/dot/services.go similarity index 91% rename from dot/services.go rename to internal/dot/services.go index 703e651b9d..b6837ea3b2 100644 --- a/dot/services.go +++ b/internal/dot/services.go @@ -11,28 +11,28 @@ import ( "github.com/ChainSafe/chaindb" - "github.com/ChainSafe/gossamer/dot/core" - "github.com/ChainSafe/gossamer/dot/digest" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/rpc" - "github.com/ChainSafe/gossamer/dot/rpc/modules" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/sync" - "github.com/ChainSafe/gossamer/dot/system" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/core" + "github.com/ChainSafe/gossamer/internal/dot/digest" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/rpc" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/sync" + "github.com/ChainSafe/gossamer/internal/dot/system" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/babe" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/grandpa" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/runtime/life" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" "github.com/ChainSafe/gossamer/internal/pprof" - "github.com/ChainSafe/gossamer/lib/babe" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/grandpa" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/runtime/life" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/utils" ) func newInMemoryDB(path string) (chaindb.Database, error) { diff --git a/dot/services_test.go b/internal/dot/services_test.go similarity index 97% rename from dot/services_test.go rename to internal/dot/services_test.go index 73c44d089b..f072a4b623 100644 --- a/dot/services_test.go +++ b/internal/dot/services_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/grandpa" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/pprof" - "github.com/ChainSafe/gossamer/lib/grandpa" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/utils" "github.com/gorilla/websocket" "github.com/stretchr/testify/require" diff --git a/dot/state/base.go b/internal/dot/state/base.go similarity index 96% rename from dot/state/base.go rename to internal/dot/state/base.go index a55e48152b..b3513abb58 100644 --- a/dot/state/base.go +++ b/internal/dot/state/base.go @@ -9,9 +9,9 @@ import ( "fmt" "github.com/ChainSafe/chaindb" - "github.com/ChainSafe/gossamer/dot/state/pruner" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/genesis" + "github.com/ChainSafe/gossamer/internal/dot/state/pruner" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/genesis" ) // BaseState is a wrapper for the chaindb.Database, without any prefixes diff --git a/dot/state/base_test.go b/internal/dot/state/base_test.go similarity index 92% rename from dot/state/base_test.go rename to internal/dot/state/base_test.go index ed4a3f8698..42c96d1c64 100644 --- a/dot/state/base_test.go +++ b/internal/dot/state/base_test.go @@ -7,9 +7,9 @@ import ( "bytes" "testing" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/stretchr/testify/require" ) diff --git a/dot/state/block.go b/internal/dot/state/block.go similarity index 98% rename from dot/state/block.go rename to internal/dot/state/block.go index f0957e704c..f75e6728a7 100644 --- a/dot/state/block.go +++ b/internal/dot/state/block.go @@ -13,14 +13,14 @@ import ( "time" "github.com/ChainSafe/chaindb" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/blocktree" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/runtime" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/blocktree" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/runtime" "github.com/ChainSafe/gossamer/pkg/scale" - rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" + rtstorage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" ) const ( diff --git a/dot/state/block_data.go b/internal/dot/state/block_data.go similarity index 97% rename from dot/state/block_data.go rename to internal/dot/state/block_data.go index f41d9bc9e3..b52bd22f0e 100644 --- a/dot/state/block_data.go +++ b/internal/dot/state/block_data.go @@ -4,7 +4,7 @@ package state import ( - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // prefixKey = prefix + hash diff --git a/dot/state/block_data_test.go b/internal/dot/state/block_data_test.go similarity index 92% rename from dot/state/block_data_test.go rename to internal/dot/state/block_data_test.go index 1a90dd1796..96a583d70c 100644 --- a/dot/state/block_data_test.go +++ b/internal/dot/state/block_data_test.go @@ -7,9 +7,9 @@ import ( "math/big" "testing" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/stretchr/testify/require" ) diff --git a/dot/state/block_finalisation.go b/internal/dot/state/block_finalisation.go similarity index 97% rename from dot/state/block_finalisation.go rename to internal/dot/state/block_finalisation.go index b85083f12e..60be3437c3 100644 --- a/dot/state/block_finalisation.go +++ b/internal/dot/state/block_finalisation.go @@ -8,9 +8,9 @@ import ( "fmt" "math/big" - "github.com/ChainSafe/gossamer/dot/telemetry" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/telemetry" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" ) var highestRoundAndSetIDKey = []byte("hrs") diff --git a/dot/state/block_finalisation_test.go b/internal/dot/state/block_finalisation_test.go similarity index 98% rename from dot/state/block_finalisation_test.go rename to internal/dot/state/block_finalisation_test.go index 20775d9a41..525a79f753 100644 --- a/dot/state/block_finalisation_test.go +++ b/internal/dot/state/block_finalisation_test.go @@ -7,7 +7,7 @@ import ( "math/big" "testing" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/types" "github.com/stretchr/testify/require" ) diff --git a/dot/state/block_notify.go b/internal/dot/state/block_notify.go similarity index 96% rename from dot/state/block_notify.go rename to internal/dot/state/block_notify.go index 168bd6b2d1..6c92d69d54 100644 --- a/dot/state/block_notify.go +++ b/internal/dot/state/block_notify.go @@ -7,9 +7,9 @@ import ( "errors" "sync" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/runtime" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/runtime" "github.com/google/uuid" ) diff --git a/dot/state/block_notify_test.go b/internal/dot/state/block_notify_test.go similarity index 95% rename from dot/state/block_notify_test.go rename to internal/dot/state/block_notify_test.go index 7dbd6a9fee..92078621da 100644 --- a/dot/state/block_notify_test.go +++ b/internal/dot/state/block_notify_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/runtime" - runtimemocks "github.com/ChainSafe/gossamer/lib/runtime/mocks" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + runtimemocks "github.com/ChainSafe/gossamer/internal/lib/runtime/mocks" "github.com/stretchr/testify/require" ) diff --git a/dot/state/block_race_test.go b/internal/dot/state/block_race_test.go similarity index 90% rename from dot/state/block_race_test.go rename to internal/dot/state/block_race_test.go index 88443ecb4a..ebee73e5d4 100644 --- a/dot/state/block_race_test.go +++ b/internal/dot/state/block_race_test.go @@ -9,8 +9,8 @@ import ( "sync" "testing" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/ChainSafe/chaindb" "github.com/stretchr/testify/require" diff --git a/dot/state/block_test.go b/internal/dot/state/block_test.go similarity index 98% rename from dot/state/block_test.go rename to internal/dot/state/block_test.go index 4b8832dbc2..074e189a29 100644 --- a/dot/state/block_test.go +++ b/internal/dot/state/block_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" diff --git a/dot/state/bloom.go b/internal/dot/state/bloom.go similarity index 97% rename from dot/state/bloom.go rename to internal/dot/state/bloom.go index 52c4015706..8959db7c15 100644 --- a/dot/state/bloom.go +++ b/internal/dot/state/bloom.go @@ -7,7 +7,7 @@ import ( "encoding/binary" "errors" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" bloomfilter "github.com/holiman/bloomfilter/v2" ) diff --git a/dot/state/epoch.go b/internal/dot/state/epoch.go similarity index 99% rename from dot/state/epoch.go rename to internal/dot/state/epoch.go index 57074e5f07..ef404e51bd 100644 --- a/dot/state/epoch.go +++ b/internal/dot/state/epoch.go @@ -11,7 +11,7 @@ import ( "time" "github.com/ChainSafe/chaindb" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/types" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/state/epoch_test.go b/internal/dot/state/epoch_test.go similarity index 97% rename from dot/state/epoch_test.go rename to internal/dot/state/epoch_test.go index 52c25386bf..7137b33b92 100644 --- a/dot/state/epoch_test.go +++ b/internal/dot/state/epoch_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/keystore" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/keystore" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" diff --git a/dot/state/grandpa.go b/internal/dot/state/grandpa.go similarity index 98% rename from dot/state/grandpa.go rename to internal/dot/state/grandpa.go index 0524801992..445a736c22 100644 --- a/dot/state/grandpa.go +++ b/internal/dot/state/grandpa.go @@ -9,8 +9,8 @@ import ( "math/big" "github.com/ChainSafe/chaindb" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/state/grandpa_test.go b/internal/dot/state/grandpa_test.go similarity index 94% rename from dot/state/grandpa_test.go rename to internal/dot/state/grandpa_test.go index 8464a7daaa..2ff20ed708 100644 --- a/dot/state/grandpa_test.go +++ b/internal/dot/state/grandpa_test.go @@ -7,9 +7,9 @@ import ( "math/big" "testing" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/keystore" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/keystore" "github.com/stretchr/testify/require" ) diff --git a/dot/state/initialize.go b/internal/dot/state/initialize.go similarity index 91% rename from dot/state/initialize.go rename to internal/dot/state/initialize.go index 259a441c2c..f2c66c526a 100644 --- a/dot/state/initialize.go +++ b/internal/dot/state/initialize.go @@ -8,14 +8,14 @@ import ( "path/filepath" "github.com/ChainSafe/chaindb" - "github.com/ChainSafe/gossamer/dot/state/pruner" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/runtime" - rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/trie" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot/state/pruner" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + rtstorage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" + "github.com/ChainSafe/gossamer/internal/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/utils" ) // Initialise initialises the genesis state of the DB using the given storage trie. diff --git a/dot/state/mock_observer.go b/internal/dot/state/mock_observer.go similarity index 100% rename from dot/state/mock_observer.go rename to internal/dot/state/mock_observer.go diff --git a/dot/state/offline_pruner.go b/internal/dot/state/offline_pruner.go similarity index 96% rename from dot/state/offline_pruner.go rename to internal/dot/state/offline_pruner.go index c738914170..0c09613109 100644 --- a/dot/state/offline_pruner.go +++ b/internal/dot/state/offline_pruner.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/ChainSafe/chaindb" - "github.com/ChainSafe/gossamer/dot/state/pruner" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/trie" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot/state/pruner" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/dgraph-io/badger/v2" "github.com/dgraph-io/badger/v2/pb" ) diff --git a/dot/state/pruner/pruner.go b/internal/dot/state/pruner/pruner.go similarity index 99% rename from dot/state/pruner/pruner.go rename to internal/dot/state/pruner/pruner.go index 93cea85691..fbf6f56f35 100644 --- a/dot/state/pruner/pruner.go +++ b/internal/dot/state/pruner/pruner.go @@ -9,8 +9,8 @@ import ( "time" "github.com/ChainSafe/chaindb" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/state/service.go b/internal/dot/state/service.go similarity index 96% rename from dot/state/service.go rename to internal/dot/state/service.go index 1a633569ff..f44eba1cf5 100644 --- a/dot/state/service.go +++ b/internal/dot/state/service.go @@ -8,12 +8,12 @@ import ( "math/big" "path/filepath" - "github.com/ChainSafe/gossamer/dot/state/pruner" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/state/pruner" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/blocktree" + "github.com/ChainSafe/gossamer/internal/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/blocktree" - "github.com/ChainSafe/gossamer/lib/trie" - "github.com/ChainSafe/gossamer/lib/utils" "github.com/ChainSafe/chaindb" ) diff --git a/dot/state/service_test.go b/internal/dot/state/service_test.go similarity index 96% rename from dot/state/service_test.go rename to internal/dot/state/service_test.go index 8ef45bce0b..e4f745bbb8 100644 --- a/dot/state/service_test.go +++ b/internal/dot/state/service_test.go @@ -10,15 +10,15 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/metrics" - "github.com/ChainSafe/gossamer/dot/state/pruner" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/metrics" + "github.com/ChainSafe/gossamer/internal/dot/state/pruner" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/transaction" + "github.com/ChainSafe/gossamer/internal/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/transaction" - "github.com/ChainSafe/gossamer/lib/trie" - "github.com/ChainSafe/gossamer/lib/utils" "github.com/ChainSafe/chaindb" ethmetrics "github.com/ethereum/go-ethereum/metrics" diff --git a/dot/state/storage.go b/internal/dot/state/storage.go similarity index 96% rename from dot/state/storage.go rename to internal/dot/state/storage.go index 93ced1ba13..932ad4e6d6 100644 --- a/dot/state/storage.go +++ b/internal/dot/state/storage.go @@ -9,11 +9,11 @@ import ( "sync" "github.com/ChainSafe/chaindb" - "github.com/ChainSafe/gossamer/dot/state/pruner" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/state/pruner" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + rtstorage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/trie" ) // storagePrefix storage key prefix. diff --git a/dot/state/storage_notify.go b/internal/dot/state/storage_notify.go similarity index 98% rename from dot/state/storage_notify.go rename to internal/dot/state/storage_notify.go index 8160813a3b..4690a22e07 100644 --- a/dot/state/storage_notify.go +++ b/internal/dot/state/storage_notify.go @@ -8,7 +8,7 @@ import ( "reflect" "strings" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // KeyValue struct to hold key value pairs diff --git a/dot/state/storage_notify_test.go b/internal/dot/state/storage_notify_test.go similarity index 98% rename from dot/state/storage_notify_test.go rename to internal/dot/state/storage_notify_test.go index 25c03ad006..898a0990de 100644 --- a/dot/state/storage_notify_test.go +++ b/internal/dot/state/storage_notify_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/ChainSafe/chaindb" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/dot/state/storage_test.go b/internal/dot/state/storage_test.go similarity index 94% rename from dot/state/storage_test.go rename to internal/dot/state/storage_test.go index c6e3c9fe15..6fd1a7d25b 100644 --- a/dot/state/storage_test.go +++ b/internal/dot/state/storage_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/state/pruner" - "github.com/ChainSafe/gossamer/dot/types" - runtime "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/state/pruner" + "github.com/ChainSafe/gossamer/internal/dot/types" + runtime "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/stretchr/testify/require" ) diff --git a/dot/state/test_helpers.go b/internal/dot/state/test_helpers.go similarity index 95% rename from dot/state/test_helpers.go rename to internal/dot/state/test_helpers.go index 3ea8c4fed4..8fdf23f881 100644 --- a/dot/state/test_helpers.go +++ b/internal/dot/state/test_helpers.go @@ -11,11 +11,11 @@ import ( "time" "github.com/ChainSafe/chaindb" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - runtime "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/trie" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + runtime "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/stretchr/testify/require" ) diff --git a/dot/state/transaction.go b/internal/dot/state/transaction.go similarity index 94% rename from dot/state/transaction.go rename to internal/dot/state/transaction.go index 2eae056f46..3f3af6e133 100644 --- a/dot/state/transaction.go +++ b/internal/dot/state/transaction.go @@ -6,11 +6,11 @@ package state import ( "sync" - "github.com/ChainSafe/gossamer/dot/telemetry" + "github.com/ChainSafe/gossamer/internal/dot/telemetry" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/transaction" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/transaction" ) // TransactionState represents the queue of transactions diff --git a/dot/state/transaction_test.go b/internal/dot/state/transaction_test.go similarity index 94% rename from dot/state/transaction_test.go rename to internal/dot/state/transaction_test.go index 26805ca79b..dcba2c4fdf 100644 --- a/dot/state/transaction_test.go +++ b/internal/dot/state/transaction_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/transaction" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/transaction" "github.com/stretchr/testify/require" ) diff --git a/dot/sync/benchmark.go b/internal/dot/sync/benchmark.go similarity index 100% rename from dot/sync/benchmark.go rename to internal/dot/sync/benchmark.go diff --git a/dot/sync/block_queue.go b/internal/dot/sync/block_queue.go similarity index 90% rename from dot/sync/block_queue.go rename to internal/dot/sync/block_queue.go index 2872016450..0b3f291d70 100644 --- a/dot/sync/block_queue.go +++ b/internal/dot/sync/block_queue.go @@ -6,8 +6,8 @@ package sync import ( "sync" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" ) type blockQueue struct { diff --git a/dot/sync/bootstrap_syncer.go b/internal/dot/sync/bootstrap_syncer.go similarity index 95% rename from dot/sync/bootstrap_syncer.go rename to internal/dot/sync/bootstrap_syncer.go index b065db0a8b..ac451ef613 100644 --- a/dot/sync/bootstrap_syncer.go +++ b/internal/dot/sync/bootstrap_syncer.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/lib/common" ) var _ workHandler = &bootstrapSyncer{} diff --git a/dot/sync/bootstrap_syncer_test.go b/internal/dot/sync/bootstrap_syncer_test.go similarity index 93% rename from dot/sync/bootstrap_syncer_test.go rename to internal/dot/sync/bootstrap_syncer_test.go index 5756535943..01027f36e6 100644 --- a/dot/sync/bootstrap_syncer_test.go +++ b/internal/dot/sync/bootstrap_syncer_test.go @@ -7,10 +7,10 @@ import ( "math/big" "testing" - syncmocks "github.com/ChainSafe/gossamer/dot/sync/mocks" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/trie" + syncmocks "github.com/ChainSafe/gossamer/internal/dot/sync/mocks" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/stretchr/testify/require" ) diff --git a/dot/sync/chain_processor.go b/internal/dot/sync/chain_processor.go similarity index 97% rename from dot/sync/chain_processor.go rename to internal/dot/sync/chain_processor.go index f45ab8e9a7..1e5ee49636 100644 --- a/dot/sync/chain_processor.go +++ b/internal/dot/sync/chain_processor.go @@ -9,9 +9,9 @@ import ( "errors" "fmt" - "github.com/ChainSafe/gossamer/dot/telemetry" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/blocktree" + "github.com/ChainSafe/gossamer/internal/dot/telemetry" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/blocktree" ) // ChainProcessor processes ready blocks. diff --git a/dot/sync/chain_processor_test.go b/internal/dot/sync/chain_processor_test.go similarity index 95% rename from dot/sync/chain_processor_test.go rename to internal/dot/sync/chain_processor_test.go index 8f2c594b81..49b023dade 100644 --- a/dot/sync/chain_processor_test.go +++ b/internal/dot/sync/chain_processor_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common/variadic" - "github.com/ChainSafe/gossamer/lib/transaction" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common/variadic" + "github.com/ChainSafe/gossamer/internal/lib/transaction" "github.com/stretchr/testify/require" ) diff --git a/dot/sync/chain_sync.go b/internal/dot/sync/chain_sync.go similarity index 99% rename from dot/sync/chain_sync.go rename to internal/dot/sync/chain_sync.go index f211c4d451..ba7ce6ee7f 100644 --- a/dot/sync/chain_sync.go +++ b/internal/dot/sync/chain_sync.go @@ -13,13 +13,13 @@ import ( "sync" "time" - "github.com/ChainSafe/gossamer/dot/peerset" + "github.com/ChainSafe/gossamer/internal/dot/peerset" "github.com/libp2p/go-libp2p-core/peer" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/common/variadic" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common/variadic" ) const ( diff --git a/dot/sync/chain_sync_test.go b/internal/dot/sync/chain_sync_test.go similarity index 98% rename from dot/sync/chain_sync_test.go rename to internal/dot/sync/chain_sync_test.go index 232bd65953..f09ebf100f 100644 --- a/dot/sync/chain_sync_test.go +++ b/internal/dot/sync/chain_sync_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/network" - syncmocks "github.com/ChainSafe/gossamer/dot/sync/mocks" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/common/variadic" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/network" + syncmocks "github.com/ChainSafe/gossamer/internal/dot/sync/mocks" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common/variadic" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/libp2p/go-libp2p-core/peer" diff --git a/dot/sync/disjoint_block_set.go b/internal/dot/sync/disjoint_block_set.go similarity index 98% rename from dot/sync/disjoint_block_set.go rename to internal/dot/sync/disjoint_block_set.go index d7e33875d9..9041cbc759 100644 --- a/dot/sync/disjoint_block_set.go +++ b/internal/dot/sync/disjoint_block_set.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" ) const ( diff --git a/dot/sync/disjoint_block_set_test.go b/internal/dot/sync/disjoint_block_set_test.go similarity index 98% rename from dot/sync/disjoint_block_set_test.go rename to internal/dot/sync/disjoint_block_set_test.go index eb752851f6..92a6b8cdf9 100644 --- a/dot/sync/disjoint_block_set_test.go +++ b/internal/dot/sync/disjoint_block_set_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/stretchr/testify/require" ) diff --git a/dot/sync/errors.go b/internal/dot/sync/errors.go similarity index 100% rename from dot/sync/errors.go rename to internal/dot/sync/errors.go diff --git a/dot/sync/interface.go b/internal/dot/sync/interface.go similarity index 91% rename from dot/sync/interface.go rename to internal/dot/sync/interface.go index 7d22b6a812..2b2e4a0805 100644 --- a/dot/sync/interface.go +++ b/internal/dot/sync/interface.go @@ -7,12 +7,12 @@ import ( "math/big" "sync" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/peerset" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/runtime" - rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/peerset" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + rtstorage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" "github.com/libp2p/go-libp2p-core/peer" ) diff --git a/dot/sync/message.go b/internal/dot/sync/message.go similarity index 98% rename from dot/sync/message.go rename to internal/dot/sync/message.go index fe0d4761b6..35edc5fdb4 100644 --- a/dot/sync/message.go +++ b/internal/dot/sync/message.go @@ -7,9 +7,9 @@ import ( "fmt" "math/big" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" ) const ( diff --git a/dot/sync/message_test.go b/internal/dot/sync/message_test.go similarity index 98% rename from dot/sync/message_test.go rename to internal/dot/sync/message_test.go index 2f7b4ffc12..417f5d269b 100644 --- a/dot/sync/message_test.go +++ b/internal/dot/sync/message_test.go @@ -7,11 +7,11 @@ import ( "math/big" "testing" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common/variadic" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common/variadic" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/stretchr/testify/require" ) diff --git a/dot/sync/mocks/babe_verifier.go b/internal/dot/sync/mocks/babe_verifier.go similarity index 90% rename from dot/sync/mocks/babe_verifier.go rename to internal/dot/sync/mocks/babe_verifier.go index 34477841ce..85dc279232 100644 --- a/dot/sync/mocks/babe_verifier.go +++ b/internal/dot/sync/mocks/babe_verifier.go @@ -5,7 +5,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - types "github.com/ChainSafe/gossamer/dot/types" + types "github.com/ChainSafe/gossamer/internal/dot/types" ) // BabeVerifier is an autogenerated mock type for the BabeVerifier type diff --git a/dot/sync/mocks/block_import_handler.go b/internal/dot/sync/mocks/block_import_handler.go similarity index 83% rename from dot/sync/mocks/block_import_handler.go rename to internal/dot/sync/mocks/block_import_handler.go index 342128f355..d5b34a7293 100644 --- a/dot/sync/mocks/block_import_handler.go +++ b/internal/dot/sync/mocks/block_import_handler.go @@ -3,10 +3,10 @@ package mocks import ( - storage "github.com/ChainSafe/gossamer/lib/runtime/storage" + storage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" mock "github.com/stretchr/testify/mock" - types "github.com/ChainSafe/gossamer/dot/types" + types "github.com/ChainSafe/gossamer/internal/dot/types" ) // BlockImportHandler is an autogenerated mock type for the BlockImportHandler type diff --git a/dot/sync/mocks/block_state.go b/internal/dot/sync/mocks/block_state.go similarity index 98% rename from dot/sync/mocks/block_state.go rename to internal/dot/sync/mocks/block_state.go index a8ef319dc5..5f800a8397 100644 --- a/dot/sync/mocks/block_state.go +++ b/internal/dot/sync/mocks/block_state.go @@ -5,12 +5,12 @@ package mocks import ( big "math/big" - common "github.com/ChainSafe/gossamer/lib/common" + common "github.com/ChainSafe/gossamer/internal/lib/common" mock "github.com/stretchr/testify/mock" - runtime "github.com/ChainSafe/gossamer/lib/runtime" + runtime "github.com/ChainSafe/gossamer/internal/lib/runtime" - types "github.com/ChainSafe/gossamer/dot/types" + types "github.com/ChainSafe/gossamer/internal/dot/types" ) // BlockState is an autogenerated mock type for the BlockState type diff --git a/dot/sync/mocks/finality_gadget.go b/internal/dot/sync/mocks/finality_gadget.go similarity index 90% rename from dot/sync/mocks/finality_gadget.go rename to internal/dot/sync/mocks/finality_gadget.go index 752753ebf2..7e5349a737 100644 --- a/dot/sync/mocks/finality_gadget.go +++ b/internal/dot/sync/mocks/finality_gadget.go @@ -3,7 +3,7 @@ package mocks import ( - common "github.com/ChainSafe/gossamer/lib/common" + common "github.com/ChainSafe/gossamer/internal/lib/common" mock "github.com/stretchr/testify/mock" ) diff --git a/dot/sync/mocks/network.go b/internal/dot/sync/mocks/network.go similarity index 88% rename from dot/sync/mocks/network.go rename to internal/dot/sync/mocks/network.go index 6f506ec05c..00076e5d3f 100644 --- a/dot/sync/mocks/network.go +++ b/internal/dot/sync/mocks/network.go @@ -3,14 +3,14 @@ package mocks import ( - common "github.com/ChainSafe/gossamer/lib/common" + common "github.com/ChainSafe/gossamer/internal/lib/common" mock "github.com/stretchr/testify/mock" - network "github.com/ChainSafe/gossamer/dot/network" + network "github.com/ChainSafe/gossamer/internal/dot/network" peer "github.com/libp2p/go-libp2p-core/peer" - peerset "github.com/ChainSafe/gossamer/dot/peerset" + peerset "github.com/ChainSafe/gossamer/internal/dot/peerset" ) // Network is an autogenerated mock type for the Network type diff --git a/dot/sync/outliers.go b/internal/dot/sync/outliers.go similarity index 100% rename from dot/sync/outliers.go rename to internal/dot/sync/outliers.go diff --git a/dot/sync/outliers_test.go b/internal/dot/sync/outliers_test.go similarity index 100% rename from dot/sync/outliers_test.go rename to internal/dot/sync/outliers_test.go diff --git a/dot/sync/syncer.go b/internal/dot/sync/syncer.go similarity index 97% rename from dot/sync/syncer.go rename to internal/dot/sync/syncer.go index 70b7343e0f..78f898903b 100644 --- a/dot/sync/syncer.go +++ b/internal/dot/sync/syncer.go @@ -7,8 +7,8 @@ import ( "math/big" "time" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/types" "github.com/ChainSafe/gossamer/internal/log" "github.com/libp2p/go-libp2p-core/peer" diff --git a/dot/sync/syncer_test.go b/internal/dot/sync/syncer_test.go similarity index 86% rename from dot/sync/syncer_test.go rename to internal/dot/sync/syncer_test.go index dba8cf7c59..c4b09ea221 100644 --- a/dot/sync/syncer_test.go +++ b/internal/dot/sync/syncer_test.go @@ -11,20 +11,20 @@ import ( "github.com/stretchr/testify/mock" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/runtime" - rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/trie" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + rtstorage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" + "github.com/ChainSafe/gossamer/internal/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" "github.com/stretchr/testify/require" - "github.com/ChainSafe/gossamer/dot/sync/mocks" + "github.com/ChainSafe/gossamer/internal/dot/sync/mocks" ) func TestMain(m *testing.M) { @@ -145,7 +145,7 @@ func newTestSyncer(t *testing.T) *Service { } func newTestGenesisWithTrieAndHeader(t *testing.T) (*genesis.Genesis, *trie.Trie, *types.Header) { - fp := "../../chain/gssmr/genesis.json" + const fp = "../../chain/gssmr/genesis.json" gen, err := genesis.NewGenesisFromJSONRaw(fp) require.NoError(t, err) diff --git a/dot/sync/test_helpers.go b/internal/dot/sync/test_helpers.go similarity index 95% rename from dot/sync/test_helpers.go rename to internal/dot/sync/test_helpers.go index 4836e3cf30..672f6a6d55 100644 --- a/dot/sync/test_helpers.go +++ b/internal/dot/sync/test_helpers.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/runtime" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/runtime" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" diff --git a/dot/sync/tip_syncer.go b/internal/dot/sync/tip_syncer.go similarity index 98% rename from dot/sync/tip_syncer.go rename to internal/dot/sync/tip_syncer.go index f7fad5340d..859854a22d 100644 --- a/dot/sync/tip_syncer.go +++ b/internal/dot/sync/tip_syncer.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/lib/common" ) var _ workHandler = &tipSyncer{} diff --git a/dot/sync/tip_syncer_test.go b/internal/dot/sync/tip_syncer_test.go similarity index 97% rename from dot/sync/tip_syncer_test.go rename to internal/dot/sync/tip_syncer_test.go index b12fada0dd..a42fba7d83 100644 --- a/dot/sync/tip_syncer_test.go +++ b/internal/dot/sync/tip_syncer_test.go @@ -7,11 +7,11 @@ import ( "math/big" "testing" - "github.com/ChainSafe/gossamer/dot/network" - syncmocks "github.com/ChainSafe/gossamer/dot/sync/mocks" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/network" + syncmocks "github.com/ChainSafe/gossamer/internal/dot/sync/mocks" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/dot/sync/worker.go b/internal/dot/sync/worker.go similarity index 94% rename from dot/sync/worker.go rename to internal/dot/sync/worker.go index 9d12d5a4e8..093e96d952 100644 --- a/dot/sync/worker.go +++ b/internal/dot/sync/worker.go @@ -11,8 +11,8 @@ import ( "github.com/libp2p/go-libp2p-core/peer" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // workerState helps track the current worker set and set the upcoming worker ID diff --git a/dot/system/service.go b/internal/dot/system/service.go similarity index 92% rename from dot/system/service.go rename to internal/dot/system/service.go index 608620a951..a296fc361f 100644 --- a/dot/system/service.go +++ b/internal/dot/system/service.go @@ -4,8 +4,8 @@ package system import ( - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/genesis" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/genesis" ) // Service struct to hold rpc service data diff --git a/dot/system/service_test.go b/internal/dot/system/service_test.go similarity index 91% rename from dot/system/service_test.go rename to internal/dot/system/service_test.go index 5b6ef6ca45..397fae7e6a 100644 --- a/dot/system/service_test.go +++ b/internal/dot/system/service_test.go @@ -6,8 +6,8 @@ package system import ( "testing" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/genesis" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/genesis" "github.com/stretchr/testify/require" ) diff --git a/dot/telemetry/afg_authority_set.go b/internal/dot/telemetry/afg_authority_set.go similarity index 100% rename from dot/telemetry/afg_authority_set.go rename to internal/dot/telemetry/afg_authority_set.go diff --git a/dot/telemetry/afg_finalized_blocks_up_to.go b/internal/dot/telemetry/afg_finalized_blocks_up_to.go similarity index 93% rename from dot/telemetry/afg_finalized_blocks_up_to.go rename to internal/dot/telemetry/afg_finalized_blocks_up_to.go index 0b63c8559d..f8a836a03c 100644 --- a/dot/telemetry/afg_finalized_blocks_up_to.go +++ b/internal/dot/telemetry/afg_finalized_blocks_up_to.go @@ -4,7 +4,7 @@ package telemetry import ( - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // afgFinalizedBlocksUpToTM holds telemetry message of type `afg.finalized_blocks_up_to`, diff --git a/dot/telemetry/afg_received.go b/internal/dot/telemetry/afg_received.go similarity index 97% rename from dot/telemetry/afg_received.go rename to internal/dot/telemetry/afg_received.go index 299cd1e3cd..774bde2d07 100644 --- a/dot/telemetry/afg_received.go +++ b/internal/dot/telemetry/afg_received.go @@ -3,7 +3,7 @@ package telemetry -import "github.com/ChainSafe/gossamer/lib/common" +import "github.com/ChainSafe/gossamer/internal/lib/common" // AfG ("Al's Finality Gadget") is synonymous with GRANDPA. diff --git a/dot/telemetry/block_import.go b/internal/dot/telemetry/block_import.go similarity index 92% rename from dot/telemetry/block_import.go rename to internal/dot/telemetry/block_import.go index 230fc5169f..4e7d7a8c77 100644 --- a/dot/telemetry/block_import.go +++ b/internal/dot/telemetry/block_import.go @@ -6,7 +6,7 @@ package telemetry import ( "math/big" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // blockImportTM struct to hold block import telemetry messages diff --git a/dot/telemetry/notify_finalized.go b/internal/dot/telemetry/notify_finalized.go similarity index 92% rename from dot/telemetry/notify_finalized.go rename to internal/dot/telemetry/notify_finalized.go index 75501d37de..f409b58c41 100644 --- a/dot/telemetry/notify_finalized.go +++ b/internal/dot/telemetry/notify_finalized.go @@ -4,7 +4,7 @@ package telemetry import ( - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // notifyFinalizedTM holds `notify.finalized` telemetry message, which is diff --git a/dot/telemetry/prepared_block_for_proposing.go b/internal/dot/telemetry/prepared_block_for_proposing.go similarity index 93% rename from dot/telemetry/prepared_block_for_proposing.go rename to internal/dot/telemetry/prepared_block_for_proposing.go index aa9a45d014..5e2a82a72a 100644 --- a/dot/telemetry/prepared_block_for_proposing.go +++ b/internal/dot/telemetry/prepared_block_for_proposing.go @@ -4,7 +4,7 @@ package telemetry import ( - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // preparedBlockForProposingTM holds a 'prepared_block_for_proposing' telemetry diff --git a/dot/telemetry/system_connected.go b/internal/dot/telemetry/system_connected.go similarity index 95% rename from dot/telemetry/system_connected.go rename to internal/dot/telemetry/system_connected.go index 993285f05e..5376a959b2 100644 --- a/dot/telemetry/system_connected.go +++ b/internal/dot/telemetry/system_connected.go @@ -3,7 +3,7 @@ package telemetry -import "github.com/ChainSafe/gossamer/lib/common" +import "github.com/ChainSafe/gossamer/internal/lib/common" // systemConnectedTM struct to hold system connected telemetry messages type systemConnectedTM struct { diff --git a/dot/telemetry/system_interval.go b/internal/dot/telemetry/system_interval.go similarity index 96% rename from dot/telemetry/system_interval.go rename to internal/dot/telemetry/system_interval.go index fa6128ca35..bad600aa4a 100644 --- a/dot/telemetry/system_interval.go +++ b/internal/dot/telemetry/system_interval.go @@ -6,7 +6,7 @@ package telemetry import ( "math/big" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // systemIntervalTM struct to hold system interval telemetry messages diff --git a/dot/telemetry/telemetry.go b/internal/dot/telemetry/telemetry.go similarity index 98% rename from dot/telemetry/telemetry.go rename to internal/dot/telemetry/telemetry.go index 6d4282ecae..fb59e51a18 100644 --- a/dot/telemetry/telemetry.go +++ b/internal/dot/telemetry/telemetry.go @@ -9,8 +9,8 @@ import ( "sync" "time" + "github.com/ChainSafe/gossamer/internal/lib/genesis" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/genesis" "github.com/gorilla/websocket" ) diff --git a/dot/telemetry/telemetry_test.go b/internal/dot/telemetry/telemetry_test.go similarity index 98% rename from dot/telemetry/telemetry_test.go rename to internal/dot/telemetry/telemetry_test.go index 98410ce662..9c45d6d038 100644 --- a/dot/telemetry/telemetry_test.go +++ b/internal/dot/telemetry/telemetry_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/genesis" "github.com/gorilla/websocket" "github.com/stretchr/testify/require" ) diff --git a/dot/telemetry/txpool_import.go b/internal/dot/telemetry/txpool_import.go similarity index 100% rename from dot/telemetry/txpool_import.go rename to internal/dot/telemetry/txpool_import.go diff --git a/dot/types/account.go b/internal/dot/types/account.go similarity index 100% rename from dot/types/account.go rename to internal/dot/types/account.go diff --git a/dot/types/authority.go b/internal/dot/types/authority.go similarity index 92% rename from dot/types/authority.go rename to internal/dot/types/authority.go index 7d721d1d2d..cd41a6a62a 100644 --- a/dot/types/authority.go +++ b/internal/dot/types/authority.go @@ -7,9 +7,9 @@ import ( "encoding/binary" "io" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" ) // Authority struct to hold authority data diff --git a/dot/types/babe.go b/internal/dot/types/babe.go similarity index 100% rename from dot/types/babe.go rename to internal/dot/types/babe.go diff --git a/dot/types/babe_digest.go b/internal/dot/types/babe_digest.go similarity index 98% rename from dot/types/babe_digest.go rename to internal/dot/types/babe_digest.go index b490d16181..208e3741c4 100644 --- a/dot/types/babe_digest.go +++ b/internal/dot/types/babe_digest.go @@ -6,7 +6,7 @@ package types import ( "errors" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/types/babe_digest_test.go b/internal/dot/types/babe_digest_test.go similarity index 97% rename from dot/types/babe_digest_test.go rename to internal/dot/types/babe_digest_test.go index a6dffb71fc..bdf89728b7 100644 --- a/dot/types/babe_digest_test.go +++ b/internal/dot/types/babe_digest_test.go @@ -6,7 +6,7 @@ package types import ( "testing" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" diff --git a/dot/types/babe_test.go b/internal/dot/types/babe_test.go similarity index 94% rename from dot/types/babe_test.go rename to internal/dot/types/babe_test.go index 7cce7fca80..3515b8c5f4 100644 --- a/dot/types/babe_test.go +++ b/internal/dot/types/babe_test.go @@ -7,8 +7,8 @@ import ( "bytes" "testing" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/keystore" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" diff --git a/dot/types/block.go b/internal/dot/types/block.go similarity index 100% rename from dot/types/block.go rename to internal/dot/types/block.go diff --git a/dot/types/block_data.go b/internal/dot/types/block_data.go similarity index 96% rename from dot/types/block_data.go rename to internal/dot/types/block_data.go index b698ccd9fa..a3761db461 100644 --- a/dot/types/block_data.go +++ b/internal/dot/types/block_data.go @@ -7,7 +7,7 @@ import ( "fmt" "math/big" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // BlockData is stored within the BlockDB diff --git a/dot/types/block_data_test.go b/internal/dot/types/block_data_test.go similarity index 98% rename from dot/types/block_data_test.go rename to internal/dot/types/block_data_test.go index 448fec4137..9d5328e3cd 100644 --- a/dot/types/block_data_test.go +++ b/internal/dot/types/block_data_test.go @@ -7,7 +7,7 @@ import ( "math/big" "testing" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" ) diff --git a/dot/types/block_test.go b/internal/dot/types/block_test.go similarity index 98% rename from dot/types/block_test.go rename to internal/dot/types/block_test.go index 36e76e6138..4ea63eb4e1 100644 --- a/dot/types/block_test.go +++ b/internal/dot/types/block_test.go @@ -8,7 +8,7 @@ import ( "math/big" "testing" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" diff --git a/dot/types/body.go b/internal/dot/types/body.go similarity index 98% rename from dot/types/body.go rename to internal/dot/types/body.go index 9b00b05c7c..48acc0bf75 100644 --- a/dot/types/body.go +++ b/internal/dot/types/body.go @@ -8,7 +8,7 @@ import ( "fmt" "math/big" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/types/body_test.go b/internal/dot/types/body_test.go similarity index 96% rename from dot/types/body_test.go rename to internal/dot/types/body_test.go index d27f9f8048..97367de49f 100644 --- a/dot/types/body_test.go +++ b/internal/dot/types/body_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" ) diff --git a/dot/types/consensus_digest.go b/internal/dot/types/consensus_digest.go similarity index 100% rename from dot/types/consensus_digest.go rename to internal/dot/types/consensus_digest.go diff --git a/dot/types/consensus_digest_test.go b/internal/dot/types/consensus_digest_test.go similarity index 87% rename from dot/types/consensus_digest_test.go rename to internal/dot/types/consensus_digest_test.go index 475bc2edbe..2764f96562 100644 --- a/dot/types/consensus_digest_test.go +++ b/internal/dot/types/consensus_digest_test.go @@ -6,9 +6,9 @@ package types import ( "testing" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/keystore" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" diff --git a/dot/types/digest.go b/internal/dot/types/digest.go similarity index 98% rename from dot/types/digest.go rename to internal/dot/types/digest.go index 73894c160a..109614010f 100644 --- a/dot/types/digest.go +++ b/internal/dot/types/digest.go @@ -6,7 +6,7 @@ package types import ( "fmt" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/types/digest_test.go b/internal/dot/types/digest_test.go similarity index 99% rename from dot/types/digest_test.go rename to internal/dot/types/digest_test.go index 70ae93266c..c5d099b371 100644 --- a/dot/types/digest_test.go +++ b/internal/dot/types/digest_test.go @@ -7,7 +7,7 @@ import ( "bytes" "testing" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" ) diff --git a/dot/types/extrinsic.go b/internal/dot/types/extrinsic.go similarity index 96% rename from dot/types/extrinsic.go rename to internal/dot/types/extrinsic.go index e4851fbbae..80300096a2 100644 --- a/dot/types/extrinsic.go +++ b/internal/dot/types/extrinsic.go @@ -6,7 +6,7 @@ package types import ( "bytes" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/centrifuge/go-substrate-rpc-client/v3/scale" ctypes "github.com/centrifuge/go-substrate-rpc-client/v3/types" ) diff --git a/dot/types/grandpa.go b/internal/dot/types/grandpa.go similarity index 97% rename from dot/types/grandpa.go rename to internal/dot/types/grandpa.go index 6d098d834e..92478f9e2e 100644 --- a/dot/types/grandpa.go +++ b/internal/dot/types/grandpa.go @@ -6,8 +6,8 @@ package types import ( "fmt" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/types/grandpa_test.go b/internal/dot/types/grandpa_test.go similarity index 97% rename from dot/types/grandpa_test.go rename to internal/dot/types/grandpa_test.go index 16f87cb669..51cba044d6 100644 --- a/dot/types/grandpa_test.go +++ b/internal/dot/types/grandpa_test.go @@ -6,7 +6,7 @@ package types import ( "testing" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" diff --git a/dot/types/header.go b/internal/dot/types/header.go similarity index 98% rename from dot/types/header.go rename to internal/dot/types/header.go index b02e4bfe4b..bb9c9e3965 100644 --- a/dot/types/header.go +++ b/internal/dot/types/header.go @@ -8,7 +8,7 @@ import ( "fmt" "math/big" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/dot/types/header_test.go b/internal/dot/types/header_test.go similarity index 98% rename from dot/types/header_test.go rename to internal/dot/types/header_test.go index 3fd173b462..6533f79c22 100644 --- a/dot/types/header_test.go +++ b/internal/dot/types/header_test.go @@ -7,7 +7,7 @@ import ( "math/big" "testing" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" diff --git a/dot/types/inherents.go b/internal/dot/types/inherents.go similarity index 100% rename from dot/types/inherents.go rename to internal/dot/types/inherents.go diff --git a/dot/types/roles.go b/internal/dot/types/roles.go similarity index 100% rename from dot/types/roles.go rename to internal/dot/types/roles.go diff --git a/dot/types/system.go b/internal/dot/types/system.go similarity index 100% rename from dot/types/system.go rename to internal/dot/types/system.go diff --git a/dot/types/tx.go b/internal/dot/types/tx.go similarity index 100% rename from dot/types/tx.go rename to internal/dot/types/tx.go diff --git a/dot/utils.go b/internal/dot/utils.go similarity index 95% rename from dot/utils.go rename to internal/dot/utils.go index 783d85fcb8..1bb4700c74 100644 --- a/dot/utils.go +++ b/internal/dot/utils.go @@ -13,12 +13,12 @@ import ( "strings" "testing" - ctoml "github.com/ChainSafe/gossamer/dot/config/toml" + ctoml "github.com/ChainSafe/gossamer/internal/dot/config/toml" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/utils" "github.com/cosmos/go-bip39" "github.com/naoina/toml" "github.com/stretchr/testify/require" diff --git a/dot/utils_test.go b/internal/dot/utils_test.go similarity index 94% rename from dot/utils_test.go rename to internal/dot/utils_test.go index dea72bb607..2898a109e2 100644 --- a/dot/utils_test.go +++ b/internal/dot/utils_test.go @@ -7,9 +7,9 @@ import ( "os" "testing" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/trie" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/stretchr/testify/require" ) diff --git a/lib/babe/babe.go b/internal/lib/babe/babe.go similarity index 98% rename from lib/babe/babe.go rename to internal/lib/babe/babe.go index 5e77401510..d597a5593e 100644 --- a/lib/babe/babe.go +++ b/internal/lib/babe/babe.go @@ -11,11 +11,11 @@ import ( "sync" "time" - "github.com/ChainSafe/gossamer/dot/telemetry" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/telemetry" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/runtime" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/runtime" ethmetrics "github.com/ethereum/go-ethereum/metrics" ) diff --git a/lib/babe/babe_test.go b/internal/lib/babe/babe_test.go similarity index 93% rename from lib/babe/babe_test.go rename to internal/lib/babe/babe_test.go index 58f3a1a8c4..88a19fe2e0 100644 --- a/lib/babe/babe_test.go +++ b/internal/lib/babe/babe_test.go @@ -11,19 +11,19 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/core" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/core" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/babe/mocks" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + rtstorage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" + "github.com/ChainSafe/gossamer/internal/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/babe/mocks" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" - rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/trie" - "github.com/ChainSafe/gossamer/lib/utils" "github.com/ChainSafe/gossamer/pkg/scale" mock "github.com/stretchr/testify/mock" diff --git a/lib/babe/build.go b/internal/lib/babe/build.go similarity index 97% rename from lib/babe/build.go rename to internal/lib/babe/build.go index c24ff97ccd..425dafde0e 100644 --- a/lib/babe/build.go +++ b/internal/lib/babe/build.go @@ -10,11 +10,11 @@ import ( "math/big" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/transaction" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/transaction" "github.com/ChainSafe/gossamer/pkg/scale" ethmetrics "github.com/ethereum/go-ethereum/metrics" ) diff --git a/lib/babe/build_test.go b/internal/lib/babe/build_test.go similarity index 97% rename from lib/babe/build_test.go rename to internal/lib/babe/build_test.go index 111e34c094..840b3ff662 100644 --- a/lib/babe/build_test.go +++ b/internal/lib/babe/build_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/transaction" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/transaction" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/ChainSafe/gossamer/internal/log" diff --git a/lib/babe/crypto.go b/internal/lib/babe/crypto.go similarity index 97% rename from lib/babe/crypto.go rename to internal/lib/babe/crypto.go index f87a4800d2..a2c76f9170 100644 --- a/lib/babe/crypto.go +++ b/internal/lib/babe/crypto.go @@ -9,8 +9,8 @@ import ( "math" "math/big" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/gtank/merlin" ) diff --git a/lib/babe/crypto_test.go b/internal/lib/babe/crypto_test.go similarity index 100% rename from lib/babe/crypto_test.go rename to internal/lib/babe/crypto_test.go diff --git a/lib/babe/epoch.go b/internal/lib/babe/epoch.go similarity index 100% rename from lib/babe/epoch.go rename to internal/lib/babe/epoch.go diff --git a/lib/babe/epoch_test.go b/internal/lib/babe/epoch_test.go similarity index 96% rename from lib/babe/epoch_test.go rename to internal/lib/babe/epoch_test.go index 39876134ee..2bd3d0184c 100644 --- a/lib/babe/epoch_test.go +++ b/internal/lib/babe/epoch_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" "github.com/stretchr/testify/require" ) diff --git a/lib/babe/errors.go b/internal/lib/babe/errors.go similarity index 100% rename from lib/babe/errors.go rename to internal/lib/babe/errors.go diff --git a/lib/babe/errors_test.go b/internal/lib/babe/errors_test.go similarity index 100% rename from lib/babe/errors_test.go rename to internal/lib/babe/errors_test.go diff --git a/lib/babe/mocks/block_import_handler.go b/internal/lib/babe/mocks/block_import_handler.go similarity index 83% rename from lib/babe/mocks/block_import_handler.go rename to internal/lib/babe/mocks/block_import_handler.go index fcb01e9a0e..420d8f1cc5 100644 --- a/lib/babe/mocks/block_import_handler.go +++ b/internal/lib/babe/mocks/block_import_handler.go @@ -3,8 +3,8 @@ package mocks import ( - types "github.com/ChainSafe/gossamer/dot/types" - storage "github.com/ChainSafe/gossamer/lib/runtime/storage" + types "github.com/ChainSafe/gossamer/internal/dot/types" + storage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" mock "github.com/stretchr/testify/mock" ) diff --git a/lib/babe/secondary.go b/internal/lib/babe/secondary.go similarity index 92% rename from lib/babe/secondary.go rename to internal/lib/babe/secondary.go index 16c145ae1e..2541f2c561 100644 --- a/lib/babe/secondary.go +++ b/internal/lib/babe/secondary.go @@ -7,9 +7,9 @@ import ( "encoding/binary" "math/big" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" ) func getSecondarySlotAuthor(slot uint64, numAuths int, randomness Randomness) (uint32, error) { diff --git a/lib/babe/secondary_test.go b/internal/lib/babe/secondary_test.go similarity index 94% rename from lib/babe/secondary_test.go rename to internal/lib/babe/secondary_test.go index b94d892d7b..34db7cf94d 100644 --- a/lib/babe/secondary_test.go +++ b/internal/lib/babe/secondary_test.go @@ -6,8 +6,8 @@ package babe import ( "testing" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" "github.com/stretchr/testify/require" ) diff --git a/lib/babe/state.go b/internal/lib/babe/state.go similarity index 90% rename from lib/babe/state.go rename to internal/lib/babe/state.go index af9c9931b1..a6d44efdd0 100644 --- a/lib/babe/state.go +++ b/internal/lib/babe/state.go @@ -8,11 +8,11 @@ import ( "sync" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/runtime" - rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/transaction" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + rtstorage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/transaction" ) // BlockState interface for block state methods diff --git a/lib/babe/types.go b/internal/lib/babe/types.go similarity index 93% rename from lib/babe/types.go rename to internal/lib/babe/types.go index 30a5bd96c3..e6864c9c03 100644 --- a/lib/babe/types.go +++ b/internal/lib/babe/types.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/lib/babe/verify.go b/internal/lib/babe/verify.go similarity index 98% rename from lib/babe/verify.go rename to internal/lib/babe/verify.go index 15fd8c8591..cb654a1adb 100644 --- a/lib/babe/verify.go +++ b/internal/lib/babe/verify.go @@ -9,9 +9,9 @@ import ( "math/big" "sync" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/lib/babe/verify_test.go b/internal/lib/babe/verify_test.go similarity index 97% rename from lib/babe/verify_test.go rename to internal/lib/babe/verify_test.go index d63e442a98..92d50cea32 100644 --- a/lib/babe/verify_test.go +++ b/internal/lib/babe/verify_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/genesis" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/genesis" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" ) diff --git a/lib/blocktree/blocktree.go b/internal/lib/blocktree/blocktree.go similarity index 98% rename from lib/blocktree/blocktree.go rename to internal/lib/blocktree/blocktree.go index f3aaf88da7..4a9a33ba99 100644 --- a/lib/blocktree/blocktree.go +++ b/internal/lib/blocktree/blocktree.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/runtime" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/runtime" "github.com/disiqueira/gotree" ) diff --git a/lib/blocktree/blocktree_test.go b/internal/lib/blocktree/blocktree_test.go similarity index 99% rename from lib/blocktree/blocktree_test.go rename to internal/lib/blocktree/blocktree_test.go index b7d2bc1639..4c59ae159e 100644 --- a/lib/blocktree/blocktree_test.go +++ b/internal/lib/blocktree/blocktree_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/stretchr/testify/require" ) diff --git a/lib/blocktree/errors.go b/internal/lib/blocktree/errors.go similarity index 100% rename from lib/blocktree/errors.go rename to internal/lib/blocktree/errors.go diff --git a/lib/blocktree/leaves.go b/internal/lib/blocktree/leaves.go similarity index 98% rename from lib/blocktree/leaves.go rename to internal/lib/blocktree/leaves.go index f7c1f4ecc0..84d7c69b03 100644 --- a/lib/blocktree/leaves.go +++ b/internal/lib/blocktree/leaves.go @@ -8,7 +8,7 @@ import ( "math/big" "sync" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // leafMap provides quick lookup for existing leaves diff --git a/lib/blocktree/node.go b/internal/lib/blocktree/node.go similarity index 98% rename from lib/blocktree/node.go rename to internal/lib/blocktree/node.go index 791584ffab..a979ac69eb 100644 --- a/lib/blocktree/node.go +++ b/internal/lib/blocktree/node.go @@ -8,7 +8,7 @@ import ( "math/big" "time" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/disiqueira/gotree" ) diff --git a/lib/blocktree/node_test.go b/internal/lib/blocktree/node_test.go similarity index 100% rename from lib/blocktree/node_test.go rename to internal/lib/blocktree/node_test.go diff --git a/lib/common/address.go b/internal/lib/common/address.go similarity index 100% rename from lib/common/address.go rename to internal/lib/common/address.go diff --git a/lib/common/common.go b/internal/lib/common/common.go similarity index 100% rename from lib/common/common.go rename to internal/lib/common/common.go diff --git a/lib/common/common_test.go b/internal/lib/common/common_test.go similarity index 100% rename from lib/common/common_test.go rename to internal/lib/common/common_test.go diff --git a/lib/common/db_keys.go b/internal/lib/common/db_keys.go similarity index 100% rename from lib/common/db_keys.go rename to internal/lib/common/db_keys.go diff --git a/lib/common/hash.go b/internal/lib/common/hash.go similarity index 100% rename from lib/common/hash.go rename to internal/lib/common/hash.go diff --git a/lib/common/hash_test.go b/internal/lib/common/hash_test.go similarity index 100% rename from lib/common/hash_test.go rename to internal/lib/common/hash_test.go diff --git a/lib/common/hasher.go b/internal/lib/common/hasher.go similarity index 100% rename from lib/common/hasher.go rename to internal/lib/common/hasher.go diff --git a/lib/common/hasher_test.go b/internal/lib/common/hasher_test.go similarity index 97% rename from lib/common/hasher_test.go rename to internal/lib/common/hasher_test.go index c347838030..92c5ec86c9 100644 --- a/lib/common/hasher_test.go +++ b/internal/lib/common/hasher_test.go @@ -6,7 +6,7 @@ package common_test import ( "testing" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/stretchr/testify/require" ) diff --git a/lib/common/network.go b/internal/lib/common/network.go similarity index 100% rename from lib/common/network.go rename to internal/lib/common/network.go diff --git a/lib/common/network_test.go b/internal/lib/common/network_test.go similarity index 100% rename from lib/common/network_test.go rename to internal/lib/common/network_test.go diff --git a/lib/common/types/errors.go b/internal/lib/common/types/errors.go similarity index 100% rename from lib/common/types/errors.go rename to internal/lib/common/types/errors.go diff --git a/lib/common/types/result.go b/internal/lib/common/types/result.go similarity index 95% rename from lib/common/types/result.go rename to internal/lib/common/types/result.go index 2bc663e224..91a3acbf70 100644 --- a/lib/common/types/result.go +++ b/internal/lib/common/types/result.go @@ -7,7 +7,7 @@ import ( "errors" "io" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // Result represents a Result type. diff --git a/lib/common/variadic/uint64OrHash.go b/internal/lib/common/variadic/uint64OrHash.go similarity index 98% rename from lib/common/variadic/uint64OrHash.go rename to internal/lib/common/variadic/uint64OrHash.go index 2e45a731bc..642c61d626 100644 --- a/lib/common/variadic/uint64OrHash.go +++ b/internal/lib/common/variadic/uint64OrHash.go @@ -8,7 +8,7 @@ import ( "errors" "io" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // Uint64OrHash represents an optional interface type (int,hash). diff --git a/lib/common/variadic/uint64OrHash_test.go b/internal/lib/common/variadic/uint64OrHash_test.go similarity index 97% rename from lib/common/variadic/uint64OrHash_test.go rename to internal/lib/common/variadic/uint64OrHash_test.go index 3ba4250bbb..626ce5b723 100644 --- a/lib/common/variadic/uint64OrHash_test.go +++ b/internal/lib/common/variadic/uint64OrHash_test.go @@ -7,7 +7,7 @@ import ( "encoding/binary" "testing" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/stretchr/testify/require" ) diff --git a/lib/common/well_known_keys.go b/internal/lib/common/well_known_keys.go similarity index 100% rename from lib/common/well_known_keys.go rename to internal/lib/common/well_known_keys.go diff --git a/lib/crypto/ed25519/ed25519.go b/internal/lib/crypto/ed25519/ed25519.go similarity index 98% rename from lib/crypto/ed25519/ed25519.go rename to internal/lib/crypto/ed25519/ed25519.go index 28ab6c34d2..e9caebb234 100644 --- a/lib/crypto/ed25519/ed25519.go +++ b/internal/lib/crypto/ed25519/ed25519.go @@ -11,8 +11,8 @@ import ( "fmt" "io" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" "github.com/ChainSafe/go-schnorrkel" ) diff --git a/lib/crypto/ed25519/ed25519_test.go b/internal/lib/crypto/ed25519/ed25519_test.go similarity index 97% rename from lib/crypto/ed25519/ed25519_test.go rename to internal/lib/crypto/ed25519/ed25519_test.go index 765c493741..46d7fac699 100644 --- a/lib/crypto/ed25519/ed25519_test.go +++ b/internal/lib/crypto/ed25519/ed25519_test.go @@ -9,8 +9,8 @@ import ( "reflect" "testing" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" bip39 "github.com/cosmos/go-bip39" "github.com/stretchr/testify/require" diff --git a/lib/crypto/keypair.go b/internal/lib/crypto/keypair.go similarity index 97% rename from lib/crypto/keypair.go rename to internal/lib/crypto/keypair.go index 01f5038b22..cb077a8867 100644 --- a/lib/crypto/keypair.go +++ b/internal/lib/crypto/keypair.go @@ -4,7 +4,7 @@ package crypto import ( - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/btcsuite/btcutil/base58" bip39 "github.com/cosmos/go-bip39" diff --git a/lib/crypto/keypair_test.go b/internal/lib/crypto/keypair_test.go similarity index 82% rename from lib/crypto/keypair_test.go rename to internal/lib/crypto/keypair_test.go index 75ff166950..d7dff3a714 100644 --- a/lib/crypto/keypair_test.go +++ b/internal/lib/crypto/keypair_test.go @@ -6,8 +6,8 @@ package crypto_test import ( "testing" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" "github.com/stretchr/testify/require" ) diff --git a/lib/crypto/secp256k1/secp256k1.go b/internal/lib/crypto/secp256k1/secp256k1.go similarity index 98% rename from lib/crypto/secp256k1/secp256k1.go rename to internal/lib/crypto/secp256k1/secp256k1.go index dc4790ae8c..7c012cdba3 100644 --- a/lib/crypto/secp256k1/secp256k1.go +++ b/internal/lib/crypto/secp256k1/secp256k1.go @@ -9,8 +9,8 @@ import ( "errors" "fmt" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" secp256k1 "github.com/ethereum/go-ethereum/crypto" ) diff --git a/lib/crypto/secp256k1/secp256k1_test.go b/internal/lib/crypto/secp256k1/secp256k1_test.go similarity index 97% rename from lib/crypto/secp256k1/secp256k1_test.go rename to internal/lib/crypto/secp256k1/secp256k1_test.go index a0aaecacc5..e25cb358c2 100644 --- a/lib/crypto/secp256k1/secp256k1_test.go +++ b/internal/lib/crypto/secp256k1/secp256k1_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" "github.com/stretchr/testify/require" ) diff --git a/lib/crypto/sig_verifier.go b/internal/lib/crypto/sig_verifier.go similarity index 100% rename from lib/crypto/sig_verifier.go rename to internal/lib/crypto/sig_verifier.go diff --git a/lib/crypto/sig_verifier_test.go b/internal/lib/crypto/sig_verifier_test.go similarity index 92% rename from lib/crypto/sig_verifier_test.go rename to internal/lib/crypto/sig_verifier_test.go index fcaec07b88..c4c0c6ca4e 100644 --- a/lib/crypto/sig_verifier_test.go +++ b/internal/lib/crypto/sig_verifier_test.go @@ -7,11 +7,11 @@ import ( "io" "testing" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/secp256k1" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/secp256k1" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" "github.com/stretchr/testify/require" ) diff --git a/lib/crypto/sr25519/sr25519.go b/internal/lib/crypto/sr25519/sr25519.go similarity index 99% rename from lib/crypto/sr25519/sr25519.go rename to internal/lib/crypto/sr25519/sr25519.go index 799f720d54..70fbe8bf7e 100644 --- a/lib/crypto/sr25519/sr25519.go +++ b/internal/lib/crypto/sr25519/sr25519.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" sr25519 "github.com/ChainSafe/go-schnorrkel" "github.com/gtank/merlin" diff --git a/lib/crypto/sr25519/sr25519_test.go b/internal/lib/crypto/sr25519/sr25519_test.go similarity index 98% rename from lib/crypto/sr25519/sr25519_test.go rename to internal/lib/crypto/sr25519/sr25519_test.go index 53fbfe7e52..bf2c170256 100644 --- a/lib/crypto/sr25519/sr25519_test.go +++ b/internal/lib/crypto/sr25519/sr25519_test.go @@ -9,7 +9,7 @@ import ( "fmt" "testing" - "github.com/ChainSafe/gossamer/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto" bip39 "github.com/cosmos/go-bip39" "github.com/gtank/merlin" "github.com/stretchr/testify/require" diff --git a/lib/crypto/transcript.go b/internal/lib/crypto/transcript.go similarity index 100% rename from lib/crypto/transcript.go rename to internal/lib/crypto/transcript.go diff --git a/lib/genesis/genesis.go b/internal/lib/genesis/genesis.go similarity index 98% rename from lib/genesis/genesis.go rename to internal/lib/genesis/genesis.go index 9d27cd0799..bf6e54ef7a 100644 --- a/lib/genesis/genesis.go +++ b/internal/lib/genesis/genesis.go @@ -4,7 +4,7 @@ package genesis import ( - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // Genesis stores the data parsed from the genesis configuration file diff --git a/lib/genesis/genesis_test.go b/internal/lib/genesis/genesis_test.go similarity index 100% rename from lib/genesis/genesis_test.go rename to internal/lib/genesis/genesis_test.go diff --git a/lib/genesis/helpers.go b/internal/lib/genesis/helpers.go similarity index 97% rename from lib/genesis/helpers.go rename to internal/lib/genesis/helpers.go index 2f826ecd5b..280013ee7f 100644 --- a/lib/genesis/helpers.go +++ b/internal/lib/genesis/helpers.go @@ -14,13 +14,13 @@ import ( "path/filepath" "reflect" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/lib/genesis/helpers_test.go b/internal/lib/genesis/helpers_test.go similarity index 99% rename from lib/genesis/helpers_test.go rename to internal/lib/genesis/helpers_test.go index 72c26bd908..83b0ef3a91 100644 --- a/lib/genesis/helpers_test.go +++ b/internal/lib/genesis/helpers_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/stretchr/testify/require" ) diff --git a/lib/genesis/pallet.go b/internal/lib/genesis/pallet.go similarity index 100% rename from lib/genesis/pallet.go rename to internal/lib/genesis/pallet.go diff --git a/lib/genesis/test_utils.go b/internal/lib/genesis/test_utils.go similarity index 87% rename from lib/genesis/test_utils.go rename to internal/lib/genesis/test_utils.go index 1751812a8c..a3845c4f8d 100644 --- a/lib/genesis/test_utils.go +++ b/internal/lib/genesis/test_utils.go @@ -10,9 +10,10 @@ import ( "os" "testing" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/stretchr/testify/require" ) @@ -111,11 +112,9 @@ func CreateTestGenesisJSONFile(asRaw bool) (string, error) { // NewTestGenesisWithTrieAndHeader generates genesis, genesis trie and genesis header func NewTestGenesisWithTrieAndHeader(t *testing.T) (*Genesis, *trie.Trie, *types.Header) { - gen, err := NewGenesisFromJSONRaw("../../chain/gssmr/genesis.json") - if err != nil { - gen, err = NewGenesisFromJSONRaw("../../../chain/gssmr/genesis.json") - require.NoError(t, err) - } + genesisPath := utils.GetGssmrGenesisRawPath() + gen, err := NewGenesisFromJSONRaw(genesisPath) + require.NoError(t, err) tr, h := newGenesisTrieAndHeader(t, gen) return gen, tr, h @@ -123,11 +122,9 @@ func NewTestGenesisWithTrieAndHeader(t *testing.T) (*Genesis, *trie.Trie, *types // NewDevGenesisWithTrieAndHeader generates test dev genesis, genesis trie and genesis header func NewDevGenesisWithTrieAndHeader(t *testing.T) (*Genesis, *trie.Trie, *types.Header) { - gen, err := NewGenesisFromJSONRaw("../../chain/dev/genesis.json") - if err != nil { - gen, err = NewGenesisFromJSONRaw("../../../chain/dev/genesis.json") - require.NoError(t, err) - } + genesisPath := utils.GetDevGenesisPath() + gen, err := NewGenesisFromJSONRaw(genesisPath) + require.NoError(t, err) tr, h := newGenesisTrieAndHeader(t, gen) return gen, tr, h diff --git a/lib/grandpa/errors.go b/internal/lib/grandpa/errors.go similarity index 98% rename from lib/grandpa/errors.go rename to internal/lib/grandpa/errors.go index 46ce29dbf6..791bc0273d 100644 --- a/lib/grandpa/errors.go +++ b/internal/lib/grandpa/errors.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "github.com/ChainSafe/gossamer/lib/blocktree" + "github.com/ChainSafe/gossamer/internal/lib/blocktree" ) // errRoundMismatch is returned when trying to validate a vote message that isn't for the current round diff --git a/lib/grandpa/grandpa.go b/internal/lib/grandpa/grandpa.go similarity index 99% rename from lib/grandpa/grandpa.go rename to internal/lib/grandpa/grandpa.go index 0955dcbb7f..3bd42e2fea 100644 --- a/lib/grandpa/grandpa.go +++ b/internal/lib/grandpa/grandpa.go @@ -14,12 +14,12 @@ import ( "sync/atomic" "time" - "github.com/ChainSafe/gossamer/dot/telemetry" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/telemetry" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/blocktree" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/blocktree" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/lib/grandpa/grandpa_test.go b/internal/lib/grandpa/grandpa_test.go similarity index 98% rename from lib/grandpa/grandpa_test.go rename to internal/lib/grandpa/grandpa_test.go index 01d3c3f9c6..3829767e95 100644 --- a/lib/grandpa/grandpa_test.go +++ b/internal/lib/grandpa/grandpa_test.go @@ -12,21 +12,21 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/metrics" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/keystore" - rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/trie" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/dot/metrics" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + rtstorage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer" + "github.com/ChainSafe/gossamer/internal/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/stretchr/testify/require" - "github.com/ChainSafe/gossamer/lib/grandpa/mocks" + "github.com/ChainSafe/gossamer/internal/lib/grandpa/mocks" ethmetrics "github.com/ethereum/go-ethereum/metrics" ) diff --git a/lib/grandpa/message.go b/internal/lib/grandpa/message.go similarity index 96% rename from lib/grandpa/message.go rename to internal/lib/grandpa/message.go index 032462fea1..8b83d50345 100644 --- a/lib/grandpa/message.go +++ b/internal/lib/grandpa/message.go @@ -6,10 +6,10 @@ package grandpa import ( "fmt" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/lib/grandpa/message_handler.go b/internal/lib/grandpa/message_handler.go similarity index 97% rename from lib/grandpa/message_handler.go rename to internal/lib/grandpa/message_handler.go index 12285fc894..18d23b260f 100644 --- a/lib/grandpa/message_handler.go +++ b/internal/lib/grandpa/message_handler.go @@ -10,12 +10,12 @@ import ( "math/big" "reflect" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/telemetry" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/blocktree" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/telemetry" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/blocktree" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/libp2p/go-libp2p-core/peer" diff --git a/lib/grandpa/message_handler_test.go b/internal/lib/grandpa/message_handler_test.go similarity index 98% rename from lib/grandpa/message_handler_test.go rename to internal/lib/grandpa/message_handler_test.go index a7cec946ca..f52c082645 100644 --- a/lib/grandpa/message_handler_test.go +++ b/internal/lib/grandpa/message_handler_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/blocktree" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/keystore" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/blocktree" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/keystore" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" diff --git a/lib/grandpa/message_test.go b/internal/lib/grandpa/message_test.go similarity index 96% rename from lib/grandpa/message_test.go rename to internal/lib/grandpa/message_test.go index cbb4b67563..fd9cf25c8d 100644 --- a/lib/grandpa/message_test.go +++ b/internal/lib/grandpa/message_test.go @@ -7,10 +7,10 @@ import ( "math/big" "testing" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" diff --git a/lib/grandpa/message_tracker.go b/internal/lib/grandpa/message_tracker.go similarity index 93% rename from lib/grandpa/message_tracker.go rename to internal/lib/grandpa/message_tracker.go index d0fceea06b..882d3fd337 100644 --- a/lib/grandpa/message_tracker.go +++ b/internal/lib/grandpa/message_tracker.go @@ -6,9 +6,9 @@ package grandpa import ( "sync" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" ) // tracker keeps track of messages that have been received that have failed to validate with ErrBlockDoesNotExist diff --git a/lib/grandpa/message_tracker_test.go b/internal/lib/grandpa/message_tracker_test.go similarity index 95% rename from lib/grandpa/message_tracker_test.go rename to internal/lib/grandpa/message_tracker_test.go index e29c19eb5b..d33a5e2301 100644 --- a/lib/grandpa/message_tracker_test.go +++ b/internal/lib/grandpa/message_tracker_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/keystore" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/keystore" "github.com/stretchr/testify/require" ) diff --git a/lib/grandpa/mocks/digest_handler.go b/internal/lib/grandpa/mocks/digest_handler.go similarity index 100% rename from lib/grandpa/mocks/digest_handler.go rename to internal/lib/grandpa/mocks/digest_handler.go diff --git a/lib/grandpa/mocks/network.go b/internal/lib/grandpa/mocks/network.go similarity index 97% rename from lib/grandpa/mocks/network.go rename to internal/lib/grandpa/mocks/network.go index e33e9f3629..c872a72fba 100644 --- a/lib/grandpa/mocks/network.go +++ b/internal/lib/grandpa/mocks/network.go @@ -3,10 +3,9 @@ package mocks import ( - network "github.com/ChainSafe/gossamer/dot/network" - mock "github.com/stretchr/testify/mock" - + network "github.com/ChainSafe/gossamer/internal/dot/network" peer "github.com/libp2p/go-libp2p-core/peer" + mock "github.com/stretchr/testify/mock" protocol "github.com/libp2p/go-libp2p-core/protocol" ) diff --git a/lib/grandpa/network.go b/internal/lib/grandpa/network.go similarity index 97% rename from lib/grandpa/network.go rename to internal/lib/grandpa/network.go index a959d893a8..1cdb9391c5 100644 --- a/lib/grandpa/network.go +++ b/internal/lib/grandpa/network.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/libp2p/go-libp2p-core/peer" diff --git a/lib/grandpa/network_test.go b/internal/lib/grandpa/network_test.go similarity index 98% rename from lib/grandpa/network_test.go rename to internal/lib/grandpa/network_test.go index 5ad81031dc..9d431bc0e0 100644 --- a/lib/grandpa/network_test.go +++ b/internal/lib/grandpa/network_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/types" "github.com/libp2p/go-libp2p-core/peer" "github.com/stretchr/testify/require" diff --git a/lib/grandpa/round_test.go b/internal/lib/grandpa/round_test.go similarity index 97% rename from lib/grandpa/round_test.go rename to internal/lib/grandpa/round_test.go index 8975cab25b..ebedf05eae 100644 --- a/lib/grandpa/round_test.go +++ b/internal/lib/grandpa/round_test.go @@ -10,13 +10,13 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/keystore" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/keystore" "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/protocol" "github.com/stretchr/testify/require" diff --git a/lib/grandpa/state.go b/internal/lib/grandpa/state.go similarity index 94% rename from lib/grandpa/state.go rename to internal/lib/grandpa/state.go index 7ba4087449..14ec3cd196 100644 --- a/lib/grandpa/state.go +++ b/internal/lib/grandpa/state.go @@ -9,9 +9,9 @@ import ( "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/protocol" - "github.com/ChainSafe/gossamer/dot/network" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/network" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // BlockState is the interface required by GRANDPA into the block state diff --git a/lib/grandpa/testdata/data.3b1b0.zip b/internal/lib/grandpa/testdata/data.3b1b0.zip similarity index 100% rename from lib/grandpa/testdata/data.3b1b0.zip rename to internal/lib/grandpa/testdata/data.3b1b0.zip diff --git a/lib/grandpa/testdata/netdata.go b/internal/lib/grandpa/testdata/netdata.go similarity index 100% rename from lib/grandpa/testdata/netdata.go rename to internal/lib/grandpa/testdata/netdata.go diff --git a/lib/grandpa/types.go b/internal/lib/grandpa/types.go similarity index 94% rename from lib/grandpa/types.go rename to internal/lib/grandpa/types.go index 3a7b911f22..59155d9d7a 100644 --- a/lib/grandpa/types.go +++ b/internal/lib/grandpa/types.go @@ -6,9 +6,9 @@ package grandpa import ( "bytes" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" ) //nolint:revive diff --git a/lib/grandpa/types_test.go b/internal/lib/grandpa/types_test.go similarity index 93% rename from lib/grandpa/types_test.go rename to internal/lib/grandpa/types_test.go index 8487407e7b..c0235a2318 100644 --- a/lib/grandpa/types_test.go +++ b/internal/lib/grandpa/types_test.go @@ -6,10 +6,10 @@ package grandpa import ( "testing" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/grandpa/testdata" - "github.com/ChainSafe/gossamer/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/grandpa/testdata" + "github.com/ChainSafe/gossamer/internal/lib/keystore" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" ) diff --git a/lib/grandpa/vote_message.go b/internal/lib/grandpa/vote_message.go similarity index 97% rename from lib/grandpa/vote_message.go rename to internal/lib/grandpa/vote_message.go index b9b5c2bfb6..5541eb2945 100644 --- a/lib/grandpa/vote_message.go +++ b/internal/lib/grandpa/vote_message.go @@ -9,9 +9,9 @@ import ( "errors" "fmt" - "github.com/ChainSafe/gossamer/dot/telemetry" - "github.com/ChainSafe/gossamer/lib/blocktree" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/dot/telemetry" + "github.com/ChainSafe/gossamer/internal/lib/blocktree" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/libp2p/go-libp2p-core/peer" diff --git a/lib/grandpa/vote_message_test.go b/internal/lib/grandpa/vote_message_test.go similarity index 97% rename from lib/grandpa/vote_message_test.go rename to internal/lib/grandpa/vote_message_test.go index 5b05b0476d..667b8e6943 100644 --- a/lib/grandpa/vote_message_test.go +++ b/internal/lib/grandpa/vote_message_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/state" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/keystore" + "github.com/ChainSafe/gossamer/internal/dot/state" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/keystore" "github.com/stretchr/testify/require" ) diff --git a/lib/keystore/basic_keystore.go b/internal/lib/keystore/basic_keystore.go similarity index 95% rename from lib/keystore/basic_keystore.go rename to internal/lib/keystore/basic_keystore.go index e0890ed156..278283bd7c 100644 --- a/lib/keystore/basic_keystore.go +++ b/internal/lib/keystore/basic_keystore.go @@ -9,8 +9,8 @@ import ( "fmt" "sync" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" ) var ( diff --git a/lib/keystore/basic_keystore_test.go b/internal/lib/keystore/basic_keystore_test.go similarity index 92% rename from lib/keystore/basic_keystore_test.go rename to internal/lib/keystore/basic_keystore_test.go index 6013826eeb..3805344e12 100644 --- a/lib/keystore/basic_keystore_test.go +++ b/internal/lib/keystore/basic_keystore_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" ) var testPassword = []byte("1234") diff --git a/lib/keystore/encrypt.go b/internal/lib/keystore/encrypt.go similarity index 94% rename from lib/keystore/encrypt.go rename to internal/lib/keystore/encrypt.go index 7e132aa1b0..94399dee78 100644 --- a/lib/keystore/encrypt.go +++ b/internal/lib/keystore/encrypt.go @@ -14,10 +14,10 @@ import ( "os" "path/filepath" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/secp256k1" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/secp256k1" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" "golang.org/x/crypto/blake2b" ) diff --git a/lib/keystore/encrypt_test.go b/internal/lib/keystore/encrypt_test.go similarity index 93% rename from lib/keystore/encrypt_test.go rename to internal/lib/keystore/encrypt_test.go index 290abaa20f..b74c96eb3c 100644 --- a/lib/keystore/encrypt_test.go +++ b/internal/lib/keystore/encrypt_test.go @@ -11,9 +11,9 @@ import ( "reflect" "testing" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/secp256k1" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/secp256k1" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" ) func TestEncryptAndDecrypt(t *testing.T) { diff --git a/lib/keystore/generic_keystore.go b/internal/lib/keystore/generic_keystore.go similarity index 93% rename from lib/keystore/generic_keystore.go rename to internal/lib/keystore/generic_keystore.go index 9286f22bd6..52595b0698 100644 --- a/lib/keystore/generic_keystore.go +++ b/internal/lib/keystore/generic_keystore.go @@ -7,11 +7,11 @@ import ( "bytes" "sync" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/secp256k1" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/secp256k1" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" ) // GenericKeystore holds keys of any type diff --git a/lib/keystore/generic_keystore_test.go b/internal/lib/keystore/generic_keystore_test.go similarity index 92% rename from lib/keystore/generic_keystore_test.go rename to internal/lib/keystore/generic_keystore_test.go index 33029d3e42..d95b611e52 100644 --- a/lib/keystore/generic_keystore_test.go +++ b/internal/lib/keystore/generic_keystore_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/secp256k1" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/secp256k1" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" ) func TestGetSr25519PublicKeys(t *testing.T) { diff --git a/lib/keystore/helpers.go b/internal/lib/keystore/helpers.go similarity index 96% rename from lib/keystore/helpers.go rename to internal/lib/keystore/helpers.go index a4161ae5b8..d0b71152c1 100644 --- a/lib/keystore/helpers.go +++ b/internal/lib/keystore/helpers.go @@ -12,12 +12,12 @@ import ( "path/filepath" "strings" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/secp256k1" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/secp256k1" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/utils" ) // PrivateKeyToKeypair returns a public, private keypair given a private key diff --git a/lib/keystore/helpers_test.go b/internal/lib/keystore/helpers_test.go similarity index 97% rename from lib/keystore/helpers_test.go rename to internal/lib/keystore/helpers_test.go index dd7828a7bc..1095f6c7f8 100644 --- a/lib/keystore/helpers_test.go +++ b/internal/lib/keystore/helpers_test.go @@ -12,11 +12,11 @@ import ( "strings" "testing" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/stretchr/testify/require" ) diff --git a/lib/keystore/keyring.go b/internal/lib/keystore/keyring.go similarity index 95% rename from lib/keystore/keyring.go rename to internal/lib/keystore/keyring.go index caae986fb2..2295aca7f8 100644 --- a/lib/keystore/keyring.go +++ b/internal/lib/keystore/keyring.go @@ -6,10 +6,10 @@ package keystore import ( "reflect" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" ) // private keys generated using `subkey inspect //Name` diff --git a/lib/keystore/keyring_test.go b/internal/lib/keystore/keyring_test.go similarity index 93% rename from lib/keystore/keyring_test.go rename to internal/lib/keystore/keyring_test.go index 7ff06770b4..ca40e53c53 100644 --- a/lib/keystore/keyring_test.go +++ b/internal/lib/keystore/keyring_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" "github.com/stretchr/testify/require" ) diff --git a/lib/keystore/keystore.go b/internal/lib/keystore/keystore.go similarity index 94% rename from lib/keystore/keystore.go rename to internal/lib/keystore/keystore.go index e1e004ab09..8187793da4 100644 --- a/lib/keystore/keystore.go +++ b/internal/lib/keystore/keystore.go @@ -6,8 +6,8 @@ package keystore import ( "errors" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" ) var ( diff --git a/lib/runtime/allocator.go b/internal/lib/runtime/allocator.go similarity index 100% rename from lib/runtime/allocator.go rename to internal/lib/runtime/allocator.go diff --git a/lib/runtime/allocator_test.go b/internal/lib/runtime/allocator_test.go similarity index 100% rename from lib/runtime/allocator_test.go rename to internal/lib/runtime/allocator_test.go diff --git a/lib/runtime/common.go b/internal/lib/runtime/common.go similarity index 100% rename from lib/runtime/common.go rename to internal/lib/runtime/common.go diff --git a/lib/runtime/constants.go b/internal/lib/runtime/constants.go similarity index 98% rename from lib/runtime/constants.go rename to internal/lib/runtime/constants.go index e317bfa688..36b653930c 100644 --- a/lib/runtime/constants.go +++ b/internal/lib/runtime/constants.go @@ -4,7 +4,7 @@ package runtime import ( - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) var runtimes = []string{HOST_API_TEST_RUNTIME, POLKADOT_RUNTIME, NODE_RUNTIME, DEV_RUNTIME} diff --git a/lib/runtime/errors.go b/internal/lib/runtime/errors.go similarity index 100% rename from lib/runtime/errors.go rename to internal/lib/runtime/errors.go diff --git a/lib/runtime/interface.go b/internal/lib/runtime/interface.go similarity index 91% rename from lib/runtime/interface.go rename to internal/lib/runtime/interface.go index 2f4bb78ad2..a2f794bde6 100644 --- a/lib/runtime/interface.go +++ b/internal/lib/runtime/interface.go @@ -4,11 +4,11 @@ package runtime import ( - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/transaction" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/transaction" + "github.com/ChainSafe/gossamer/internal/lib/trie" ) //go:generate mockery --name Instance --structname Instance --case underscore --keeptree diff --git a/lib/runtime/life/exports.go b/internal/lib/runtime/life/exports.go similarity index 96% rename from lib/runtime/life/exports.go rename to internal/lib/runtime/life/exports.go index 5e8f3caaee..431f97e83a 100644 --- a/lib/runtime/life/exports.go +++ b/internal/lib/runtime/life/exports.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/transaction" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/transaction" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/lib/runtime/life/exports_test.go b/internal/lib/runtime/life/exports_test.go similarity index 96% rename from lib/runtime/life/exports_test.go rename to internal/lib/runtime/life/exports_test.go index 30fb753346..424a4e762a 100644 --- a/lib/runtime/life/exports_test.go +++ b/internal/lib/runtime/life/exports_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" ) diff --git a/lib/runtime/life/instance.go b/internal/lib/runtime/life/instance.go similarity index 95% rename from lib/runtime/life/instance.go rename to internal/lib/runtime/life/instance.go index f5d50f2732..34ec5c2f4a 100644 --- a/lib/runtime/life/instance.go +++ b/internal/lib/runtime/life/instance.go @@ -10,11 +10,11 @@ import ( "path/filepath" "sync" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" "github.com/perlin-network/life/exec" wasm_validation "github.com/perlin-network/life/wasm-validation" diff --git a/lib/runtime/life/resolver.go b/internal/lib/runtime/life/resolver.go similarity index 98% rename from lib/runtime/life/resolver.go rename to internal/lib/runtime/life/resolver.go index 08457fb3d2..1b4103293b 100644 --- a/lib/runtime/life/resolver.go +++ b/internal/lib/runtime/life/resolver.go @@ -10,14 +10,14 @@ import ( "fmt" "math/big" - "github.com/ChainSafe/gossamer/lib/common" - rtype "github.com/ChainSafe/gossamer/lib/common/types" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/secp256k1" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/common" + rtype "github.com/ChainSafe/gossamer/internal/lib/common/types" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/secp256k1" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/perlin-network/life/exec" ) diff --git a/lib/runtime/life/resolver_test.go b/internal/lib/runtime/life/resolver_test.go similarity index 97% rename from lib/runtime/life/resolver_test.go rename to internal/lib/runtime/life/resolver_test.go index f334c05b4e..e5e4dc3cc2 100644 --- a/lib/runtime/life/resolver_test.go +++ b/internal/lib/runtime/life/resolver_test.go @@ -9,16 +9,16 @@ import ( "sort" "testing" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/common/types" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/secp256k1" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common/types" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/secp256k1" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" ) diff --git a/lib/runtime/life/test_helpers.go b/internal/lib/runtime/life/test_helpers.go similarity index 90% rename from lib/runtime/life/test_helpers.go rename to internal/lib/runtime/life/test_helpers.go index b6e448dd07..4b89091ea8 100644 --- a/lib/runtime/life/test_helpers.go +++ b/internal/lib/runtime/life/test_helpers.go @@ -7,11 +7,11 @@ import ( "path/filepath" "testing" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/trie" "github.com/stretchr/testify/require" ) diff --git a/lib/runtime/memory.go b/internal/lib/runtime/memory.go similarity index 100% rename from lib/runtime/memory.go rename to internal/lib/runtime/memory.go diff --git a/lib/runtime/mock_memory_test.go b/internal/lib/runtime/mock_memory_test.go similarity index 100% rename from lib/runtime/mock_memory_test.go rename to internal/lib/runtime/mock_memory_test.go diff --git a/lib/runtime/mocks/instance.go b/internal/lib/runtime/mocks/instance.go similarity index 96% rename from lib/runtime/mocks/instance.go rename to internal/lib/runtime/mocks/instance.go index ca866f4d17..fcbb1c452f 100644 --- a/lib/runtime/mocks/instance.go +++ b/internal/lib/runtime/mocks/instance.go @@ -3,16 +3,16 @@ package mocks import ( - common "github.com/ChainSafe/gossamer/lib/common" - keystore "github.com/ChainSafe/gossamer/lib/keystore" + common "github.com/ChainSafe/gossamer/internal/lib/common" + keystore "github.com/ChainSafe/gossamer/internal/lib/keystore" mock "github.com/stretchr/testify/mock" - runtime "github.com/ChainSafe/gossamer/lib/runtime" + runtime "github.com/ChainSafe/gossamer/internal/lib/runtime" - transaction "github.com/ChainSafe/gossamer/lib/transaction" + transaction "github.com/ChainSafe/gossamer/internal/lib/transaction" - types "github.com/ChainSafe/gossamer/dot/types" + types "github.com/ChainSafe/gossamer/internal/dot/types" ) // Instance is an autogenerated mock type for the Instance type diff --git a/lib/runtime/mocks/transaction_state.go b/internal/lib/runtime/mocks/transaction_state.go similarity index 82% rename from lib/runtime/mocks/transaction_state.go rename to internal/lib/runtime/mocks/transaction_state.go index 57dd453d06..0b400ef2e8 100644 --- a/lib/runtime/mocks/transaction_state.go +++ b/internal/lib/runtime/mocks/transaction_state.go @@ -3,10 +3,10 @@ package mocks import ( - common "github.com/ChainSafe/gossamer/lib/common" + common "github.com/ChainSafe/gossamer/internal/lib/common" mock "github.com/stretchr/testify/mock" - transaction "github.com/ChainSafe/gossamer/lib/transaction" + transaction "github.com/ChainSafe/gossamer/internal/lib/transaction" ) // TransactionState is an autogenerated mock type for the TransactionState type diff --git a/lib/runtime/mocks/version.go b/internal/lib/runtime/mocks/version.go similarity index 97% rename from lib/runtime/mocks/version.go rename to internal/lib/runtime/mocks/version.go index 393d58564b..26b613bfea 100644 --- a/lib/runtime/mocks/version.go +++ b/internal/lib/runtime/mocks/version.go @@ -3,7 +3,7 @@ package mocks import ( - runtime "github.com/ChainSafe/gossamer/lib/runtime" + runtime "github.com/ChainSafe/gossamer/internal/lib/runtime" mock "github.com/stretchr/testify/mock" ) diff --git a/lib/runtime/offchain/httpset.go b/internal/lib/runtime/offchain/httpset.go similarity index 100% rename from lib/runtime/offchain/httpset.go rename to internal/lib/runtime/offchain/httpset.go diff --git a/lib/runtime/offchain/httpset_test.go b/internal/lib/runtime/offchain/httpset_test.go similarity index 100% rename from lib/runtime/offchain/httpset_test.go rename to internal/lib/runtime/offchain/httpset_test.go diff --git a/lib/runtime/storage/trie.go b/internal/lib/runtime/storage/trie.go similarity index 98% rename from lib/runtime/storage/trie.go rename to internal/lib/runtime/storage/trie.go index bd57efd12c..6df1ae2a58 100644 --- a/lib/runtime/storage/trie.go +++ b/internal/lib/runtime/storage/trie.go @@ -8,8 +8,8 @@ import ( "sort" "sync" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/trie" ) // TrieState is a wrapper around a transient trie that is used during the course of executing some runtime call. diff --git a/lib/runtime/storage/trie_test.go b/internal/lib/runtime/storage/trie_test.go similarity index 97% rename from lib/runtime/storage/trie_test.go rename to internal/lib/runtime/storage/trie_test.go index 364a378146..3868f8d2cb 100644 --- a/lib/runtime/storage/trie_test.go +++ b/internal/lib/runtime/storage/trie_test.go @@ -9,8 +9,8 @@ import ( "sort" "testing" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/stretchr/testify/require" ) diff --git a/lib/runtime/test_data/kusama/block1377830.out b/internal/lib/runtime/test_data/kusama/block1377830.json similarity index 100% rename from lib/runtime/test_data/kusama/block1377830.out rename to internal/lib/runtime/test_data/kusama/block1377830.json diff --git a/lib/runtime/test_data/kusama/block1482002.out b/internal/lib/runtime/test_data/kusama/block1482002.json similarity index 100% rename from lib/runtime/test_data/kusama/block1482002.out rename to internal/lib/runtime/test_data/kusama/block1482002.json diff --git a/lib/runtime/test_data/kusama/block3783.out b/internal/lib/runtime/test_data/kusama/block3783.json similarity index 100% rename from lib/runtime/test_data/kusama/block3783.out rename to internal/lib/runtime/test_data/kusama/block3783.json diff --git a/lib/runtime/test_data/kusama/block901441.out b/internal/lib/runtime/test_data/kusama/block901441.json similarity index 100% rename from lib/runtime/test_data/kusama/block901441.out rename to internal/lib/runtime/test_data/kusama/block901441.json diff --git a/lib/runtime/test_data/polkadot/block1089327.json b/internal/lib/runtime/test_data/polkadot/block1089327.json similarity index 100% rename from lib/runtime/test_data/polkadot/block1089327.json rename to internal/lib/runtime/test_data/polkadot/block1089327.json diff --git a/lib/runtime/test_helpers.go b/internal/lib/runtime/test_helpers.go similarity index 94% rename from lib/runtime/test_helpers.go rename to internal/lib/runtime/test_helpers.go index e9e7d0f5f9..8c01cac9ef 100644 --- a/lib/runtime/test_helpers.go +++ b/internal/lib/runtime/test_helpers.go @@ -13,10 +13,10 @@ import ( "time" "github.com/ChainSafe/chaindb" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/utils" ma "github.com/multiformats/go-multiaddr" "github.com/stretchr/testify/require" ) diff --git a/lib/runtime/types.go b/internal/lib/runtime/types.go similarity index 91% rename from lib/runtime/types.go rename to internal/lib/runtime/types.go index 312be14058..4ae8df9e08 100644 --- a/lib/runtime/types.go +++ b/internal/lib/runtime/types.go @@ -4,11 +4,11 @@ package runtime import ( + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime/offchain" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime/offchain" ) // NodeStorageType type to identify offchain storage type diff --git a/lib/runtime/types_test.go b/internal/lib/runtime/types_test.go similarity index 91% rename from lib/runtime/types_test.go rename to internal/lib/runtime/types_test.go index 98627f241d..264f55f066 100644 --- a/lib/runtime/types_test.go +++ b/internal/lib/runtime/types_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/secp256k1" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/secp256k1" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" "github.com/stretchr/testify/require" ) diff --git a/lib/runtime/version.go b/internal/lib/runtime/version.go similarity index 100% rename from lib/runtime/version.go rename to internal/lib/runtime/version.go diff --git a/lib/runtime/version_test.go b/internal/lib/runtime/version_test.go similarity index 100% rename from lib/runtime/version_test.go rename to internal/lib/runtime/version_test.go diff --git a/lib/runtime/wasmer/exports.go b/internal/lib/runtime/wasmer/exports.go similarity index 96% rename from lib/runtime/wasmer/exports.go rename to internal/lib/runtime/wasmer/exports.go index 8d73b1d775..0fb464aa60 100644 --- a/lib/runtime/wasmer/exports.go +++ b/internal/lib/runtime/wasmer/exports.go @@ -7,9 +7,9 @@ import ( "fmt" "strings" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/transaction" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/transaction" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/lib/runtime/wasmer/exports_test.go b/internal/lib/runtime/wasmer/exports_test.go similarity index 98% rename from lib/runtime/wasmer/exports_test.go rename to internal/lib/runtime/wasmer/exports_test.go index c1e2682050..6e72694874 100644 --- a/lib/runtime/wasmer/exports_test.go +++ b/internal/lib/runtime/wasmer/exports_test.go @@ -12,14 +12,14 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/genesis" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/runtime/wasmer/testdata" - "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/genesis" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/runtime/wasmer/testdata" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/centrifuge/go-substrate-rpc-client/v3/signature" @@ -778,7 +778,7 @@ func TestInstance_ExecuteBlock_KusamaRuntime_KusamaBlock1(t *testing.T) { } func TestInstance_ExecuteBlock_KusamaRuntime_KusamaBlock3784(t *testing.T) { - gossTrie3783 := newTrieFromPairs(t, "../test_data/kusama/block3783.out") + gossTrie3783 := newTrieFromPairs(t, "../test_data/kusama/block3783.json") expectedRoot := common.MustHexToHash("0x948338bc0976aee78879d559a1f42385407e5a481b05a91d2a9386aa7507e7a0") require.Equal(t, expectedRoot, gossTrie3783.MustHash()) @@ -824,7 +824,7 @@ func TestInstance_ExecuteBlock_KusamaRuntime_KusamaBlock3784(t *testing.T) { } func TestInstance_ExecuteBlock_KusamaRuntime_KusamaBlock901442(t *testing.T) { - ksmTrie901441 := newTrieFromPairs(t, "../test_data/kusama/block901441.out") + ksmTrie901441 := newTrieFromPairs(t, "../test_data/kusama/block901441.json") expectedRoot := common.MustHexToHash("0x3a2ef7ee032f5810160bb8f3ffe3e3377bb6f2769ee9f79a5425973347acd504") require.Equal(t, expectedRoot, ksmTrie901441.MustHash()) @@ -870,7 +870,7 @@ func TestInstance_ExecuteBlock_KusamaRuntime_KusamaBlock901442(t *testing.T) { } func TestInstance_ExecuteBlock_KusamaRuntime_KusamaBlock1377831(t *testing.T) { - ksmTrie := newTrieFromPairs(t, "../test_data/kusama/block1377830.out") + ksmTrie := newTrieFromPairs(t, "../test_data/kusama/block1377830.json") expectedRoot := common.MustHexToHash("0xe4de6fecda9e9e35f937d159665cf984bc1a68048b6c78912de0aeb6bd7f7e99") require.Equal(t, expectedRoot, ksmTrie.MustHash()) @@ -916,7 +916,7 @@ func TestInstance_ExecuteBlock_KusamaRuntime_KusamaBlock1377831(t *testing.T) { } func TestInstance_ExecuteBlock_KusamaRuntime_KusamaBlock1482003(t *testing.T) { - ksmTrie := newTrieFromPairs(t, "../test_data/kusama/block1482002.out") + ksmTrie := newTrieFromPairs(t, "../test_data/kusama/block1482002.json") expectedRoot := common.MustHexToHash("0x09f9ca28df0560c2291aa16b56e15e07d1e1927088f51356d522722aa90ca7cb") require.Equal(t, expectedRoot, ksmTrie.MustHash()) @@ -964,7 +964,7 @@ func TestInstance_ExecuteBlock_KusamaRuntime_KusamaBlock1482003(t *testing.T) { func TestInstance_ExecuteBlock_KusamaRuntime_KusamaBlock4939774(t *testing.T) { t.Skip("skip for now as block4939773 is too large") - ksmTrie := newTrieFromPairs(t, "../test_data/kusama/block4939773.out") + ksmTrie := newTrieFromPairs(t, "../test_data/kusama/block4939773.json") expectedRoot := common.MustHexToHash("0xc45748e6e8632b44fc32b04cc4380098a9584cbd63ffbc59adce189574fc36fe") require.Equal(t, expectedRoot, ksmTrie.MustHash()) diff --git a/lib/runtime/wasmer/imports.go b/internal/lib/runtime/wasmer/imports.go similarity index 99% rename from lib/runtime/wasmer/imports.go rename to internal/lib/runtime/wasmer/imports.go index 529f5ddb9c..5bafae8bb5 100644 --- a/lib/runtime/wasmer/imports.go +++ b/internal/lib/runtime/wasmer/imports.go @@ -108,17 +108,17 @@ import ( "time" "unsafe" + "github.com/ChainSafe/gossamer/internal/lib/common" + rtype "github.com/ChainSafe/gossamer/internal/lib/common/types" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/secp256k1" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + rtstorage "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/transaction" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - rtype "github.com/ChainSafe/gossamer/lib/common/types" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/secp256k1" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/runtime" - rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/transaction" - "github.com/ChainSafe/gossamer/lib/trie" "github.com/ChainSafe/gossamer/pkg/scale" wasm "github.com/wasmerio/go-ext-wasm/wasmer" diff --git a/lib/runtime/wasmer/imports_test.go b/internal/lib/runtime/wasmer/imports_test.go similarity index 98% rename from lib/runtime/wasmer/imports_test.go rename to internal/lib/runtime/wasmer/imports_test.go index c86286e4d7..f7f32e1eda 100644 --- a/lib/runtime/wasmer/imports_test.go +++ b/internal/lib/runtime/wasmer/imports_test.go @@ -13,17 +13,17 @@ import ( "time" "github.com/ChainSafe/chaindb" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common/types" + "github.com/ChainSafe/gossamer/internal/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto/ed25519" + "github.com/ChainSafe/gossamer/internal/lib/crypto/secp256k1" + "github.com/ChainSafe/gossamer/internal/lib/crypto/sr25519" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/common/types" - "github.com/ChainSafe/gossamer/lib/crypto" - "github.com/ChainSafe/gossamer/lib/crypto/ed25519" - "github.com/ChainSafe/gossamer/lib/crypto/secp256k1" - "github.com/ChainSafe/gossamer/lib/crypto/sr25519" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/trie" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/lib/runtime/wasmer/instance.go b/internal/lib/runtime/wasmer/instance.go similarity index 95% rename from lib/runtime/wasmer/instance.go rename to internal/lib/runtime/wasmer/instance.go index 7c87ceb287..df9f769621 100644 --- a/lib/runtime/wasmer/instance.go +++ b/internal/lib/runtime/wasmer/instance.go @@ -8,14 +8,14 @@ import ( "fmt" "sync" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/runtime/offchain" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/runtime/offchain" - "github.com/ChainSafe/gossamer/lib/trie" - "github.com/ChainSafe/gossamer/lib/crypto" + "github.com/ChainSafe/gossamer/internal/lib/crypto" wasm "github.com/wasmerio/go-ext-wasm/wasmer" ) diff --git a/lib/runtime/wasmer/instance_test.go b/internal/lib/runtime/wasmer/instance_test.go similarity index 97% rename from lib/runtime/wasmer/instance_test.go rename to internal/lib/runtime/wasmer/instance_test.go index 08e071223e..71f995724f 100644 --- a/lib/runtime/wasmer/instance_test.go +++ b/internal/lib/runtime/wasmer/instance_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/ChainSafe/gossamer/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/runtime" "github.com/stretchr/testify/require" ) diff --git a/lib/runtime/wasmer/test_helpers.go b/internal/lib/runtime/wasmer/test_helpers.go similarity index 88% rename from lib/runtime/wasmer/test_helpers.go rename to internal/lib/runtime/wasmer/test_helpers.go index ab1f07458c..0b470e5e49 100644 --- a/lib/runtime/wasmer/test_helpers.go +++ b/internal/lib/runtime/wasmer/test_helpers.go @@ -7,13 +7,13 @@ import ( "path/filepath" "testing" + "github.com/ChainSafe/gossamer/internal/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/keystore" + "github.com/ChainSafe/gossamer/internal/lib/runtime" + "github.com/ChainSafe/gossamer/internal/lib/runtime/mocks" + "github.com/ChainSafe/gossamer/internal/lib/runtime/storage" + "github.com/ChainSafe/gossamer/internal/lib/trie" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/lib/keystore" - "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/runtime/mocks" - "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/trie" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/lib/runtime/wasmer/testdata/digest.kusama.1482002.zip b/internal/lib/runtime/wasmer/testdata/digest.kusama.1482002.zip similarity index 100% rename from lib/runtime/wasmer/testdata/digest.kusama.1482002.zip rename to internal/lib/runtime/wasmer/testdata/digest.kusama.1482002.zip diff --git a/lib/runtime/wasmer/testdata/digests.go b/internal/lib/runtime/wasmer/testdata/digests.go similarity index 100% rename from lib/runtime/wasmer/testdata/digests.go rename to internal/lib/runtime/wasmer/testdata/digests.go diff --git a/lib/services/mocks/service.go b/internal/lib/services/mocks/service.go similarity index 100% rename from lib/services/mocks/service.go rename to internal/lib/services/mocks/service.go diff --git a/lib/services/services.go b/internal/lib/services/services.go similarity index 100% rename from lib/services/services.go rename to internal/lib/services/services.go diff --git a/lib/services/services_test.go b/internal/lib/services/services_test.go similarity index 94% rename from lib/services/services_test.go rename to internal/lib/services/services_test.go index c83bf74281..042f888f58 100644 --- a/lib/services/services_test.go +++ b/internal/lib/services/services_test.go @@ -7,8 +7,8 @@ import ( "io" "testing" + "github.com/ChainSafe/gossamer/internal/lib/services/mocks" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/services/mocks" "github.com/stretchr/testify/require" ) diff --git a/lib/transaction/pool.go b/internal/lib/transaction/pool.go similarity index 95% rename from lib/transaction/pool.go rename to internal/lib/transaction/pool.go index de4c44de0e..d78a2d2f91 100644 --- a/lib/transaction/pool.go +++ b/internal/lib/transaction/pool.go @@ -6,7 +6,7 @@ package transaction import ( "sync" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // Pool represents the transaction pool diff --git a/lib/transaction/pool_test.go b/internal/lib/transaction/pool_test.go similarity index 95% rename from lib/transaction/pool_test.go rename to internal/lib/transaction/pool_test.go index 860d35f6bc..01828cbdaf 100644 --- a/lib/transaction/pool_test.go +++ b/internal/lib/transaction/pool_test.go @@ -7,7 +7,7 @@ import ( "sort" "testing" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/stretchr/testify/require" ) diff --git a/lib/transaction/priority_queue.go b/internal/lib/transaction/priority_queue.go similarity index 97% rename from lib/transaction/priority_queue.go rename to internal/lib/transaction/priority_queue.go index 68ac140166..57a1acf5ff 100644 --- a/lib/transaction/priority_queue.go +++ b/internal/lib/transaction/priority_queue.go @@ -8,8 +8,8 @@ import ( "errors" "sync" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // ErrTransactionExists is returned when trying to add a transaction to the queue that already exists diff --git a/lib/transaction/priority_queue_test.go b/internal/lib/transaction/priority_queue_test.go similarity index 100% rename from lib/transaction/priority_queue_test.go rename to internal/lib/transaction/priority_queue_test.go diff --git a/lib/transaction/types.go b/internal/lib/transaction/types.go similarity index 98% rename from lib/transaction/types.go rename to internal/lib/transaction/types.go index 5977dad0f7..d9f88ebe1b 100644 --- a/lib/transaction/types.go +++ b/internal/lib/transaction/types.go @@ -4,7 +4,7 @@ package transaction import ( - "github.com/ChainSafe/gossamer/dot/types" + "github.com/ChainSafe/gossamer/internal/dot/types" ) // Validity struct see diff --git a/lib/transaction/types_test.go b/internal/lib/transaction/types_test.go similarity index 100% rename from lib/transaction/types_test.go rename to internal/lib/transaction/types_test.go diff --git a/lib/trie/child_storage.go b/internal/lib/trie/child_storage.go similarity index 97% rename from lib/trie/child_storage.go rename to internal/lib/trie/child_storage.go index e0bc537710..30a7c3253c 100644 --- a/lib/trie/child_storage.go +++ b/internal/lib/trie/child_storage.go @@ -6,7 +6,7 @@ package trie import ( "fmt" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) // ChildStorageKeyPrefix is the prefix for all child storage keys diff --git a/lib/trie/child_storage_test.go b/internal/lib/trie/child_storage_test.go similarity index 100% rename from lib/trie/child_storage_test.go rename to internal/lib/trie/child_storage_test.go diff --git a/lib/trie/database.go b/internal/lib/trie/database.go similarity index 99% rename from lib/trie/database.go rename to internal/lib/trie/database.go index 979c346cba..05bb9f0b9b 100644 --- a/lib/trie/database.go +++ b/internal/lib/trie/database.go @@ -8,9 +8,9 @@ import ( "errors" "fmt" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/internal/trie/codec" "github.com/ChainSafe/gossamer/internal/trie/node" - "github.com/ChainSafe/gossamer/lib/common" "github.com/ChainSafe/chaindb" ) diff --git a/lib/trie/database_test.go b/internal/lib/trie/database_test.go similarity index 99% rename from lib/trie/database_test.go rename to internal/lib/trie/database_test.go index f121573d41..4aa26df6c9 100644 --- a/lib/trie/database_test.go +++ b/internal/lib/trie/database_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/ChainSafe/chaindb" - "github.com/ChainSafe/gossamer/lib/utils" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/stretchr/testify/require" ) diff --git a/lib/trie/lookup.go b/internal/lib/trie/lookup.go similarity index 100% rename from lib/trie/lookup.go rename to internal/lib/trie/lookup.go diff --git a/lib/trie/node.go b/internal/lib/trie/node.go similarity index 100% rename from lib/trie/node.go rename to internal/lib/trie/node.go diff --git a/lib/trie/node_test.go b/internal/lib/trie/node_test.go similarity index 100% rename from lib/trie/node_test.go rename to internal/lib/trie/node_test.go diff --git a/lib/trie/print.go b/internal/lib/trie/print.go similarity index 97% rename from lib/trie/print.go rename to internal/lib/trie/print.go index e39c8069f6..58fa20cbc6 100644 --- a/lib/trie/print.go +++ b/internal/lib/trie/print.go @@ -7,9 +7,9 @@ import ( "bytes" "fmt" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/internal/trie/node" "github.com/ChainSafe/gossamer/internal/trie/pools" - "github.com/ChainSafe/gossamer/lib/common" "github.com/disiqueira/gotree" ) diff --git a/lib/trie/proof.go b/internal/lib/trie/proof.go similarity index 98% rename from lib/trie/proof.go rename to internal/lib/trie/proof.go index 4bd2b0c066..4e78a7e848 100644 --- a/lib/trie/proof.go +++ b/internal/lib/trie/proof.go @@ -10,9 +10,9 @@ import ( "fmt" "github.com/ChainSafe/chaindb" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/internal/trie/codec" "github.com/ChainSafe/gossamer/internal/trie/record" - "github.com/ChainSafe/gossamer/lib/common" ) var ( diff --git a/lib/trie/proof_test.go b/internal/lib/trie/proof_test.go similarity index 100% rename from lib/trie/proof_test.go rename to internal/lib/trie/proof_test.go diff --git a/lib/trie/test_utils.go b/internal/lib/trie/test_utils.go similarity index 100% rename from lib/trie/test_utils.go rename to internal/lib/trie/test_utils.go diff --git a/lib/trie/trie.go b/internal/lib/trie/trie.go similarity index 99% rename from lib/trie/trie.go rename to internal/lib/trie/trie.go index 65d1bddf53..a108090faf 100644 --- a/lib/trie/trie.go +++ b/internal/lib/trie/trie.go @@ -7,10 +7,10 @@ import ( "bytes" "fmt" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/internal/trie/codec" "github.com/ChainSafe/gossamer/internal/trie/node" "github.com/ChainSafe/gossamer/internal/trie/pools" - "github.com/ChainSafe/gossamer/lib/common" ) // EmptyHash is the empty trie hash. diff --git a/lib/trie/trie_test.go b/internal/lib/trie/trie_test.go similarity index 99% rename from lib/trie/trie_test.go rename to internal/lib/trie/trie_test.go index cc19116a50..9057154ee2 100644 --- a/lib/trie/trie_test.go +++ b/internal/lib/trie/trie_test.go @@ -20,9 +20,9 @@ import ( "github.com/ChainSafe/chaindb" "github.com/stretchr/testify/require" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/internal/trie/codec" "github.com/ChainSafe/gossamer/internal/trie/node" - "github.com/ChainSafe/gossamer/lib/common" ) type commonPrefixTest struct { diff --git a/lib/utils/pull_request.go b/internal/lib/utils/pull_request.go similarity index 100% rename from lib/utils/pull_request.go rename to internal/lib/utils/pull_request.go diff --git a/lib/utils/pull_request_test.go b/internal/lib/utils/pull_request_test.go similarity index 100% rename from lib/utils/pull_request_test.go rename to internal/lib/utils/pull_request_test.go diff --git a/lib/utils/test_utils.go b/internal/lib/utils/test_utils.go similarity index 100% rename from lib/utils/test_utils.go rename to internal/lib/utils/test_utils.go diff --git a/lib/utils/test_utils_test.go b/internal/lib/utils/test_utils_test.go similarity index 100% rename from lib/utils/test_utils_test.go rename to internal/lib/utils/test_utils_test.go diff --git a/lib/utils/utils.go b/internal/lib/utils/utils.go similarity index 77% rename from lib/utils/utils.go rename to internal/lib/utils/utils.go index c2f8404057..c186142d71 100644 --- a/lib/utils/utils.go +++ b/internal/lib/utils/utils.go @@ -4,6 +4,7 @@ package utils import ( + "errors" "fmt" "os" "os/user" @@ -147,50 +148,68 @@ func KeystoreFilepaths(basepath string) ([]string, error) { // GetGssmrGenesisRawPath gets the gssmr raw genesis path func GetGssmrGenesisRawPath() string { - path1 := "../chain/gssmr/genesis.json" - path2 := "../../chain/gssmr/genesis.json" - - var fp string - - if PathExists(path1) { - fp, _ = filepath.Abs(path1) - } else if PathExists(path2) { - fp, _ = filepath.Abs(path2) + chainDir, err := locateChainDirectory() + if err != nil { + panic(err) } - return fp + return filepath.Join(chainDir, "gssmr/genesis.json") } // GetGssmrGenesisPath gets the gssmr human-readable genesis path func GetGssmrGenesisPath() string { - path1 := "../chain/gssmr/genesis-spec.json" - path2 := "../../chain/gssmr/genesis-spec.json" - - var fp string - - if PathExists(path1) { - fp, _ = filepath.Abs(path1) - } else if PathExists(path2) { - fp, _ = filepath.Abs(path2) + chainDir, err := locateChainDirectory() + if err != nil { + panic(err) } - return fp + return filepath.Join(chainDir, "gssmr/genesis-spec.json") } // GetKusamaGenesisPath gets the kusama genesis path func GetKusamaGenesisPath() string { - path1 := "../chain/kusama/genesis.json" - path2 := "../../chain/kusama/genesis.json" + chainDir, err := locateChainDirectory() + if err != nil { + panic(err) + } - var fp string + return filepath.Join(chainDir, "kusama/genesis.json") +} - if PathExists(path1) { - fp, _ = filepath.Abs(path1) - } else if PathExists(path2) { - fp, _ = filepath.Abs(path2) +// GetDevGenesisPath gets the dev genesis path +func GetDevGenesisPath() string { + chainDir, err := locateChainDirectory() + if err != nil { + panic(err) + } + + return filepath.Join(chainDir, "dev/genesis.json") +} + +var ( + ErrChainDirectoryPathNotValid = errors.New("chain directory path is not valid") + ErrChainDirectoryPathNotFound = errors.New("chain directory path not found") +) + +func locateChainDirectory() (chainDir string, err error) { + pathsToTry := []string{ + "../../internal/chain/", // from cmd/gossamer + "../chain/", // from internal/package + "../../chain/", // from internal/package/subpackage + "../../../chain/", // from internal/package/subpackage/subpackage + } + + for _, pathToTry := range pathsToTry { + if PathExists(pathToTry) { + path, err := filepath.Abs(pathToTry) + if err != nil { + return "", fmt.Errorf("%w: %s", ErrChainDirectoryPathNotValid, pathToTry) + } + return path, nil + } } - return fp + return "", ErrChainDirectoryPathNotFound } // LoadChainDB load the db at the given path. diff --git a/lib/utils/utils_test.go b/internal/lib/utils/utils_test.go similarity index 100% rename from lib/utils/utils_test.go rename to internal/lib/utils/utils_test.go diff --git a/tests/data/db/000000.vlog b/internal/tests/data/db/000000.vlog similarity index 100% rename from tests/data/db/000000.vlog rename to internal/tests/data/db/000000.vlog diff --git a/tests/data/db/000006.sst b/internal/tests/data/db/000006.sst similarity index 100% rename from tests/data/db/000006.sst rename to internal/tests/data/db/000006.sst diff --git a/tests/data/db/KEYREGISTRY b/internal/tests/data/db/KEYREGISTRY similarity index 100% rename from tests/data/db/KEYREGISTRY rename to internal/tests/data/db/KEYREGISTRY diff --git a/tests/data/db/MANIFEST b/internal/tests/data/db/MANIFEST similarity index 100% rename from tests/data/db/MANIFEST rename to internal/tests/data/db/MANIFEST diff --git a/tests/data/db/config.toml b/internal/tests/data/db/config.toml similarity index 83% rename from tests/data/db/config.toml rename to internal/tests/data/db/config.toml index 841fa35b2b..a05133a677 100644 --- a/tests/data/db/config.toml +++ b/internal/tests/data/db/config.toml @@ -1,5 +1,5 @@ [global] -basepath = "../../tests/data/db" +basepath = "../../internal/tests/data/db" log = "info" metrics-port = 9876 @@ -14,7 +14,7 @@ grandpa = "" sync = "" [init] -genesis = "./chain/gssmr/genesis.json" +genesis = "./internal/chain/gssmr/genesis.json" [account] key = "" diff --git a/tests/polkadotjs_test/empty.go b/internal/tests/polkadotjs_test/empty.go similarity index 100% rename from tests/polkadotjs_test/empty.go rename to internal/tests/polkadotjs_test/empty.go diff --git a/tests/polkadotjs_test/package-lock.json b/internal/tests/polkadotjs_test/package-lock.json similarity index 100% rename from tests/polkadotjs_test/package-lock.json rename to internal/tests/polkadotjs_test/package-lock.json diff --git a/tests/polkadotjs_test/package.json b/internal/tests/polkadotjs_test/package.json similarity index 100% rename from tests/polkadotjs_test/package.json rename to internal/tests/polkadotjs_test/package.json diff --git a/tests/polkadotjs_test/start_polkadotjs_test.go b/internal/tests/polkadotjs_test/start_polkadotjs_test.go similarity index 95% rename from tests/polkadotjs_test/start_polkadotjs_test.go rename to internal/tests/polkadotjs_test/start_polkadotjs_test.go index c592193300..604a91ef68 100644 --- a/tests/polkadotjs_test/start_polkadotjs_test.go +++ b/internal/tests/polkadotjs_test/start_polkadotjs_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/tests/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/tests/polkadotjs_test/test.js b/internal/tests/polkadotjs_test/test.js similarity index 100% rename from tests/polkadotjs_test/test.js rename to internal/tests/polkadotjs_test/test.js diff --git a/tests/polkadotjs_test/test/node_runtime.compact.wasm b/internal/tests/polkadotjs_test/test/node_runtime.compact.wasm similarity index 100% rename from tests/polkadotjs_test/test/node_runtime.compact.wasm rename to internal/tests/polkadotjs_test/test/node_runtime.compact.wasm diff --git a/tests/polkadotjs_test/test/test-polkadot.js b/internal/tests/polkadotjs_test/test/test-polkadot.js similarity index 100% rename from tests/polkadotjs_test/test/test-polkadot.js rename to internal/tests/polkadotjs_test/test/test-polkadot.js diff --git a/tests/polkadotjs_test/test_transaction.js b/internal/tests/polkadotjs_test/test_transaction.js similarity index 100% rename from tests/polkadotjs_test/test_transaction.js rename to internal/tests/polkadotjs_test/test_transaction.js diff --git a/tests/rpc/empty.go b/internal/tests/rpc/empty.go similarity index 100% rename from tests/rpc/empty.go rename to internal/tests/rpc/empty.go diff --git a/tests/rpc/rpc_00_test.go b/internal/tests/rpc/rpc_00_test.go similarity index 95% rename from tests/rpc/rpc_00_test.go rename to internal/tests/rpc/rpc_00_test.go index 8dc17d7fb1..23dbd6b9e5 100644 --- a/tests/rpc/rpc_00_test.go +++ b/internal/tests/rpc/rpc_00_test.go @@ -10,7 +10,7 @@ import ( "strconv" "testing" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/tests/utils" "github.com/stretchr/testify/require" ) diff --git a/tests/rpc/rpc_01-system_test.go b/internal/tests/rpc/rpc_01-system_test.go similarity index 96% rename from tests/rpc/rpc_01-system_test.go rename to internal/tests/rpc/rpc_01-system_test.go index 7030082258..14fcc3278b 100644 --- a/tests/rpc/rpc_01-system_test.go +++ b/internal/tests/rpc/rpc_01-system_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/rpc/modules" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/tests/utils" "github.com/stretchr/testify/require" ) diff --git a/tests/rpc/rpc_02-author_test.go b/internal/tests/rpc/rpc_02-author_test.go similarity index 98% rename from tests/rpc/rpc_02-author_test.go rename to internal/tests/rpc/rpc_02-author_test.go index f234a1c46b..75830fbda8 100644 --- a/tests/rpc/rpc_02-author_test.go +++ b/internal/tests/rpc/rpc_02-author_test.go @@ -12,7 +12,7 @@ import ( "github.com/centrifuge/go-substrate-rpc-client/v3/scale" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/tests/utils" gsrpc "github.com/centrifuge/go-substrate-rpc-client/v3" "github.com/centrifuge/go-substrate-rpc-client/v3/signature" "github.com/centrifuge/go-substrate-rpc-client/v3/types" diff --git a/tests/rpc/rpc_03-chain_test.go b/internal/tests/rpc/rpc_03-chain_test.go similarity index 98% rename from tests/rpc/rpc_03-chain_test.go rename to internal/tests/rpc/rpc_03-chain_test.go index 533b69b8f5..6e18113504 100644 --- a/tests/rpc/rpc_03-chain_test.go +++ b/internal/tests/rpc/rpc_03-chain_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/rpc/modules" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/tests/utils" "github.com/gorilla/websocket" "github.com/stretchr/testify/require" ) diff --git a/tests/rpc/rpc_04-offchain_test.go b/internal/tests/rpc/rpc_04-offchain_test.go similarity index 95% rename from tests/rpc/rpc_04-offchain_test.go rename to internal/tests/rpc/rpc_04-offchain_test.go index 441cd4c796..4d9253dc0d 100644 --- a/tests/rpc/rpc_04-offchain_test.go +++ b/internal/tests/rpc/rpc_04-offchain_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/tests/utils" "github.com/stretchr/testify/require" ) diff --git a/tests/rpc/rpc_05-state_test.go b/internal/tests/rpc/rpc_05-state_test.go similarity index 99% rename from tests/rpc/rpc_05-state_test.go rename to internal/tests/rpc/rpc_05-state_test.go index 2e6bdc7ac1..56ebc13fb1 100644 --- a/tests/rpc/rpc_05-state_test.go +++ b/internal/tests/rpc/rpc_05-state_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/rpc/modules" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/tests/utils" "github.com/stretchr/testify/require" ) diff --git a/tests/rpc/rpc_06-engine_test.go b/internal/tests/rpc/rpc_06-engine_test.go similarity index 95% rename from tests/rpc/rpc_06-engine_test.go rename to internal/tests/rpc/rpc_06-engine_test.go index 77fc8a8035..b7259ecd89 100644 --- a/tests/rpc/rpc_06-engine_test.go +++ b/internal/tests/rpc/rpc_06-engine_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/tests/utils" "github.com/stretchr/testify/require" ) diff --git a/tests/rpc/rpc_07-payment_test.go b/internal/tests/rpc/rpc_07-payment_test.go similarity index 94% rename from tests/rpc/rpc_07-payment_test.go rename to internal/tests/rpc/rpc_07-payment_test.go index 055044c269..bcef3a6f04 100644 --- a/tests/rpc/rpc_07-payment_test.go +++ b/internal/tests/rpc/rpc_07-payment_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/tests/utils" "github.com/stretchr/testify/require" ) diff --git a/tests/rpc/rpc_08-contracts_test.go b/internal/tests/rpc/rpc_08-contracts_test.go similarity index 95% rename from tests/rpc/rpc_08-contracts_test.go rename to internal/tests/rpc/rpc_08-contracts_test.go index 2b68ad64f4..4bc9df6dad 100644 --- a/tests/rpc/rpc_08-contracts_test.go +++ b/internal/tests/rpc/rpc_08-contracts_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/tests/utils" "github.com/stretchr/testify/require" ) diff --git a/tests/rpc/rpc_09-babe_test.go b/internal/tests/rpc/rpc_09-babe_test.go similarity index 94% rename from tests/rpc/rpc_09-babe_test.go rename to internal/tests/rpc/rpc_09-babe_test.go index 0269c96652..74cca559c4 100644 --- a/tests/rpc/rpc_09-babe_test.go +++ b/internal/tests/rpc/rpc_09-babe_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/tests/utils" "github.com/stretchr/testify/require" ) diff --git a/tests/rpc/system_integration_test.go b/internal/tests/rpc/system_integration_test.go similarity index 95% rename from tests/rpc/system_integration_test.go rename to internal/tests/rpc/system_integration_test.go index 51981a8b52..8b7987efa6 100644 --- a/tests/rpc/system_integration_test.go +++ b/internal/tests/rpc/system_integration_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/ChainSafe/gossamer/dot/rpc/modules" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/tests/utils" "github.com/stretchr/testify/require" ) diff --git a/tests/stress/empty.go b/internal/tests/stress/empty.go similarity index 100% rename from tests/stress/empty.go rename to internal/tests/stress/empty.go diff --git a/tests/stress/errors.go b/internal/tests/stress/errors.go similarity index 100% rename from tests/stress/errors.go rename to internal/tests/stress/errors.go diff --git a/tests/stress/grandpa_test.go b/internal/tests/stress/grandpa_test.go similarity index 98% rename from tests/stress/grandpa_test.go rename to internal/tests/stress/grandpa_test.go index dc0e902843..4dd5f22e1b 100644 --- a/tests/stress/grandpa_test.go +++ b/internal/tests/stress/grandpa_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/tests/utils" "github.com/stretchr/testify/require" ) diff --git a/tests/stress/helpers.go b/internal/tests/stress/helpers.go similarity index 97% rename from tests/stress/helpers.go rename to internal/tests/stress/helpers.go index c3841089ce..57892d842b 100644 --- a/tests/stress/helpers.go +++ b/internal/tests/stress/helpers.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/tests/utils" "github.com/stretchr/testify/require" ) diff --git a/tests/stress/network_test.go b/internal/tests/stress/network_test.go similarity index 93% rename from tests/stress/network_test.go rename to internal/tests/stress/network_test.go index b8115c9cf0..01f85f7f03 100644 --- a/tests/stress/network_test.go +++ b/internal/tests/stress/network_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/tests/utils" "github.com/ChainSafe/gossamer/internal/log" "github.com/stretchr/testify/require" diff --git a/tests/stress/stress_test.go b/internal/tests/stress/stress_test.go similarity index 99% rename from tests/stress/stress_test.go rename to internal/tests/stress/stress_test.go index 3aa7ece8d4..b081c6d3f1 100644 --- a/tests/stress/stress_test.go +++ b/internal/tests/stress/stress_test.go @@ -19,10 +19,10 @@ import ( "github.com/gorilla/websocket" "github.com/stretchr/testify/require" - gosstypes "github.com/ChainSafe/gossamer/dot/types" + gosstypes "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/common" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/tests/utils" ) func TestMain(m *testing.M) { diff --git a/tests/sync/empty.go b/internal/tests/sync/empty.go similarity index 100% rename from tests/sync/empty.go rename to internal/tests/sync/empty.go diff --git a/tests/sync/sync_test.go b/internal/tests/sync/sync_test.go similarity index 97% rename from tests/sync/sync_test.go rename to internal/tests/sync/sync_test.go index ec8fba74c4..28e05f68e2 100644 --- a/tests/sync/sync_test.go +++ b/internal/tests/sync/sync_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/tests/utils" + "github.com/ChainSafe/gossamer/internal/tests/utils" "github.com/stretchr/testify/require" ) diff --git a/tests/utils/chain.go b/internal/tests/utils/chain.go similarity index 95% rename from tests/utils/chain.go rename to internal/tests/utils/chain.go index e4f791365a..3a58301542 100644 --- a/tests/utils/chain.go +++ b/internal/tests/utils/chain.go @@ -9,9 +9,9 @@ import ( "strconv" "testing" - "github.com/ChainSafe/gossamer/dot/rpc/modules" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/stretchr/testify/require" ) diff --git a/tests/utils/common.go b/internal/tests/utils/common.go similarity index 100% rename from tests/utils/common.go rename to internal/tests/utils/common.go diff --git a/tests/utils/dev.go b/internal/tests/utils/dev.go similarity index 96% rename from tests/utils/dev.go rename to internal/tests/utils/dev.go index 1b16b4603f..38fad343c1 100644 --- a/tests/utils/dev.go +++ b/internal/tests/utils/dev.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/stretchr/testify/require" ) diff --git a/tests/utils/framework.go b/internal/tests/utils/framework.go similarity index 100% rename from tests/utils/framework.go rename to internal/tests/utils/framework.go diff --git a/tests/utils/gossamer_utils.go b/internal/tests/utils/gossamer_utils.go similarity index 97% rename from tests/utils/gossamer_utils.go rename to internal/tests/utils/gossamer_utils.go index 1418f9d18c..76f86cea69 100644 --- a/tests/utils/gossamer_utils.go +++ b/internal/tests/utils/gossamer_utils.go @@ -15,11 +15,11 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot" - ctoml "github.com/ChainSafe/gossamer/dot/config/toml" - "github.com/ChainSafe/gossamer/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/dot" + ctoml "github.com/ChainSafe/gossamer/internal/dot/config/toml" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/lib/utils" "github.com/ChainSafe/gossamer/internal/log" - "github.com/ChainSafe/gossamer/lib/utils" "github.com/stretchr/testify/assert" ) @@ -39,7 +39,7 @@ var ( BaseWSPort = 8546 currentDir, _ = os.Getwd() - gossamerCMD = filepath.Join(currentDir, "../..", "bin/gossamer") + gossamerCMD = filepath.Join(currentDir, "../../..", "bin/gossamer") // GenesisOneAuth is the genesis file that has 1 authority GenesisOneAuth = filepath.Join(currentDir, "../utils/genesis_oneauth.json") @@ -428,7 +428,7 @@ func generateDefaultConfig() *ctoml.Config { SyncLvl: "info", }, Init: ctoml.InitConfig{ - Genesis: "./chain/gssmr/genesis.json", + Genesis: "./internal/chain/gssmr/genesis.json", }, Account: ctoml.AccountConfig{ Key: "", diff --git a/tests/utils/header.go b/internal/tests/utils/header.go similarity index 84% rename from tests/utils/header.go rename to internal/tests/utils/header.go index 7cc09d6fd6..682ccbfdd9 100644 --- a/tests/utils/header.go +++ b/internal/tests/utils/header.go @@ -7,9 +7,9 @@ import ( "math/big" "testing" - "github.com/ChainSafe/gossamer/dot/rpc/modules" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/stretchr/testify/require" ) diff --git a/tests/utils/request_utils.go b/internal/tests/utils/request_utils.go similarity index 97% rename from tests/utils/request_utils.go rename to internal/tests/utils/request_utils.go index 2068c09d49..01c27a9ac3 100644 --- a/tests/utils/request_utils.go +++ b/internal/tests/utils/request_utils.go @@ -14,8 +14,8 @@ import ( "testing" "time" - "github.com/ChainSafe/gossamer/dot/types" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/types" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" "github.com/stretchr/testify/require" diff --git a/tests/utils/rpc_methods.go b/internal/tests/utils/rpc_methods.go similarity index 100% rename from tests/utils/rpc_methods.go rename to internal/tests/utils/rpc_methods.go diff --git a/tests/utils/system.go b/internal/tests/utils/system.go similarity index 82% rename from tests/utils/system.go rename to internal/tests/utils/system.go index 3810cbe49e..62dce75b9f 100644 --- a/tests/utils/system.go +++ b/internal/tests/utils/system.go @@ -6,8 +6,8 @@ package utils import ( "testing" - "github.com/ChainSafe/gossamer/dot/rpc/modules" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/dot/rpc/modules" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/stretchr/testify/require" ) diff --git a/internal/trie/node/branch.go b/internal/trie/node/branch.go index 6d059f9304..5039d9eea0 100644 --- a/internal/trie/node/branch.go +++ b/internal/trie/node/branch.go @@ -7,7 +7,7 @@ import ( "fmt" "sync" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) var _ Node = (*Branch)(nil) diff --git a/internal/trie/node/branch_encode.go b/internal/trie/node/branch_encode.go index badd3556f0..428441faaa 100644 --- a/internal/trie/node/branch_encode.go +++ b/internal/trie/node/branch_encode.go @@ -9,9 +9,9 @@ import ( "hash" "io" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/internal/trie/codec" "github.com/ChainSafe/gossamer/internal/trie/pools" - "github.com/ChainSafe/gossamer/lib/common" "github.com/ChainSafe/gossamer/pkg/scale" ) diff --git a/internal/trie/node/hash.go b/internal/trie/node/hash.go index 315ad9b738..59d9bd67b1 100644 --- a/internal/trie/node/hash.go +++ b/internal/trie/node/hash.go @@ -6,8 +6,8 @@ package node import ( "bytes" + "github.com/ChainSafe/gossamer/internal/lib/common" "github.com/ChainSafe/gossamer/internal/trie/pools" - "github.com/ChainSafe/gossamer/lib/common" ) // SetEncodingAndHash sets the encoding and hash slices diff --git a/internal/trie/node/leaf.go b/internal/trie/node/leaf.go index bcaf4ba3ae..df9b1d4d21 100644 --- a/internal/trie/node/leaf.go +++ b/internal/trie/node/leaf.go @@ -7,7 +7,7 @@ import ( "fmt" "sync" - "github.com/ChainSafe/gossamer/lib/common" + "github.com/ChainSafe/gossamer/internal/lib/common" ) var _ Node = (*Leaf)(nil) diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index e268d21569..ec91813f09 100755 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -22,7 +22,7 @@ BASE_PATH=~/gossamer-dev set -euxo pipefail if [ ! -f $BASE_PATH/genesis_created ]; then - /gossamer/bin/gossamer init --genesis=/gossamer/chain/gssmr/genesis.json + /gossamer/bin/gossamer init --genesis=/gossamer/internal/chaingssmr/genesis.json touch $BASE_PATH/genesis_created; fi; diff --git a/scripts/integration-test-all.sh b/scripts/integration-test-all.sh index 7c1cf9d81a..359196ebb4 100755 --- a/scripts/integration-test-all.sh +++ b/scripts/integration-test-all.sh @@ -84,7 +84,7 @@ if [[ -z $TEST || $TEST == "rpc" ]]; then for i in $(seq 1 "$TEST_QTD"); do echo "going to test gossamer node $(($RPC_PORT + $i))..." - MODE=$MODE NETWORK_SIZE=$QTD HOSTNAME=$HOSTNAME PORT=$(($RPC_PORT + $i)) go test ./tests/rpc/... -timeout=60s -v -count=1 + MODE=$MODE NETWORK_SIZE=$QTD HOSTNAME=$HOSTNAME PORT=$(($RPC_PORT + $i)) go test ./internal/tests/rpc/... -timeout=60s -v -count=1 RPC_FAIL=$? done