Skip to content

improvement(dep-stack): replace deprecated instant dependency #2391

Merged
shamardy merged 4 commits intodevfrom
remove-instant
Mar 20, 2025
Merged

improvement(dep-stack): replace deprecated instant dependency #2391
shamardy merged 4 commits intodevfrom
remove-instant

Conversation

@onur-ozkan
Copy link
Copy Markdown

@onur-ozkan onur-ozkan commented Mar 13, 2025

@onur-ozkan
migrate from deprecated instant to web-time
5201d42 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
borngraced
borngraced previously approved these changes Mar 13, 2025
View reviewed changes
@shamardy shamardy self-requested a review March 17, 2025 11:23
@shamardy
Copy link
Copy Markdown
Collaborator

shamardy commented Mar 18, 2025

wasm tests are not working after using web-time crate for some reason. Tried to get them working locally but couldn't, they are working fine in dev branch.

@onur-ozkan
Copy link
Copy Markdown
Author

onur-ozkan commented Mar 18, 2025

I will re-check that early tomorrow.

@onur-ozkan
Copy link
Copy Markdown
Author

onur-ozkan commented Mar 19, 2025

From what I can see web-time CI flows can run web sessions without any issue. I assume that our wasm test flow is quite old and needs to be updated.

Updated PR status as "blocked".

@shamardy
Copy link
Copy Markdown
Collaborator

shamardy commented Mar 19, 2025

From what I can see web-time CI flows can run web sessions without any issue. I assume that our wasm test flow is quite old and needs to be updated.

We can continue using instant for tests only for now and not have it in release code.

@onur-ozkan
Copy link
Copy Markdown
Author

onur-ozkan commented Mar 20, 2025

From what I can see web-time CI flows can run web sessions without any issue. I assume that our wasm test flow is quite old and needs to be updated.

We can continue using instant for tests only for now and not have it in release code.

That makes sense!

@onur-ozkan onur-ozkan force-pushed the remove-instant branch 4 times, most recently from c2bf853 to c052286 Compare March 20, 2025 09:23
@onur-ozkan
use instant for WASM on mm2_main
2187dff 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
Copy link
Copy Markdown
Author

onur-ozkan commented Mar 20, 2025 •
edited
Loading

It's not possible to cfg(test) & cfg(not(test)) on Cargo.toml files, so I used cfg(target_arch = "wasm32") instead.

@shamardy
Copy link
Copy Markdown
Collaborator

shamardy commented Mar 20, 2025

It's not possible to cfg(test) & cfg(not(test)) on Cargo.toml files, so I used cfg(target_arch = "wasm32") instead.

can't we use cfg(test) & cfg(not(test)) on import and have both instant and web-time in wasm32 deps, that's what I meant by this comment #2391 (comment) actually.

@onur-ozkan
Copy link
Copy Markdown
Author

onur-ozkan commented Mar 20, 2025

It's not possible to cfg(test) & cfg(not(test)) on Cargo.toml files, so I used cfg(target_arch = "wasm32") instead.

can't we use cfg(test) & cfg(not(test)) on import and have both instant and web-time in wasm32 deps, that's what I meant by this comment #2391 (comment) actually.

I am not sure if it's related to test modules. It might also be related to web-time usage on outside of test modules (e.g., lp_network, lp_healthcheck, swap_watcher, etc.).

I have one more thing to try, I will keep instant on the dep tree of mm2_main and still use web-time, let's see what happens then.

@onur-ozkan
fix wasm-pack problem
807fb52 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
Copy link
Copy Markdown
Author

onur-ozkan commented Mar 20, 2025

I have one more thing to try, I will keep instant on the dep tree of mm2_main and still use web-time, let's see what happens then.

I kept instant in the dependency tree of mm2_main and still used web-time, and it worked.

@shamardy
Copy link
Copy Markdown
Collaborator

shamardy commented Mar 20, 2025

I kept instant in the dependency tree of mm2_main and still used web-time, and it worked.

Very strange, I guess we should open an issue for this. I will review one last time then approve/merge once CI is done.

@onur-ozkan onur-ozkan mentioned this pull request Mar 20, 2025
Open
@shamardy shamardy merged commit 3cb051a into dev Mar 20, 2025
23 of 24 checks passed
@shamardy shamardy deleted the remove-instant branch March 20, 2025 15:40
dimxy pushed a commit that referenced this pull request Mar 21, 2025
Merge branch 'dev' into lr-swap-wip
204763d 
* dev:
  fix(tx-history): fix unhandled IBC and HTLC events (#2385)
  improvement(dep-stack): replace deprecated `instant` dependency  (#2391)
  feat(tendermint): staking queries (#2377)
  refactor(eth): use trait addr_to_string method instead of old function (#2348)
  fix(ci): use correct rustup component syntax in fmt-and-lint job (#2390)
  refactor(tx-query): use TxSearchRequest for tx queries (#2384)
  refactor(tpu-v2): allow to skip p2p message with taker payment spend preimage for eth (#2359)
  feat(rpc): add is_success field to legacy MySwapStatusResponse (#2371)
  fix(key-derivation): use stored Argon2 parameters instead of default values (#2360)
  fix(tests): stabilize `tendermint_coin::test_claim_staking_rewards` (#2373)
  improvement(RPCs): group staking rpcs under a namespace (#2372)
@shamardy shamardy mentioned this pull request Apr 16, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@shamardy shamardy shamardy approved these changes

+1 more reviewer

@borngraced borngraced borngraced left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

improvement: dependencies status: pending review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@onur-ozkan @shamardy @borngraced