refactor: Extract registry types in to own crate

block-streamer/Cargo.toml

@@ -24,6 +24,8 @@ tokio-stream = "0.1.14"
 tonic = "0.10.2"
 wildmatch = "2.1.1"
 
+registry-types = { path = "../registry/types" }
+
 near-lake-framework = "0.7.4"
 
 [build-dependencies]

block-streamer/src/block_stream.rs

@@ -3,8 +3,8 @@ use near_lake_framework::near_indexer_primitives;
 use tokio::task::JoinHandle;
 
 use crate::indexer_config::IndexerConfig;
-use crate::rules::types::indexer_rule_match::ChainId;
-use crate::rules::MatchingRule;
+use crate::rules::types::ChainId;
+use registry_types::MatchingRule;
 
 /// The number of blocks to prefetch within `near-lake-framework`. The internal default is 100, but
 /// we need this configurable for testing purposes.
@@ -251,11 +251,11 @@ mod tests {
             )
             .unwrap(),
             function_name: "test".to_string(),
-            indexer_rule: crate::rules::IndexerRule {
-                indexer_rule_kind: crate::rules::IndexerRuleKind::Action,
-                matching_rule: crate::rules::MatchingRule::ActionAny {
+            indexer_rule: registry_types::IndexerRule {
+                indexer_rule_kind: registry_types::IndexerRuleKind::Action,
+                matching_rule: registry_types::MatchingRule::ActionAny {
                     affected_account_id: "queryapi.dataplatform.near".to_string(),
-                    status: crate::rules::Status::Success,
+                    status: registry_types::Status::Success,
                 },
                 name: None,
                 id: None,

block-streamer/src/delta_lake_client.rs

@@ -1,9 +1,10 @@
-use crate::rules::types::indexer_rule_match::ChainId;
 use anyhow::Context;
 use chrono::TimeZone;
 use futures::future::try_join_all;
 use near_lake_framework::near_indexer_primitives;
 
+use crate::rules::types::ChainId;
+
 const DELTA_LAKE_BUCKET: &str = "near-delta-lake";
 const MAX_S3_RETRY_COUNT: u8 = 20;
 const INDEXED_ACTIONS_PREFIX: &str = "silver/accounts/action_receipt_actions/metadata";

block-streamer/src/indexer_config.rs

@@ -2,16 +2,9 @@ use near_lake_framework::near_indexer_primitives::types::AccountId;
 use std::collections::hash_map::DefaultHasher;
 use std::hash::{Hash, Hasher};
 
-use crate::rules::IndexerRule;
+use registry_types::IndexerRule;
 
-#[derive(
-    borsh::BorshSerialize,
-    borsh::BorshDeserialize,
-    serde::Serialize,
-    serde::Deserialize,
-    Clone,
-    Debug,
-)]
+#[derive(serde::Serialize, serde::Deserialize, Clone, Debug)]
 pub struct IndexerConfig {
     pub account_id: AccountId,
     pub function_name: String,

block-streamer/src/rules/matcher.rs

@@ -2,9 +2,9 @@ use near_lake_framework::near_indexer_primitives::{
     views::{ActionView, ExecutionStatusView, ReceiptEnumView},
     IndexerExecutionOutcomeWithReceipt,
 };
+use registry_types::{MatchingRule, Status};
 
-use crate::rules::types::events::Event;
-use crate::rules::{MatchingRule, Status};
+use crate::rules::types::Event;
 
 pub fn matches(
     matching_rule: &MatchingRule,

block-streamer/src/rules/mod.rs

@@ -3,62 +3,9 @@ pub mod outcomes_reducer;
 pub mod types;
 
 use near_lake_framework::near_indexer_primitives::StreamerMessage;
-use types::indexer_rule_match::{ChainId, IndexerRuleMatch};
+use registry_types::{IndexerRule, MatchingRule};
 
-#[cfg(not(feature = "near-sdk"))]
-use borsh::{self, BorshDeserialize, BorshSerialize};
-#[cfg(not(feature = "near-sdk"))]
-use serde::{Deserialize, Serialize};
-
-#[cfg(feature = "near-sdk")]
-use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize};
-#[cfg(feature = "near-sdk")]
-use near_sdk::serde::{Deserialize, Serialize};
-
-#[derive(Clone, Debug, Serialize, Deserialize, BorshSerialize, BorshDeserialize, PartialEq, Eq)]
-pub struct IndexerRule {
-    pub indexer_rule_kind: IndexerRuleKind,
-    pub matching_rule: MatchingRule,
-    pub id: Option<u32>,
-    pub name: Option<String>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, BorshSerialize, BorshDeserialize, PartialEq, Eq)]
-pub enum IndexerRuleKind {
-    Action,
-    Event,
-    AnyBlock,
-    Shard,
-}
-// future: ComposedRuleKind for multiple actions or events
-
-#[derive(Clone, Debug, Serialize, Deserialize, BorshSerialize, BorshDeserialize, PartialEq, Eq)]
-#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
-pub enum Status {
-    Any,
-    Success,
-    Fail,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, BorshSerialize, BorshDeserialize, PartialEq, Eq)]
-#[serde(tag = "rule", rename_all = "SCREAMING_SNAKE_CASE")]
-pub enum MatchingRule {
-    ActionAny {
-        affected_account_id: String,
-        status: Status,
-    },
-    ActionFunctionCall {
-        affected_account_id: String,
-        status: Status,
-        function: String,
-    },
-    Event {
-        contract_account_id: String,
-        standard: String,
-        version: String,
-        event: String,
-    },
-}
+use types::{ChainId, IndexerRuleMatch};
 
 pub fn reduce_indexer_rule_matches(
     indexer_rule: &IndexerRule,

block-streamer/src/rules/outcomes_reducer.rs

@@ -1,6 +1,6 @@
 use crate::rules::matcher;
-use crate::rules::types::events::Event;
-use crate::rules::types::indexer_rule_match::{ChainId, IndexerRuleMatch, IndexerRuleMatchPayload};
+use crate::rules::types::Event;
+use crate::rules::types::{ChainId, IndexerRuleMatch, IndexerRuleMatchPayload};
 use crate::rules::{IndexerRule, MatchingRule};
 use near_lake_framework::near_indexer_primitives::{
     IndexerExecutionOutcomeWithReceipt, StreamerMessage,
@@ -115,9 +115,10 @@ fn build_indexer_rule_match_payload(
 
 #[cfg(test)]
 mod tests {
+    use registry_types::{IndexerRule, IndexerRuleKind, MatchingRule, Status};
+
     use crate::rules::outcomes_reducer::reduce_indexer_rule_matches_from_outcomes;
-    use crate::rules::types::indexer_rule_match::{ChainId, IndexerRuleMatch};
-    use crate::rules::{IndexerRule, IndexerRuleKind, MatchingRule, Status};
+    use crate::rules::types::{ChainId, IndexerRuleMatch};
 
     #[tokio::test]
     async fn match_wildcard_no_match() {