Skip to content

Commit b8eccce

Browse files
committed
wip
1 parent e5c3720 commit b8eccce

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

dev/local-environment/setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
PARTNER_CHAINS_NODE_IMAGE="docker.io/library/partner-chains-node:latest"
3+
PARTNER_CHAINS_NODE_IMAGE="ghcr.io/input-output-hk/partner-chains/partner-chains-node-unstable:latest"
44
CARDANO_IMAGE="ghcr.io/intersectmbo/cardano-node:10.5.1"
55
DBSYNC_IMAGE="ghcr.io/intersectmbo/cardano-db-sync:13.6.0.5"
66
DOLOS_IMAGE="ghcr.io/txpipe/dolos:1.0.0-rc.2"
@@ -388,7 +388,7 @@ create_docker_compose() {
388388
cat ./modules/db-sync.txt >> docker-compose.yml
389389
cat ./modules/postgres.txt >> docker-compose.yml
390390
cat ./modules/dolos.txt >> docker-compose.yml
391-
cat ./modules/partner-chains-nodes-jankun.txt >> docker-compose.yml
391+
cat ./modules/partner-chains-nodes-dolos.txt >> docker-compose.yml
392392
cat ./modules/partner-chains-setup.txt >> docker-compose.yml
393393
;;
394394
0)

toolkit/committee-selection/authority-selection-inherents/src/ariadne_inherent_data_provider.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,6 @@ impl AriadneInherentDataProvider {
102102
}
103103
}
104104

105-
fn has_data(&self) -> bool {
106-
match self {
107-
AriadneInherentDataProvider::Inert => false,
108-
AriadneInherentDataProvider::Legacy(data) => data.is_some(),
109-
AriadneInherentDataProvider::V1(data) => data.is_some(),
110-
}
111-
}
112-
113105
async fn from_mc_data_legacy(
114106
candidate_data_source: &(dyn AuthoritySelectionDataSource + Send + Sync),
115107
for_epoch: McEpochNumber,
@@ -250,6 +242,14 @@ mod tests {
250242

251243
const TIMESTAMP: u64 = 400_000;
252244

245+
fn has_data(provider: &AriadneInherentDataProvider) -> bool {
246+
match provider {
247+
AriadneInherentDataProvider::Inert => false,
248+
AriadneInherentDataProvider::Legacy(data) => data.is_some(),
249+
AriadneInherentDataProvider::V1(data) => data.is_some(),
250+
}
251+
}
252+
253253
#[tokio::test]
254254
async fn return_empty_ariadne_cidp_if_runtime_requests_too_new_epoch() {
255255
// This is the epoch number that is too new
@@ -268,7 +268,7 @@ mod tests {
268268
.await;
269269

270270
assert!(empty_ariadne_idp.is_ok());
271-
assert!(!empty_ariadne_idp.unwrap().has_data());
271+
assert!(!has_data(&empty_ariadne_idp.unwrap()));
272272
}
273273

274274
#[tokio::test]
@@ -318,7 +318,7 @@ mod tests {
318318
.await;
319319

320320
assert!(ariadne_idp.is_ok());
321-
assert!(ariadne_idp.unwrap().has_data());
321+
assert!(has_data(&ariadne_idp.unwrap()));
322322
}
323323

324324
fn sc_epoch_duration_millis() -> u64 {

0 commit comments

Comments
 (0)