moved lib/parachain to dot/parachain (#3429)

ChainSafe · Jul 15, 2024 · 8cc7a74 · 8cc7a74
1 parent 901b05b
commit 8cc7a74
Show file tree

Hide file tree

Showing 47 changed files with 91 additions and 79 deletions.
diff --git a/dot/core/mock_runtime_instance_test.go b/dot/core/mock_runtime_instance_test.go
diff --git a/dot/mock_node_builder_test.go b/dot/mock_node_builder_test.go
diff --git a/dot/node.go b/dot/node.go
@@ -18,6 +18,7 @@ import (
 	"github.com/ChainSafe/gossamer/dot/core"
 	"github.com/ChainSafe/gossamer/dot/digest"
 	"github.com/ChainSafe/gossamer/dot/network"
+	"github.com/ChainSafe/gossamer/dot/parachain"
 	"github.com/ChainSafe/gossamer/dot/rpc"
 	"github.com/ChainSafe/gossamer/dot/state"
 	"github.com/ChainSafe/gossamer/dot/state/pruner"
@@ -33,7 +34,6 @@ import (
 	"github.com/ChainSafe/gossamer/lib/genesis"
 	"github.com/ChainSafe/gossamer/lib/grandpa"
 	"github.com/ChainSafe/gossamer/lib/keystore"
-	"github.com/ChainSafe/gossamer/lib/parachain"
 	"github.com/ChainSafe/gossamer/lib/runtime"
 	"github.com/ChainSafe/gossamer/lib/services"
 )

diff --git a/dot/node_integration_test.go b/dot/node_integration_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/ChainSafe/gossamer/dot/core"
 	digest "github.com/ChainSafe/gossamer/dot/digest"
 	network "github.com/ChainSafe/gossamer/dot/network"
+	"github.com/ChainSafe/gossamer/dot/parachain"
 	"github.com/ChainSafe/gossamer/dot/state"
 	dotsync "github.com/ChainSafe/gossamer/dot/sync"
 	system "github.com/ChainSafe/gossamer/dot/system"
@@ -34,7 +35,6 @@ import (
 	"github.com/ChainSafe/gossamer/lib/genesis"
 	"github.com/ChainSafe/gossamer/lib/grandpa"
 	"github.com/ChainSafe/gossamer/lib/keystore"
-	"github.com/ChainSafe/gossamer/lib/parachain"
 	"github.com/ChainSafe/gossamer/lib/runtime"
 	wazero_runtime "github.com/ChainSafe/gossamer/lib/runtime/wazero"
 	"github.com/ChainSafe/gossamer/pkg/trie"

diff --git a/...arachain/approval_distribution_message.go → ...arachain/approval_distribution_message.go b/...arachain/approval_distribution_message.go → ...arachain/approval_distribution_message.go
@@ -6,9 +6,9 @@ package parachain
 import (
 	"fmt"
 
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/lib/common"
 	"github.com/ChainSafe/gossamer/lib/crypto/sr25519"
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
 	"github.com/ChainSafe/gossamer/pkg/scale"
 )
 

diff --git a/...ain/approval_distribution_message_test.go → ...ain/approval_distribution_message_test.go b/...ain/approval_distribution_message_test.go → ...ain/approval_distribution_message_test.go
@@ -6,8 +6,8 @@ package parachain
 import (
 	"testing"
 
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/lib/common"
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
 	"github.com/ChainSafe/gossamer/pkg/scale"
 	"github.com/stretchr/testify/require"
 )

diff --git a/lib/parachain/available_data_fetching.go → dot/parachain/available_data_fetching.go b/lib/parachain/available_data_fetching.go → dot/parachain/available_data_fetching.go
@@ -6,8 +6,8 @@ package parachain
 import (
 	"fmt"
 
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/lib/common"
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
 	"github.com/ChainSafe/gossamer/pkg/scale"
 )
 

diff --git a/...parachain/available_data_fetching_test.go → ...parachain/available_data_fetching_test.go b/...parachain/available_data_fetching_test.go → ...parachain/available_data_fetching_test.go
@@ -6,8 +6,8 @@ package parachain
 import (
 	"testing"
 
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/lib/common"
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/lib/parachain/candidate_validation.go → dot/parachain/candidate_validation.go b/lib/parachain/candidate_validation.go → dot/parachain/candidate_validation.go
@@ -8,9 +8,9 @@ import (
 	"errors"
 	"fmt"
 
+	parachainruntime "github.com/ChainSafe/gossamer/dot/parachain/runtime"
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/lib/common"
-	parachainruntime "github.com/ChainSafe/gossamer/lib/parachain/runtime"
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
 
 	"github.com/ChainSafe/gossamer/pkg/scale"
 )

diff --git a/lib/parachain/candidate_validation_test.go → dot/parachain/candidate_validation_test.go b/lib/parachain/candidate_validation_test.go → dot/parachain/candidate_validation_test.go
@@ -7,9 +7,9 @@ import (
 	"os"
 	"testing"
 
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/lib/common"
 	"github.com/ChainSafe/gossamer/lib/crypto/sr25519"
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
 	"github.com/ChainSafe/gossamer/pkg/scale"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"

diff --git a/lib/parachain/chunk_fetching.go → dot/parachain/chunk_fetching.go b/lib/parachain/chunk_fetching.go → dot/parachain/chunk_fetching.go
@@ -6,7 +6,7 @@ package parachain
 import (
 	"fmt"
 
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/pkg/scale"
 )
 

diff --git a/lib/parachain/chunk_fetching_test.go → dot/parachain/chunk_fetching_test.go b/lib/parachain/chunk_fetching_test.go → dot/parachain/chunk_fetching_test.go
@@ -6,8 +6,8 @@ package parachain
 import (
 	"testing"
 
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/lib/common"
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/lib/parachain/collation_fetching.go → dot/parachain/collation_fetching.go b/lib/parachain/collation_fetching.go → dot/parachain/collation_fetching.go
@@ -6,8 +6,8 @@ package parachain
 import (
 	"fmt"
 
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/lib/common"
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
 	"github.com/ChainSafe/gossamer/pkg/scale"
 )
 

diff --git a/lib/parachain/collation_fetching_test.go → dot/parachain/collation_fetching_test.go b/lib/parachain/collation_fetching_test.go → dot/parachain/collation_fetching_test.go
@@ -6,8 +6,8 @@ package parachain
 import (
 	"testing"
 
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/lib/common"
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/lib/parachain/collation_protocol.go → dot/parachain/collation_protocol.go b/lib/parachain/collation_protocol.go → dot/parachain/collation_protocol.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 
 	"github.com/ChainSafe/gossamer/dot/network"
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/lib/common"
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
 	"github.com/ChainSafe/gossamer/pkg/scale"
 	"github.com/libp2p/go-libp2p/core/peer"
 )

diff --git a/lib/parachain/collation_protocol_test.go → dot/parachain/collation_protocol_test.go b/lib/parachain/collation_protocol_test.go → dot/parachain/collation_protocol_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v3"
 
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 )
 
 //go:embed testdata/collation_protocol.yaml

diff --git a/lib/parachain/mocks_generate_test.go → dot/parachain/mocks_generate_test.go b/lib/parachain/mocks_generate_test.go → dot/parachain/mocks_generate_test.go
@@ -3,4 +3,5 @@
 
 package parachain
 
-//go:generate mockgen -destination=mocks_test.go -package=$GOPACKAGE . RuntimeInstance,PoVRequestor
+//go:generate mockgen -destination=mocks_test.go -package=$GOPACKAGE . PoVRequestor
+//go:generate mockgen -destination=mocks_runtime_test.go -package $GOPACKAGE github.com/ChainSafe/gossamer/dot/parachain/runtime RuntimeInstance
diff --git a/lib/parachain/mocks_test.go → dot/parachain/mocks_runtime_test.go b/lib/parachain/mocks_test.go → dot/parachain/mocks_runtime_test.go
diff --git a/dot/parachain/mocks_test.go b/dot/parachain/mocks_test.go
diff --git a/lib/parachain/network_protocols.go → dot/parachain/network_protocols.go b/lib/parachain/network_protocols.go → dot/parachain/network_protocols.go
diff --git a/lib/parachain/pov_fetching.go → dot/parachain/pov_fetching.go b/lib/parachain/pov_fetching.go → dot/parachain/pov_fetching.go
diff --git a/lib/parachain/pov_fetching_test.go → dot/parachain/pov_fetching_test.go b/lib/parachain/pov_fetching_test.go → dot/parachain/pov_fetching_test.go
diff --git a/lib/parachain/runtime/instance.go → dot/parachain/runtime/instance.go b/lib/parachain/runtime/instance.go → dot/parachain/runtime/instance.go
@@ -8,8 +8,8 @@ import (
 	"errors"
 	"fmt"
 
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/lib/common"
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
 	runtimewasmer "github.com/ChainSafe/gossamer/lib/runtime/wasmer"
 	"github.com/ChainSafe/gossamer/pkg/scale"
 )

diff --git a/lib/parachain/service.go → dot/parachain/service.go b/lib/parachain/service.go → dot/parachain/service.go
diff --git a/lib/parachain/statement.go → dot/parachain/statement.go b/lib/parachain/statement.go → dot/parachain/statement.go
@@ -6,8 +6,8 @@ package parachain
 import (
 	"fmt"
 
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/lib/common"
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
 	"github.com/ChainSafe/gossamer/pkg/scale"
 )
 

diff --git a/...rachain/statement_distribution_message.go → ...rachain/statement_distribution_message.go b/...rachain/statement_distribution_message.go → ...rachain/statement_distribution_message.go
@@ -6,8 +6,8 @@ package parachain
 import (
 	"fmt"
 
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/lib/common"
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
 	"github.com/ChainSafe/gossamer/pkg/scale"
 )
 

diff --git a/...in/statement_distribution_message_test.go → ...in/statement_distribution_message_test.go b/...in/statement_distribution_message_test.go → ...in/statement_distribution_message_test.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"testing"
 
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/lib/common"
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
 	"github.com/ChainSafe/gossamer/pkg/scale"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v3"

diff --git a/lib/parachain/statement_fetching.go → dot/parachain/statement_fetching.go b/lib/parachain/statement_fetching.go → dot/parachain/statement_fetching.go
@@ -6,8 +6,8 @@ package parachain
 import (
 	"fmt"
 
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/lib/common"
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
 	"github.com/ChainSafe/gossamer/pkg/scale"
 )
 

diff --git a/lib/parachain/statement_fetching_test.go → dot/parachain/statement_fetching_test.go b/lib/parachain/statement_fetching_test.go → dot/parachain/statement_fetching_test.go
@@ -6,8 +6,8 @@ package parachain
 import (
 	"testing"
 
+	parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types"
 	"github.com/ChainSafe/gossamer/lib/common"
-	parachaintypes "github.com/ChainSafe/gossamer/lib/parachain/types"
 	"github.com/stretchr/testify/require"
 )