Skip to content

feat: add context to EventID #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AaronGoldman wants to merge 2 commits into from
Closed

feat: add context to EventID #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9b4c72
feat: add context to EventID
AaronGoldman Nov 30, 2023
1f8a624
feat: with_max_blocknumber_fencepost
AaronGoldman Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 68 additions & 24 deletions api/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ where
?self.network,
sort_key, sort_value, controller, "subscribe params"
);
let context = "";
let blocknumber = 0;
let offset = offset
.map(|float| {
let int = float as usize;
Expand Down Expand Up @@ -189,30 +191,50 @@ where
.map_err(|err| ApiError(format!("stream_id: {err}")))?;
(
start_builder
.with_context(context)
.with_blocknumber(blocknumber)
.with_controller(&controller)
.with_init(&stream_id.cid),
stop_builder
.with_context(context)
.with_blocknumber(blocknumber)
.with_controller(&controller)
.with_init(&stream_id.cid),
)
}
(Some(controller), None) => (
start_builder.with_controller(&controller).with_min_init(),
stop_builder.with_controller(&controller).with_max_init(),
start_builder
.with_context(context)
.with_blocknumber(blocknumber)
.with_controller(&controller)
.with_min_init(),
stop_builder
.with_context(context)
.with_blocknumber(blocknumber)
.with_controller(&controller)
.with_max_init(),
),
(None, Some(_)) => {
return Err(ApiError(
"controller is required if stream_id is specified".to_owned(),
))
}
(None, None) => (
start_builder.with_min_controller().with_min_init(),
stop_builder.with_max_controller().with_max_init(),
start_builder
.with_context(context)
.with_blocknumber(blocknumber)
.with_min_controller()
.with_min_init(),
stop_builder
.with_context(context)
.with_blocknumber(blocknumber)
.with_max_controller()
.with_max_init(),
),
};

let start = start_builder.with_min_event_height().build_fencepost();
let stop = stop_builder.with_max_event_height().build_fencepost();
let start = start_builder.build_fencepost();
let stop = stop_builder.build_fencepost();

