store: Refactor StoredDynamicDataSource.context to json value

leoyvens · leoyvens · commit cf4cbed24e2f · 2022-06-03T23:56:52.000+01:00
diff --git a/chain/ethereum/src/data_source.rs b/chain/ethereum/src/data_source.rs
@@ -6,7 +6,7 @@ use graph::prelude::ethabi::ethereum_types::H160;
 use graph::prelude::ethabi::StateMutability;
 use graph::prelude::futures03::future::try_join;
 use graph::prelude::futures03::stream::FuturesOrdered;
-use graph::prelude::{Entity, Link, SubgraphManifestValidationError};
+use graph::prelude::{Link, SubgraphManifestValidationError};
 use graph::slog::{o, trace};
 use std::str::FromStr;
 use std::{convert::TryFrom, sync::Arc};
@@ -125,7 +125,7 @@ impl blockchain::DataSource<Chain> for DataSource {
                 .context
                 .as_ref()
                 .as_ref()
-                .map(|ctx| serde_json::to_string(&ctx).unwrap()),
+                .map(|ctx| serde_json::to_value(&ctx).unwrap()),
             creation_block: self.creation_block,
         }
     }
@@ -141,9 +141,7 @@ impl blockchain::DataSource<Chain> for DataSource {
             creation_block,
         } = stored;
 
-        let context = context
-            .map(|ctx| serde_json::from_str::<Entity>(&ctx))
-            .transpose()?;
+        let context = context.map(serde_json::from_value).transpose()?;
 
         let contract_abi = template.mapping.find_abi(&template.source.abi)?;
 
diff --git a/graph/src/components/store/mod.rs b/graph/src/components/store/mod.rs
@@ -834,7 +834,7 @@ pub enum UnfailOutcome {
 pub struct StoredDynamicDataSource {
     pub name: String,
     pub address: Option<Address>,
-    pub context: Option<String>,
+    pub context: Option<serde_json::Value>,
     pub creation_block: Option<BlockNumber>,
 }
 
diff --git a/store/postgres/src/dynds/shared.rs b/store/postgres/src/dynds/shared.rs
@@ -13,7 +13,7 @@ use graph::{
     components::store::StoredDynamicDataSource,
     constraint_violation,
     prelude::{
-        bigdecimal::ToPrimitive, web3::types::H160, BigDecimal, BlockNumber, BlockPtr,
+        bigdecimal::ToPrimitive, serde_json, web3::types::H160, BigDecimal, BlockNumber, BlockPtr,
         DeploymentHash, StoreError,
     },
 };
@@ -74,7 +74,7 @@ pub(super) fn load(
         let data_source = StoredDynamicDataSource {
             name,
             address,
-            context,
+            context: context.map(|ctx| serde_json::from_str(&ctx)).transpose()?,
             creation_block,
         };
 
@@ -123,7 +123,7 @@ pub(super) fn insert(
             Ok((
                 decds::deployment.eq(deployment.as_str()),
                 decds::name.eq(name),
-                decds::context.eq(context),
+                decds::context.eq(serde_json::to_string(context).unwrap()),
                 decds::address.eq(address),
                 decds::abi.eq(""),
                 decds::start_block.eq(0),

Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,7 @@ pub enum UnfailOutcome {`
`834`	`834`	`pub struct StoredDynamicDataSource {`
`835`	`835`	`pub name: String,`
`836`	`836`	`pub address: Option<Address>,`
`837`		`- pub context: Option<String>,`
	`837`	`+ pub context: Option<serde_json::Value>,`
`838`	`838`	`pub creation_block: Option<BlockNumber>,`
`839`	`839`	`}`
`840`	`840`