Skip to content

Commit beed4be

Browse files
fix: get owner function
1 parent 153ecea commit beed4be

File tree

3 files changed

+30
-18
lines changed

3 files changed

+30
-18
lines changed

contracts/solver-registry/src/upgrade.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ impl Contract {
3030
GasWeight(1),
3131
)
3232
.function_call_weight(
33-
"get_owner_id".into(),
33+
"owner_get".into(),
3434
vec![],
3535
NearToken::ZERO,
3636
Gas::from_tgas(10),

contracts/solver-registry/tests/common/utils.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ pub async fn get_pool_info(
479479
pub async fn get_owner_id(
480480
solver_registry: &Contract,
481481
) -> Result<AccountId, Box<dyn std::error::Error>> {
482-
let result = solver_registry.view("get_owner_id").await?;
482+
let result = solver_registry.view("owner_get").await?;
483483
let owner_id: AccountId = serde_json::from_slice(&result.result).unwrap();
484484
Ok(owner_id)
485485
}
@@ -494,18 +494,14 @@ pub async fn get_approved_compose_hashes(
494494
}
495495

496496
// Helper function to get pool length
497-
pub async fn get_pool_len(
498-
solver_registry: &Contract,
499-
) -> Result<u32, Box<dyn std::error::Error>> {
497+
pub async fn get_pool_len(solver_registry: &Contract) -> Result<u32, Box<dyn std::error::Error>> {
500498
let result = solver_registry.view("get_pool_len").await?;
501499
let pool_length: u32 = serde_json::from_slice(&result.result).unwrap();
502500
Ok(pool_length)
503501
}
504502

505503
// Helper function to get worker length
506-
pub async fn get_worker_len(
507-
solver_registry: &Contract,
508-
) -> Result<u32, Box<dyn std::error::Error>> {
504+
pub async fn get_worker_len(solver_registry: &Contract) -> Result<u32, Box<dyn std::error::Error>> {
509505
let result = solver_registry.view("get_worker_len").await?;
510506
let worker_length: u32 = serde_json::from_slice(&result.result).unwrap();
511507
Ok(worker_length)

contracts/solver-registry/tests/test_register_worker.rs

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,26 +77,42 @@ async fn test_register_one_worker() -> Result<(), Box<dyn std::error::Error>> {
7777
// Verify get functions
7878

7979
let owner_id = get_owner_id(&solver_registry).await?;
80-
assert_eq!(owner_id, owner.id().clone());
80+
assert_eq!(owner_id, owner.id().clone(), "Incorrect owner ID");
8181

8282
let approved_compose_hashes = get_approved_compose_hashes(&solver_registry).await?;
83-
assert_eq!(approved_compose_hashes.len(), 1);
84-
assert_eq!(approved_compose_hashes[0], COMPOSE_HASH);
83+
assert_eq!(
84+
approved_compose_hashes.len(),
85+
1,
86+
"Incorrect number of approved compose hashes"
87+
);
88+
assert_eq!(
89+
approved_compose_hashes[0], COMPOSE_HASH,
90+
"Incorrect approved compose hash"
91+
);
8592

8693
let pool_len = get_pool_len(&solver_registry).await?;
87-
assert_eq!(pool_len, 1);
94+
assert_eq!(pool_len, 1, "Incorrect pool length");
8895

8996
let worker_len = get_worker_len(&solver_registry).await?;
90-
assert_eq!(worker_len, 1);
97+
assert_eq!(worker_len, 1, "Incorrect worker length");
9198

9299
let workers = get_workers(&solver_registry, 0, 10).await?;
93-
assert_eq!(workers.len(), 1);
94-
assert_eq!(workers[0].pool_id, 0);
95-
assert_eq!(workers[0].checksum, CHECKSUM_ALICE);
96-
assert_eq!(workers[0].compose_hash, COMPOSE_HASH);
100+
assert_eq!(workers.len(), 1, "Incorrect number of workers");
101+
assert_eq!(workers[0].pool_id, 0, "Incorrect worker pool ID");
102+
assert_eq!(
103+
workers[0].checksum, CHECKSUM_ALICE,
104+
"Incorrect worker checksum"
105+
);
106+
assert_eq!(
107+
workers[0].compose_hash, COMPOSE_HASH,
108+
"Incorrect worker compose hash"
109+
);
97110

98111
let worker_ping_timeout_ms: u64 = get_worker_ping_timeout_ms(&solver_registry).await?;
99-
assert_eq!(worker_ping_timeout_ms, DEFAULT_WORKER_PING_TIMEOUT_MS);
112+
assert_eq!(
113+
worker_ping_timeout_ms, DEFAULT_WORKER_PING_TIMEOUT_MS,
114+
"Incorrect worker ping timeout"
115+
);
100116

101117
println!("Test passed: Worker registration and pool setup completed successfully");
102118

0 commit comments

Comments
 (0)