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

Conversation

@jseagrave21
Copy link
Contributor

@jseagrave21 jseagrave21 commented Oct 14, 2018

What current issue(s) does this address, or what feature is it adding?

-update-

How did you solve this problem?
trial and error

The inspiration for this PR comes from my work on the neo-python API reference. In most cases, assets in neo-python can be searched by their name. The contract search methods update was inspired through their tangential relationship in prompt.py and LevelDBBlockckchain.

How did you make sure your solution works?
unittest

Are there any special changes in the code that we should be aware of?
No

Please check the following, if applicable:

  • Did you add any tests?
  • Did you run make lint?
  • Did you run make test?
  • Are you making a PR to a feature branch or development rather than master?
  • Did you add an entry to CHANGELOG.rst? (if not, please do)

jseagrave21 and others added 30 commits October 9, 2018 20:38
Merge CoZ Development into jseagrave21 Development
Merge CoZ Development into jseagrave21 Development
Merge CoZ Development into jseagrave21 Development
* Update ExtendedJsonRpcApi.py

- add fix provided by @localhuman so original methods are returned as well as extended methods
…yOfZion#661)

* Add the option -u (unittest-net) to prompt.py

* Add unittest guildeline and add the smart contract source codes (UnitTest-SM.zip) to the fixtures package
- allow 'neo' and 'gas' to be used for `getassetstate`
- add test for `getassetstate` using string
- Add `ShowAllAssets` Function
- remove numbering
- add test for `ShowAllAssets`
- update `help` to for `asset all` and `contract all`
- add the ability to show all assets with `asset all`
- add `searchcontracts`, `showallassets`, `showallcontracts`
- add exception for "No known contracts" to `searchcontracts`
- add tests for `showallassets`, `showallcontracts`, `searchcontracts`
for compatibility
for compatibility
Revert "Merge CoZ Development into jseagrave21 AssetState-Updates"
for compatibility
for compatibility
Merge CoZ Development into jseagrave21 AssetState_Updates
- import required modules
- remove indentation
@coveralls
Copy link

coveralls commented Oct 14, 2018

Coverage Status

Coverage increased (+0.006%) to 83.819% when pulling 29d244f on jseagrave21:AssetState-Updates into f98f897 on CityOfZion:development.

- add 'gas' test for `getassetstate`
@localhuman
Copy link
Collaborator

Looks good, though merge conflicts will need to be fixed!

for compatibility
Merge CoZ development into jseagrave21 AssetState-Updates
- re-add test removed to resolve conflicts
@jseagrave21
Copy link
Contributor Author

@localhuman Okay, this PR is ready for another review.

- remove unnecessary `list()`s
Copy link
Member

@ixje ixje left a comment

Choose a reason for hiding this comment

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

Note to self; split extended functionality and base functionality. Ping PR author when Extended plugin changes are ready

@ixje
Copy link
Member

ixje commented Dec 20, 2018

If you can remove the extended RPC related code (as that was moved out now see #756) then we can still use it to update the other parts. Thanks!

- update `show_asset_state` and `show_contract_state` per changes in CityOfZion#741 and CityOfZion#739
for compatibility
Merge CoZ development into jseagrave21 AssetState-Updates
- update SearchAssetState per CityOfZion#739
@jseagrave21
Copy link
Contributor Author

@ixje this PR should be ready to go

@ixje
Copy link
Member

ixje commented Dec 23, 2018

Strange that I did not get a web notification. I happened to look at my email and saw that there should be updates. Thanks again 👍

@ixje ixje merged commit e4c1eb5 into CityOfZion:development Dec 23, 2018
@jseagrave21 jseagrave21 deleted the AssetState-Updates branch December 23, 2018 17:08
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.

5 participants