upgradability: add multiplexing driver #1091 #1100
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adecaro
changed the title
A driver is identified as <id>.v<version> Signed-off-by: Angelo De Caro <[email protected]>
Signed-off-by: Angelo De Caro <[email protected]>
Signed-off-by: Angelo De Caro <[email protected]>
adecaro
force-pushed
the
1091-upgradability-add-multiplexing-driver
branch
from
3afbfbf to
79b7fc7
Compare
| @@ -45,6 +45,7 @@ func UpdatePublicParams(network *integration.Infrastructure, selector *token2.Re | |||
| issuerId := fungible.GetIssuerIdentity(tms, "newIssuer") | |||
| publicParam := fabtokenv1.PublicParams{ | |||
| Label: "fabtoken", | |||
| Ver: 1, | |||
There was a problem hiding this comment.
We could have a constant under fabtokenv1 called Version
There was a problem hiding this comment.
In case this 1 is used also elsewhere in the production code.
| @@ -167,8 +169,13 @@ func (p *PublicParams) Deserialize(raw []byte) error { | |||
| if err != nil { | |||
| return errors.Wrapf(err, "failed to deserialize public parameters") | |||
| } | |||
| if container.Identifier != p.Label { | |||
| return errors.Errorf("invalid identifier, expecting 'fabtoken', got [%s]", container.Identifier) | |||
| expectedID := string(core.TokenDriverName(FabtokenIdentifier, ProtocolV1)) | |||
There was a problem hiding this comment.
for disambiguation I would call them TokenDriverIdentifier (instead of name), TokenDriveryType (instead of identifier), and TokenDriverVersion
Signed-off-by: Angelo De Caro <[email protected]>
Signed-off-by: Angelo De Caro <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR does the following: It introduces a new naming convention for the token drivers.
Before, a driver was identifier just by a label. Now, a driver is identified as .v. Both information can be retrieved from the interface
driver.PublicParameters. This way, we can re-use the actual code that selects a driver to implicit select by version as well.