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

chore:interopnet&devnet:fix build error #1162

Merged
merged 3 commits into from
Jun 14, 2021
Merged

Conversation

detailyang
Copy link
Contributor

@detailyang detailyang commented Jun 13, 2021

Signed-off-by: detailyang detailyang@gmail.com

Summary of changes
Fix the build error when via make interopnet like the following:

   Compiling networks v0.1.0 (/Users/detailyang/art/github/detailyang/forest/types/networks)
error[E0659]: `UPGRADE_BREEZE_HEIGHT` is ambiguous (glob import vs glob import in the same module)
  --> types/networks/src/lib.rs:43:17
   |
43 |         height: UPGRADE_BREEZE_HEIGHT,
   |                 ^^^^^^^^^^^^^^^^^^^^^ ambiguous name
   |
note: `UPGRADE_BREEZE_HEIGHT` could refer to the constant imported here
  --> types/networks/src/lib.rs:16:9
   |
16 | pub use self::mainnet::*;
   |         ^^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_BREEZE_HEIGHT` to disambiguate
note: `UPGRADE_BREEZE_HEIGHT` could also refer to the constant imported here
  --> types/networks/src/lib.rs:21:9
   |
21 | pub use self::interopnet::*;

Reference issue to close (if applicable)

Closes

Other information and links

Signed-off-by: detailyang <detailyang@gmail.com>
@CLAassistant
Copy link

CLAassistant commented Jun 13, 2021

CLA assistant check
All committers have signed the CLA.

Signed-off-by: detailyang <detailyang@gmail.com>
@detailyang
Copy link
Contributor Author

Hello. It looks like the CI was failed because of the nightly build related (See PR #1154 ).

Copy link
Contributor

@cryptoquick cryptoquick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! We'll be sure to get the CI PR pulled in as soon as its reviewed, but our broken nightly check won't block contributions.

@cryptoquick
Copy link
Contributor

@detailyang Can you merge main onto this branch? It should resolve the CI issue.

@ec2
Copy link
Member

ec2 commented Jun 14, 2021

@detailyang Can you merge main onto this branch? It should resolve the CI issue.

I can do that

@cryptoquick cryptoquick merged commit 132884d into ChainSafe:main Jun 14, 2021
@cryptoquick
Copy link
Contributor

Great!
@detailyang Thank you for your contribution!

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.

4 participants