embed core markets

skip-mev · May 15, 2024 · 30f4980 · 30f4980
1 parent 1b9d1e3
commit 30f4980
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/app/upgrades/v4.0.0/upgrades.go b/app/upgrades/v4.0.0/upgrades.go
@@ -18,8 +18,12 @@ import (
 
 	"github.com/neutron-org/neutron/v4/app/upgrades"
 	slinkyutils "github.com/neutron-org/neutron/v4/utils/slinky"
+	_ "embed"
 )
 
+//go:embed markets.json
+var marketsJSON []byte
+
 func CreateUpgradeHandler(
 	mm *module.Manager,
 	configurator module.Configurator,
@@ -68,7 +72,7 @@ func setMarketMapParams(ctx sdk.Context, marketmapKeeper *marketmapkeeper.Keeper
 }
 
 func setMarketState(ctx sdk.Context, mmKeeper *marketmapkeeper.Keeper) error {
-	markets, err := slinkyutils.ReadMarketsFromFile("markets.json")
+	markets, err := slinkyutils.ReadMarketsFromFile(marketsJSON)
 	if err != nil {
 		return err
 	}

diff --git a/app/upgrades/v4.0.0/upgrades_test.go b/app/upgrades/v4.0.0/upgrades_test.go
@@ -16,8 +16,12 @@ import (
 
 	v400 "github.com/neutron-org/neutron/v4/app/upgrades/v4.0.0"
 	"github.com/neutron-org/neutron/v4/testutil"
+	_ "embed"
 )
 
+//go:embed markets.json
+var marketsJSON []byte
+
 type UpgradeTestSuite struct {
 	testutil.IBCConnectionTestSuite
 }
@@ -35,7 +39,7 @@ func (suite *UpgradeTestSuite) TestOracleUpgrade() {
 	ctx := suite.ChainA.GetContext()
 	t := suite.T()
 
-	markets, err := slinkyutils.ReadMarketsFromFile("markets.json")
+	markets, err := slinkyutils.ReadMarketsFromFile(marketsJSON)
 	suite.Require().NoError(err)
 	marketMap := slinkyutils.ToMarketMap(markets)
 

diff --git a/utils/slinky/slinky.go b/utils/slinky/slinky.go
@@ -3,24 +3,17 @@ package slinky
 import (
 	"encoding/json"
 	"fmt"
-	"os"
 
 	marketmaptypes "github.com/skip-mev/slinky/x/marketmap/types"
 )
 
 // ReadMarketsFromFile reads a market map configuration from a file at the given path.
-func ReadMarketsFromFile(path string) ([]marketmaptypes.Market, error) {
+func ReadMarketsFromFile(marketsBz []byte) ([]marketmaptypes.Market, error) {
 	// Initialize the struct to hold the configuration
 	var markets []marketmaptypes.Market
 
-	// Read the entire file at the given path
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return nil, fmt.Errorf("error reading config file: %w", err)
-	}
-
 	// Unmarshal the JSON data into the config struct
-	if err := json.Unmarshal(data, &markets); err != nil {
+	if err := json.Unmarshal(marketsBz, &markets); err != nil {
 		return nil, fmt.Errorf("error unmarshalling config JSON: %w", err)
 	}