Skip to content

Merge prost-fork, delete previous amino_rs code#12

Merged
zmanian merged 285 commits intomasterfrom
merge_prost_fork
Aug 29, 2018
Merged

Merge prost-fork, delete previous amino_rs code#12
zmanian merged 285 commits intomasterfrom
merge_prost_fork

Conversation

@liamsi
Copy link
Contributor

@liamsi liamsi commented Jul 24, 2018

This should bring in the whole commit history of prost! (incl. the commits in my fork) and deletes the previous implementation, while still retaining our old history.

Additionally, it renames the crate to prost-amino. I think it better describes what this aims to be (but I haven't thought long about this). Previously, it was called amino for our amino_rs implementation (or prost, for @danburkert's implementation).

We should update and shorten the Readme to explain the state of this repo, point to go-amino and to prost, too.

I think circleci only fails because prost didn't run rustfmt as we do (on circelci). I want to deviate from prost as little as possible. Hence, I propose to turn of rustfmt here :-/ (removed via 7719a49) Additionally, it doesn't run clippy (removed via 4e4e910). Tests still fail on circelci (but pass locally).

After this gets merged we need to update the Cargo.toml in the kms to point to this crate instead of my fork.

related to tendermint/tmkms#38
closes #11

liamsi and others added 9 commits July 9, 2018 17:38
- proposal / SignProposalMsg deserialization is working again 🎉
- annotated & updated other structs
- tests need to be updated for other structs
- commented out a few distractions (json cannonicalization)
- aminoName -> amino_name
- necessary for tendermint/tmkms#35 to work
- no other (scalar) types are currently supported (only bytes)
…ge_prost_fork

- this should give us the whole git history of amino_rs, prost,
and the commits in our fork
- additionally, this renames the crate to prost-amino
instead of prost (or previously amino)

# Conflicts:
#	Cargo.toml
@liamsi liamsi requested a review from zmanian July 24, 2018 20:14
@liamsi liamsi force-pushed the merge_prost_fork branch from 6a689c8 to 7719a49 Compare July 24, 2018 21:31
Copy link
Contributor

@zmanian zmanian left a comment

Choose a reason for hiding this comment

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

Good starting point. We probable incrementally improve this over time.

Cargo.toml Outdated
version = "0.4.0"
authors = ["Dan Burkert <dan@danburkert.com>", "zaki", "Ismail Khoffi <ismail@tendermint.com"]
license = "Apache-2.0"
repository = "https://github.com/danburkert/prost"
Copy link
Contributor

Choose a reason for hiding this comment

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

Change this to https://github.com/tendermint/amino_rs

Cargo.toml Outdated
repository = "https://github.com/danburkert/prost"
documentation = "https://docs.rs/prost"
readme = "README.md"
description = "A Protocol Buffers implementation for the Rust Language."
Copy link
Contributor

Choose a reason for hiding this comment

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

"An implementation of the Amino serialization for Tendermint/Cosmos in the Rust Language.See https://github.com/tendermint/go-amino for details"

members = [
"benchmarks",
"conformance",
"prost-build",
Copy link
Contributor

Choose a reason for hiding this comment

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

Pros vs cons on renaming the sub crates?

Copy link
Contributor Author

@liamsi liamsi Jul 25, 2018

Choose a reason for hiding this comment

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

Hmm, I would only change names of sub-crates that I've modified (prost-derive and prost). The less we deviate from vanilla prost, the easier it will be to maintain this repo.

Copy link
Contributor Author

@liamsi liamsi Aug 7, 2018

Choose a reason for hiding this comment

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

Pros:

  • better branding
  • signal that we deviate from the original crate here

Cons:

  • slightly more difficult to maintain changes from prost!

I think the single Con outweighs the Pros by far though.

README.md Outdated
[![Crate](https://img.shields.io/crates/v/prost.svg)](https://crates.io/crates/prost)

Rust implementation of the Amino encoding standard.
# *PROST!*
Copy link
Contributor

Choose a reason for hiding this comment

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

We need rewrite the whole ReadMe. I can help

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll address all other comments you've made (Thanks a lot for the review!) and provide a minimalistic Readme. If you have suggestions, or, want to write it, let me know.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated the Readme. PTAL.

@liamsi
Copy link
Contributor Author

liamsi commented Aug 28, 2018

Do you see any action items left on this @zmanian?

@zmanian
Copy link
Contributor

zmanian commented Aug 28, 2018

@liamsi merge if you think you are ready

@liamsi
Copy link
Contributor Author

liamsi commented Aug 28, 2018

There is still plenty of work to be done but I think it's reasonable to merge this. It is more complete to what we have in amino_rs now. I'll open a bunch issues for what still needs to be done.

@zmanian zmanian merged commit 8fe8b65 into master Aug 29, 2018
ghost pushed a commit to mettadata/amino_rs that referenced this pull request Aug 15, 2020
Merge prost-fork, delete previous amino_rs code
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.

Catch up with latest amino releases