fix rebase artifacts

graphprotocol · Feb 14, 2024 · 370fcba · 370fcba
1 parent 91ee110
commit 370fcba
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/chain/starknet/src/data_source.rs b/chain/starknet/src/data_source.rs
@@ -5,7 +5,7 @@ use graph::{
         link_resolver::LinkResolver, store::StoredDynamicDataSource,
         subgraph::InstanceDSTemplateInfo,
     },
-    data::subgraph::DataSourceContext,
+    data::subgraph::{DataSourceContext, SubgraphManifestValidationError},
     prelude::{async_trait, BlockNumber, Deserialize, Link, Logger},
     semver,
 };

diff --git a/chain/starknet/src/trigger.rs b/chain/starknet/src/trigger.rs
@@ -3,7 +3,6 @@ use graph::{
     runtime::{asc_new, gas::GasCounter, AscPtr, HostExportError},
 };
 use graph_runtime_wasm::module::ToAscPtr;
-use starknet_ff::FieldElement;
 use std::{cmp::Ordering, sync::Arc};
 
 use crate::codec;

diff --git a/runtime/wasm/src/host.rs b/runtime/wasm/src/host.rs
@@ -5,7 +5,7 @@ use async_trait::async_trait;
 use futures::sync::mpsc::Sender;
 use futures03::channel::oneshot::channel;
 
-use graph::blockchain::{Blockchain, HostFn, RuntimeAdapter};
+use graph::blockchain::{BlockTime, Blockchain, HostFn, RuntimeAdapter};
 use graph::components::store::{EnsLookup, SubgraphFork};
 use graph::components::subgraph::{MappingError, SharedProofOfIndexing};
 use graph::data_source::{

diff --git a/runtime/wasm/src/host_exports.rs b/runtime/wasm/src/host_exports.rs
@@ -11,6 +11,7 @@ use never::Never;
 use semver::Version;
 use web3::types::H160;
 
+use graph::blockchain::BlockTime;
 use graph::blockchain::Blockchain;
 use graph::components::store::{EnsLookup, GetScope, LoadRelatedRequest};
 use graph::components::subgraph::{
@@ -351,7 +352,7 @@ impl HostExports {
         let entity_type = state.entity_cache.schema.entity_type(&entity_type)?;
         Self::expect_object_type(&entity_type, "remove")?;
 
-        let key = entity_type.parse_key_in(entity_id, self.data_source_causality_region)?;
+        let key = entity_type.parse_key_in(entity_id, self.data_source.causality_region)?;
         self.check_entity_type_access(&key.entity_type)?;
 
         gas.consume_host_fn_with_metrics(
@@ -375,7 +376,7 @@ impl HostExports {
         let entity_type = state.entity_cache.schema.entity_type(&entity_type)?;
         Self::expect_object_type(&entity_type, "get")?;
 
-        let store_key = entity_type.parse_key_in(entity_id, self.data_source_causality_region)?;
+        let store_key = entity_type.parse_key_in(entity_id, self.data_source.causality_region)?;
         self.check_entity_type_access(&store_key.entity_type)?;
 
         let result = state.entity_cache.get(&store_key, scope)?;
@@ -1113,7 +1114,7 @@ pub mod test_support {
     use std::{collections::HashMap, sync::Arc};
 
     use graph::{
-        blockchain::{BlockTime, Blockchain},
+        blockchain::BlockTime,
         components::{
             store::{BlockNumber, GetScope},
             subgraph::SharedProofOfIndexing,

diff --git a/runtime/wasm/src/mapping.rs b/runtime/wasm/src/mapping.rs
@@ -2,7 +2,7 @@ use crate::gas_rules::GasRules;
 use crate::module::{ExperimentalFeatures, ToAscPtr, WasmInstance};
 use futures::sync::mpsc;
 use futures03::channel::oneshot::Sender;
-use graph::blockchain::{Blockchain, HostFn};
+use graph::blockchain::{BlockTime, Blockchain, HostFn};
 use graph::components::store::SubgraphFork;
 use graph::components::subgraph::{MappingError, SharedProofOfIndexing};
 use graph::data_source::{MappingTrigger, TriggerWithHandler};

diff --git a/runtime/wasm/src/module/context.rs b/runtime/wasm/src/module/context.rs
@@ -269,6 +269,7 @@ impl WasmInstanceContext<'_> {
             block_number,
             &mut ctx.state,
             &ctx.proof_of_indexing,
+            ctx.timestamp,
             entity,
             id,
             data,

diff --git a/store/postgres/src/relational.rs b/store/postgres/src/relational.rs
@@ -362,9 +362,9 @@ impl Layout {
             qualified_name: SqlName::qualified_name(&catalog.site.namespace, &table_name),
             name: table_name,
             columns,
-            /// The position of this table in all the tables for this layout; this
-            /// is really only needed for the tests to make the names of indexes
-            /// predictable
+            // The position of this table in all the tables for this layout; this
+            // is really only needed for the tests to make the names of indexes
+            // predictable
             position: position as u32,
             is_account_like: false,
             immutable: false,