Skip to content
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.

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

Gossmap api improvements #5596

Merged
merged 6 commits into from
Sep 19, 2022

Conversation

rustyrussell
Copy link
Contributor

These were taken from my renepay branch, but are just surrounding work.

@cdecker
Copy link
Member

cdecker commented Sep 15, 2022

ACK b86ed67

Removes some warnings.

Signed-off-by: Rusty Russell <[email protected]>
This allows GDB to print values, but also allows us to use them in
'case' statements.  This wasn't allowed before because they're not
constant terms.

This also made it clear there's a clash between two error codes,
so move one.

Signed-off-by: Rusty Russell <[email protected]>
Changelog-Changed: JSON-RPC: Error code from bcli plugin changed from 400 to 500.
Useful if you want to store per-chan or per-node side-data in an array.

Signed-off-by: Rusty Russell <[email protected]>
They are surprisingly expensive!

Running `time ./plugins/renepay/test/run-not_mcf-gossmap gossip_store-sgl.rustcorp.com.au-2022-04-19 024b9a1fa8e006f1e3937f65f66c408e6da8e1ca728ea43222a7381df1cc449605 02ebb3b8a2316b3e876ea3f3d8124a3ab97f30b128f619608eb06b5251235dc2d9 10000000000 0.1`:

Before (-Og):
	real	0m1.495s
Before (no opt):
	real	0m2.552s

After (-Og):
	real	0m0.579s
After (no opt):
	real	0m1.061s

Signed-off-by: Rusty Russell <[email protected]>
@rustyrussell
Copy link
Contributor Author

rustyrussell commented Sep 18, 2022

Trivial rebase only. I don't understand why rust under CI is giving an internal compiler error; works fine here :(

Ack 5a07785

@cdecker
Copy link
Member

cdecker commented Sep 18, 2022

Trivial rebase only. I don't understand why rust under CI is giving an internal compiler error; works fine here :(

Nightly compilers are a bit unstable, we switched over to the stable branch now :-)

@cdecker cdecker self-requested a review September 18, 2022 14:12
@cdecker
Copy link
Member

cdecker commented Sep 18, 2022

Well, seems like make is trying to regenerate hsmd/hsmd_wiregen.h, likely due to timestamps, but can't because CI now runs without mako. We definitely should drop the use of mako altogether.

Traceback (most recent call last):
2527  File "/work/tools/generate-wire.py", line 27, in <module>
2528    from mako.template import Template
2529ModuleNotFoundError: No module named 'mako'
2530make: *** [Makefile:331: hsmd/hsmd_wiregen.h] Error 1
2531make: *** Waiting for unfinished jobs....
2532wiregen hsmd/hsmd_wiregen.h
2533Traceback (most recent call last):
2534  File "/work/tools/generate-wire.py", line 27, in <module>
2535    from mako.template import Template
2536ModuleNotFoundError: No module named 'mako'
2537make: *** [Makefile:331: hsmd/hsmd_wiregen.h] Error 1

@rustyrussell
Copy link
Contributor Author

Well, seems like make is trying to regenerate hsmd/hsmd_wiregen.h, likely due to timestamps

Well, yeah! You need it, it's not included, and it require mako? Are you thinking of mrkd?

Anyway, it's lnprototest python requirements in a knot:

The conflict is caused by:
    The user requested grpcio==1.47.0
    grpcio-tools 1.47.0 depends on grpcio>=1.47.0
    pyln-testing 0.11.1 depends on grpcio<2.0.0 and >=1.49.0

It's breaking everything RN.

@rustyrussell rustyrussell merged commit fd71dfc into ElementsProject:master Sep 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants