fix(chain): remove network enum

Per discussion, having to update the network enum in order to support new network type might be too strict in future JIRA: https://smartcontract-it.atlassian.net/browse/DPA-1151
smartcontractkit · Oct 29, 2024 · a58e3e5 · a58e3e5
1 parent 75ac36a
commit a58e3e5
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 33 deletions.
diff --git a/core/services/relay/relay.go b/core/services/relay/relay.go
@@ -3,14 +3,11 @@ package relay
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 )
 
-type NetworkType string
-
 const (
 	NetworkEVM      = "evm"
 	NetworkCosmos   = "cosmos"
@@ -31,15 +28,6 @@ var SupportedNetworks = map[string]struct{}{
 	NetworkDummy: {},
 }
 
-// From returns a NetworkType from a string.
-func From(s string) (NetworkType, error) {
-	s = strings.ToLower(s)
-	if _, ok := SupportedNetworks[s]; !ok {
-		return "", fmt.Errorf("unknown network type: %s", s)
-	}
-	return NetworkType(s), nil
-}
-
 var _ loop.Relayer = (*ServerAdapter)(nil)
 
 // ServerAdapter extends [loop.RelayerAdapter] by overriding NewPluginProvider to dispatches calls according to `RelayArgs.ProviderType`.

diff --git a/core/web/loader/chain.go b/core/web/loader/chain.go
@@ -16,7 +16,7 @@ type chainBatcher struct {
 	app chainlink.Application
 }
 
-// DEPRECATED: loadByChainIDs is deprecated and we should be using loadByRelayIDs.
+// Deprecated: use loadByChainIDs is deprecated and we should be using loadByRelayIDs.
 func (b *chainBatcher) loadByIDs(ctx context.Context, keys dataloader.Keys) []*dataloader.Result {
 	// Create a map for remembering the order of keys passed in
 	keyOrder := make(map[string]int, len(keys))

diff --git a/core/web/loader/getters.go b/core/web/loader/getters.go
@@ -20,7 +20,7 @@ import (
 var ErrInvalidType = errors.New("invalid type")
 
 // GetChainByID fetches the chain by it's id.
-// DEPRECATED: use GetChainByRelayID.
+// Deprecated: use GetChainByRelayID.
 func GetChainByID(ctx context.Context, id string) (*commonTypes.ChainStatusWithID, error) {
 	ldr := For(ctx)
 

diff --git a/core/web/resolver/chain_test.go b/core/web/resolver/chain_test.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"strings"
 	"testing"
 
 	gqlerrors "github.com/graph-gophers/graphql-go/errors"
@@ -162,7 +161,7 @@ func TestResolver_Chain(t *testing.T) {
 			}
 		`
 		queryWithNetwork = `
-			query GetChain($network: Network)  {
+			query GetChain($network: String)  {
 				chain(id: "1", network: $network) {
 					... on Chain {
 						id
@@ -312,7 +311,7 @@ ResendAfterThreshold = '1h0m0s'
 			name:          "should return aptos chain if network is aptos",
 			authenticated: true,
 			variables: map[string]interface{}{
-				"network": strings.ToUpper(relay.NetworkAptos),
+				"network": relay.NetworkAptos,
 			},
 			before: func(ctx context.Context, f *gqlTestFramework) {
 				chainConf := evmtoml.EVMConfig{

diff --git a/core/web/resolver/query.go b/core/web/resolver/query.go
@@ -15,7 +15,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/vrfkey"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/utils/stringutils"
 	"github.com/smartcontractkit/chainlink/v2/core/web/loader"
@@ -86,12 +85,7 @@ func (r *Resolver) Chain(ctx context.Context,
 		return NewChainPayload(*id, nil), nil
 	}
 
-	networkToUse, err := relay.From(*args.Network)
-	if err != nil {
-		return NewChainPayload(commonTypes.ChainStatusWithID{}, chains.ErrNotFound), nil
-	}
-
-	relayID := types.NewRelayID(string(networkToUse), string(args.ID))
+	relayID := types.NewRelayID(*args.Network, string(args.ID))
 	id, err := loader.GetChainByRelayID(ctx, relayID.Name())
 	if err != nil {
 		if errors.Is(err, chains.ErrNotFound) {

diff --git a/core/web/schema/schema.graphql b/core/web/schema/schema.graphql
@@ -10,7 +10,7 @@ schema {
 type Query {
     bridge(id: ID!): BridgePayload!
     bridges(offset: Int, limit: Int): BridgesPayload!
-    chain(id: ID!, network: Network): ChainPayload!
+    chain(id: ID!, network: String): ChainPayload!
     chains(offset: Int, limit: Int): ChainsPayload!
     configv2: ConfigV2Payload!
     csaKeys: CSAKeysPayload!

diff --git a/core/web/schema/type/chain.graphql b/core/web/schema/type/chain.graphql
@@ -11,11 +11,3 @@ type ChainsPayload implements PaginatedPayload {
     results: [Chain!]!
     metadata: PaginationMetadata!
 }
-
-enum Network {
-    EVM
-    COSMOS
-    SOLANA
-    STARKNET
-    APTOS
-}