Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Fix package naming conflict #753

Merged
merged 1 commit into from Nov 12, 2021

Conversation

NachoPal
Copy link
Contributor

@NachoPal NachoPal commented Nov 12, 2021

Fixes: #750

The problem was there are two different packages with the same name: rococo-runtime and it was generating some conflict when compiling since they have different versions too.

Not sure why it is only complaining when using --features runtime-benchmarks

@apopiak
Copy link
Contributor

apopiak commented Nov 12, 2021

Looks fine to me, but are there really no other places where this is referenced? (That need to be updated)

@NachoPal
Copy link
Contributor Author

NachoPal commented Nov 12, 2021

Looks fine to me, but are there really no other places where this is referenced? (That need to be updated)

I didn't find any (more)

https://github.com/paritytech/cumulus/search?q=rococo-runtime

@NachoPal
Copy link
Contributor Author

You mean references in other repositories?

Copy link
Member

@bkchr bkchr left a comment

Choose a reason for hiding this comment

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

Sounds reasonable to me.

@NachoPal NachoPal merged commit 1900e2e into release-statemine-v6 Nov 12, 2021
@NachoPal NachoPal deleted the nacho/fix-package-naming-rococo branch November 12, 2021 13:20
@arkpar
Copy link
Member

arkpar commented Nov 12, 2021

This should be merged to master I guess

@@ -19,7 +19,7 @@ hex-literal = "0.2.1"
async-trait = "0.1.42"

# Parachain runtimes
rococo-parachain-runtime = { package = "rococo-runtime", path = "rococo" }
rococo-parachain-runtime = { package = "rococo-parachain-runtime", path = "rococo" }
Copy link
Member

Choose a reason for hiding this comment

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

the rename is now obsolete
(package = "rococo-parachain-runtime", ) part

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What do you mean? I don't understand, sorry

Copy link
Member

Choose a reason for hiding this comment

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

I means you can remove package = .. part now

@NachoPal
Copy link
Contributor Author

This should be merged to master I guess

Yes, it will be merged to master once we upstream the release-statemine-v6 changes.

chevdor pushed a commit that referenced this pull request Nov 22, 2021
chevdor added a commit that referenced this pull request Nov 22, 2021
* package naming conflict fixed (#753)

* Fix rococo naming

Co-authored-by: Ignacio Palacios <ignacio.palacios.santos@gmail.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants