fix: remove wire.go and flatten pkgs. We are deciding to go with explicit import on the client side to inject the different chain family implementations

Author: ecPablo

mcms/changesets/set-config/changeset_test.go

@@ -31,7 +31,7 @@ import (
 	solchangesets "github.com/smartcontractkit/cld-changesets/legacy/pkg/family/solana/changesets"
 	soltestutils "github.com/smartcontractkit/cld-changesets/legacy/pkg/family/solana/testutils"
 	setconfig "github.com/smartcontractkit/cld-changesets/mcms/changesets/set-config"
-	setconfigtypes "github.com/smartcontractkit/cld-changesets/mcms/changesets/set-config/types"
+	_ "github.com/smartcontractkit/cld-changesets/mcms/changesets/set-config/all"
 )
 
 //nolint:paralleltest // global mcm.SetProgramID state and shared Solana CTF container setup
@@ -109,7 +109,7 @@ func TestChangeset_VerifyPreconditions(t *testing.T) {
 		{
 			name: "partial targets only proposer",
 			input: setConfigInput(
-				[]setconfigtypes.ContractSetConfig{
+				[]setconfig.ContractSetConfig{
 					{
 						Ref:    contractRef(evmSelector, mcmscontracts.ProposerManyChainMultisig, ""),
 						Config: validCfg,
@@ -144,7 +144,7 @@ func TestChangeset_VerifyPreconditions(t *testing.T) {
 		{
 			name: "ref missing from datastore",
 			input: setConfigInput(
-				[]setconfigtypes.ContractSetConfig{
+				[]setconfig.ContractSetConfig{
 					{
 						Ref:    contractRef(evmSelector, mcmscontracts.ProposerManyChainMultisig, "does-not-exist"),
 						Config: validCfg,
@@ -241,13 +241,13 @@ func TestChangeset_EVM(t *testing.T) {
 			mcmsState, _ := evmMCMSChainState(t, rt, tt.selector)
 			originalCfg := cldftesthelpers.SingleGroupMCMS(t)
 
-			var targets []setconfigtypes.ContractSetConfig
+			var targets []setconfig.ContractSetConfig
 			var mcmsInput *cldf.MCMSTimelockProposalInput
 			if tt.useMCMS {
 				cfgCanceller := cldftesthelpers.SingleGroupMCMS(t)
 				cfgCanceller.Signers = append(cfgCanceller.Signers, mcmsState.BypasserMcm.Address())
 				cfgCanceller.Quorum = 2
-				targets = []setconfigtypes.ContractSetConfig{
+				targets = []setconfig.ContractSetConfig{
 					{
 						Ref:    contractRef(tt.selector, mcmscontracts.CancellerManyChainMultisig, ""),
 						Config: cfgCanceller,
@@ -337,7 +337,7 @@ func TestChangeset_EVM_PartialTargets(t *testing.T) {
 
 	err := rt.Exec(
 		runtime.ChangesetTask(setconfig.Changeset{}, setConfigInput(
-			[]setconfigtypes.ContractSetConfig{
+			[]setconfig.ContractSetConfig{
 				{
 					Ref:    contractRef(selector, mcmscontracts.ProposerManyChainMultisig, ""),
 					Config: cfgProposer,
@@ -431,7 +431,7 @@ func TestChangeset_EVM_Qualifier(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			input := setConfigInput(
-				[]setconfigtypes.ContractSetConfig{
+				[]setconfig.ContractSetConfig{
 					{
 						Ref:    contractRef(selector, mcmscontracts.ProposerManyChainMultisig, tt.qualifier),
 						Config: cfgProposer,
@@ -543,7 +543,7 @@ func TestChangeset_VerifyPreconditions_zeroRefChainSelector(t *testing.T) {
 
 	cfg := cldftesthelpers.SingleGroupMCMS(t)
 	input := setConfigInput(
-		[]setconfigtypes.ContractSetConfig{
+		[]setconfig.ContractSetConfig{
 			{
 				Ref: refkey.RefKey{
 					ChainSelector: 0,
@@ -568,7 +568,7 @@ func TestChangeset_Apply_unsupportedFamily(t *testing.T) {
 	cfg := cldftesthelpers.SingleGroupMCMS(t)
 
 	_, err := setconfig.Changeset{}.Apply(cldf.Environment{}, setConfigInput(
-		[]setconfigtypes.ContractSetConfig{
+		[]setconfig.ContractSetConfig{
 			{
 				Ref: refkey.New(
 					selector,

mcms/changesets/set-config/helpers_test.go

@@ -25,7 +25,7 @@ import (
 	evmstate "github.com/smartcontractkit/cld-changesets/legacy/pkg/family/evm"
 	soltestutils "github.com/smartcontractkit/cld-changesets/legacy/pkg/family/solana/testutils"
 	setconfig "github.com/smartcontractkit/cld-changesets/mcms/changesets/set-config"
-	setconfigtypes "github.com/smartcontractkit/cld-changesets/mcms/changesets/set-config/types"
+	_ "github.com/smartcontractkit/cld-changesets/mcms/changesets/set-config/all"
 )
 
 func contractRef(chainSelector uint64, contractType cldf.ContractType, qualifier string) refkey.RefKey {
@@ -35,8 +35,8 @@ func contractRef(chainSelector uint64, contractType cldf.ContractType, qualifier
 func evmMCMSTargets(
 	chainSelector uint64,
 	proposer, canceller, bypasser mcmstypes.Config,
-) []setconfigtypes.ContractSetConfig {
-	return []setconfigtypes.ContractSetConfig{
+) []setconfig.ContractSetConfig {
+	return []setconfig.ContractSetConfig{
 		{Ref: contractRef(chainSelector, mcmscontracts.ProposerManyChainMultisig, ""), Config: proposer},
 		{Ref: contractRef(chainSelector, mcmscontracts.CancellerManyChainMultisig, ""), Config: canceller},
 		{Ref: contractRef(chainSelector, mcmscontracts.BypasserManyChainMultisig, ""), Config: bypasser},
@@ -46,8 +46,8 @@ func evmMCMSTargets(
 func solanaMCMSTargets(
 	chainSelector uint64,
 	proposer, canceller, bypasser mcmstypes.Config,
-) []setconfigtypes.ContractSetConfig {
-	return []setconfigtypes.ContractSetConfig{
+) []setconfig.ContractSetConfig {
+	return []setconfig.ContractSetConfig{
 		{Ref: contractRef(chainSelector, mcmscontracts.ProposerManyChainMultisig, ""), Config: proposer},
 		{Ref: contractRef(chainSelector, mcmscontracts.CancellerManyChainMultisig, ""), Config: canceller},
 		{Ref: contractRef(chainSelector, mcmscontracts.BypasserManyChainMultisig, ""), Config: bypasser},
@@ -74,7 +74,7 @@ func newBypassMCMSInput(description, qualifier string) *cldf.MCMSTimelockProposa
 	}
 }
 
-func setConfigInput(targets []setconfigtypes.ContractSetConfig, mcms *cldf.MCMSTimelockProposalInput) setconfig.Input {
+func setConfigInput(targets []setconfig.ContractSetConfig, mcms *cldf.MCMSTimelockProposalInput) setconfig.Input {
 	return setconfig.Input{
 		Cfg:  setconfig.Config{Targets: targets},
 		MCMS: mcms,