crypto: Refactor to move files out of the top level directory

Currently the top level directory contains basically all of the code
for the crypto package. This PR moves the crypto code into submodules
in a similar manner to what `golang/x/crypto` does. This improves code
organization.

Ref discussion: https://github.com/tendermint/tendermint/pull/1966

Closes #1956

scripts/slate.sh

@@ -1,77 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-if [ "$CIRCLE_BRANCH" == "" ]; then
-	echo "this script is meant to be run on CircleCI, exiting"
-	echo 1
-fi
-
-# check for changes in the `rpc/core` directory
-did_rpc_change=$(git diff --name-status $CIRCLE_BRANCH origin/master | grep rpc/core)
-
-if [ "$did_rpc_change" == "" ]; then
-	echo "no changes detected in rpc/core, exiting"
-	exit 0
-else
-	echo "changes detected in rpc/core, continuing"
-fi
-
-# only run this script on changes to rpc/core committed to develop
-if [ "$CIRCLE_BRANCH" != "master" ]; then
-	echo "the branch being built isn't master, exiting"
-	exit 0
-else
-	echo "on master, building the RPC docs"
-fi
-
-# godoc2md used to convert the go documentation from
-# `rpc/core` into a markdown file consumed by Slate
-go get github.com/davecheney/godoc2md
-
-# slate works via forks, and we'll be committing to
-# master branch, which will trigger our fork to run
-# the `./deploy.sh` and publish via the `gh-pages` branch
-slate_repo=github.com/tendermint/slate
-slate_path="$GOPATH"/src/"$slate_repo"
-
-if [ ! -d "$slate_path" ]; then
-	git clone https://"$slate_repo".git $slate_path
-fi
-
-# the main file we need to update if rpc/core changed
-destination="$slate_path"/source/index.html.md
-
-# we remove it then re-create it with the latest changes
-rm $destination
-
-header="---
-title: RPC Reference
-
-language_tabs:
-  - shell
-  - go
-
-toc_footers:
-  - <a href='https://tendermint.com/'>Tendermint</a>
-  - <a href='https://github.com/lord/slate'>Documentation Powered by Slate</a>
-
-search: true
----"
-
-# write header to the main slate file
-echo "$header" > "$destination"
-
-# generate a markdown from the godoc comments, using a template
-rpc_docs=$(godoc2md -template rpc/core/doc_template.txt github.com/tendermint/tendermint/rpc/core | grep -v -e "pipe.go" -e "routes.go" -e "dev.go" | sed 's$/src/target$https://github.com/tendermint/tendermint/tree/master/rpc/core$')
-
-# append core RPC docs
-echo "$rpc_docs" >> "$destination"
-
-# commit the changes
-cd $slate_path
-
-git config --global user.email "github@tendermint.com"
-git config --global user.name "tenderbot"
-
-git commit -a -m "Update tendermint RPC docs via CircleCI"
-git push -q https://${GITHUB_ACCESS_TOKEN}@github.com/tendermint/slate.git master

scripts/wire2amino.go

@@ -9,7 +9,9 @@ import (
 	"time"
 
 	"github.com/tendermint/go-amino"
-	crypto "github.com/tendermint/tendermint/crypto"
+	"github.com/tendermint/tendermint/crypto/ed25519"
+	cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino"
+
 	cmn "github.com/tendermint/tendermint/libs/common"
 
 	"github.com/tendermint/tendermint/p2p"
@@ -29,9 +31,8 @@ type Genesis struct {
 	ConsensusParams *types.ConsensusParams `json:"consensus_params,omitempty"`
 	Validators      []GenesisValidator     `json:"validators"`
 	AppHash         cmn.HexBytes           `json:"app_hash"`
-	AppStateJSON    json.RawMessage        `json:"app_state,omitempty"`
+	AppState        json.RawMessage        `json:"app_state,omitempty"`
 	AppOptions      json.RawMessage        `json:"app_options,omitempty"` // DEPRECATED
-
 }
 
 type NodeKey struct {
@@ -59,7 +60,7 @@ func convertNodeKey(cdc *amino.Codec, jsonBytes []byte) ([]byte, error) {
 		return nil, err
 	}
 
-	var privKey crypto.PrivKeyEd25519
+	var privKey ed25519.PrivKeyEd25519
 	copy(privKey[:], nodeKey.PrivKey.Data)
 
 	nodeKeyNew := p2p.NodeKey{privKey}
@@ -78,10 +79,10 @@ func convertPrivVal(cdc *amino.Codec, jsonBytes []byte) ([]byte, error) {
 		return nil, err
 	}
 
-	var privKey crypto.PrivKeyEd25519
+	var privKey ed25519.PrivKeyEd25519
 	copy(privKey[:], privVal.PrivKey.Data)
 
-	var pubKey crypto.PubKeyEd25519
+	var pubKey ed25519.PubKeyEd25519
 	copy(pubKey[:], privVal.PubKey.Data)
 
 	privValNew := privval.FilePV{
@@ -112,16 +113,16 @@ func convertGenesis(cdc *amino.Codec, jsonBytes []byte) ([]byte, error) {
 		ChainID:         genesis.ChainID,
 		ConsensusParams: genesis.ConsensusParams,
 		// Validators
-		AppHash:      genesis.AppHash,
-		AppStateJSON: genesis.AppStateJSON,
+		AppHash:  genesis.AppHash,
+		AppState: genesis.AppState,
 	}
 
 	if genesis.AppOptions != nil {
-		genesisNew.AppStateJSON = genesis.AppOptions
+		genesisNew.AppState = genesis.AppOptions
 	}
 
 	for _, v := range genesis.Validators {
-		var pubKey crypto.PubKeyEd25519
+		var pubKey ed25519.PubKeyEd25519
 		copy(pubKey[:], v.PubKey.Data)
 		genesisNew.Validators = append(
 			genesisNew.Validators,
@@ -143,7 +144,7 @@ func convertGenesis(cdc *amino.Codec, jsonBytes []byte) ([]byte, error) {
 
 func main() {
 	cdc := amino.NewCodec()
-	crypto.RegisterAmino(cdc)
+	cryptoAmino.RegisterAmino(cdc)
 
 	args := os.Args[1:]
 	if len(args) != 1 {