// Update interest ranges to include this new subscription.
let interest = Interest::builder()
Expand Down Expand Up @@ -330,15 +352,24 @@ mod tests {
async fn create_event() {
let peer_id = PeerId::random();
let network = Network::InMemory;
let event_id = EventId::new(
&network,
"model",
"k2t6wz4ylx0qr6v7dvbczbxqy7pqjb0879qx930c1e27gacg3r8sllonqt4xx9", // cspell:disable-line
"did:key:zGs1Det7LHNeu7DXT4nvoYrPfj3n6g7d6bj2K4AMXEvg1", // cspell:disable-line
&Cid::from_str("baejbeihyr3kf77etqdccjfoc33dmko2ijyugn6qk6yucfkioasjssz3bbu").unwrap(), // cspell:disable-line
0,
&Cid::from_str("baejbeicqtpe5si4qvbffs2s7vtbk5ccbsfg6owmpidfj3zeluqz4hlnz6m").unwrap(), // cspell:disable-line
);
let event_id = EventId::builder()
.with_network(&network)
.with_sort_value(
"model",
"k2t6wz4ylx0qr6v7dvbczbxqy7pqjb0879qx930c1e27gacg3r8sllonqt4xx9",
) // cspell:disable-line
.with_context("")
.with_blocknumber(0)
.with_controller("did:key:zGs1Det7LHNeu7DXT4nvoYrPfj3n6g7d6bj2K4AMXEvg1") // cspell:disable-line
.with_init(
&Cid::from_str("baejbeihyr3kf77etqdccjfoc33dmko2ijyugn6qk6yucfkioasjssz3bbu")
.unwrap(),
) // cspell:disable-line
.with_event(
&Cid::from_str("baejbeicqtpe5si4qvbffs2s7vtbk5ccbsfg6owmpidfj3zeluqz4hlnz6m")
.unwrap(),
) // cspell:disable-line
.build();
let event_id_str = multibase::encode(Base::Base16Lower, event_id.to_bytes());
let mock_interest = MockReconInterestTest::new();
let mut mock_model = MockReconModelTest::new();
Expand All @@ -365,27 +396,33 @@ mod tests {
let peer_id = PeerId::random();
let network = Network::InMemory;
let model = "k2t6wz4ylx0qr6v7dvbczbxqy7pqjb0879qx930c1e27gacg3r8sllonqt4xx9"; // cspell:disable-line
let context = "";
let blocknumber = 0;

// Construct start and end event ids
let start = EventId::builder()
.with_network(&network)
.with_sort_value("model", model)
.with_context(context)
.with_blocknumber(blocknumber)
.with_min_controller()
.with_min_init()
.with_min_event_height()
.build_fencepost();
let end = EventId::builder()
.with_network(&network)
.with_sort_value("model", model)
.with_context(context)
.with_blocknumber(blocknumber)
.with_max_controller()
.with_max_init()
.with_max_event_height()
.build_fencepost();

// Construct event to be returned
let event_id = EventId::builder()
.with_network(&network)
.with_sort_value("model", model)
.with_context(context)
.with_blocknumber(blocknumber)
.with_controller("did:key:zH3RdYVn3WtYR3LXmXk8wA6XWUjWMLgRa5ia1tgR3uR9D")
.with_init(
&StreamId::from_str(
Expand All @@ -394,7 +431,6 @@ mod tests {
.unwrap()
.cid,
)
.with_event_height(9)
.with_event(
&Cid::from_str("baejbeibmbnp2ffyug3cfamsw7cno3plz5qkwfednrkyse6azcz7fycdym4") // cspell:disable-line
.unwrap(),
Expand Down Expand Up @@ -456,16 +492,18 @@ mod tests {
let start = EventId::builder()
.with_network(&network)
.with_sort_value("model", model)
.with_context("")
.with_blocknumber(0)
.with_controller(controller)
.with_min_init()
.with_min_event_height()
.build_fencepost();
let end = EventId::builder()
.with_network(&network)
.with_sort_value("model", model)
.with_context("")
.with_blocknumber(0)
.with_controller(controller)
.with_max_init()
.with_max_event_height()
.build_fencepost();
let mut mock_interest = MockReconInterestTest::new();
mock_interest
Expand Down Expand Up @@ -519,16 +557,18 @@ mod tests {
let start = EventId::builder()
.with_network(&network)
.with_sort_value("model", model)
.with_context("")
.with_blocknumber(0)
.with_controller(controller)
.with_init(&stream.cid)
.with_min_event_height()
.build_fencepost();
let end = EventId::builder()
.with_network(&network)
.with_sort_value("model", model)
.with_context("")
.with_blocknumber(0)
.with_controller(controller)
.with_init(&stream.cid)
.with_max_event_height()
.build_fencepost();
let mut mock_interest = MockReconInterestTest::new();
mock_interest
Expand Down Expand Up @@ -575,23 +615,27 @@ mod tests {
let peer_id = PeerId::random();
let network = Network::InMemory;
let model = "k2t6wz4ylx0qr6v7dvbczbxqy7pqjb0879qx930c1e27gacg3r8sllonqt4xx9"; // cspell:disable-line
let context = "";
let blocknumber = 0;
let controller = "did:key:zGs1Det7LHNeu7DXT4nvoYrPfj3n6g7d6bj2K4AMXEvg1";
let stream =
StreamId::from_str("k2t6wz4ylx0qs435j9oi1s6469uekyk6qkxfcb21ikm5ag2g1cook14ole90aw") // cspell:disable-line
.unwrap();
let start = EventId::builder()
.with_network(&network)
.with_sort_value("model", model)
.with_context(context)
.with_blocknumber(blocknumber)
.with_controller(controller)
.with_init(&stream.cid)
.with_min_event_height()
.build_fencepost();
let end = EventId::builder()
.with_network(&network)
.with_sort_value("model", model)
.with_context(context)
.with_blocknumber(blocknumber)
.with_controller(controller)
.with_init(&stream.cid)
.with_max_event_height()
.build_fencepost();
let mut mock_interest = MockReconInterestTest::new();
mock_interest
Expand Down
Loading