diff --git a/nameservice/LICENSE b/LICENSE similarity index 100% rename from nameservice/LICENSE rename to LICENSE diff --git a/hellochain/app.go b/hellochain/app.go index 4ce26906a5..36079f7d63 100644 --- a/hellochain/app.go +++ b/hellochain/app.go @@ -3,14 +3,14 @@ package hellochain import ( sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/tendermint/tendermint/abci/types" - dbm "github.com/tendermint/tendermint/libs/db" "github.com/tendermint/tendermint/libs/log" + dbm "github.com/tendermint/tm-db" - "github.com/cosmos/sdk-tutorials/utils/starter" + "github.com/cosmos/sdk-application-tutorial/hellochain/utils/starter" //import greeter types - "github.com/cosmos/hellochain/x/greeter" - gtypes "github.com/cosmos/hellochain/x/greeter/types" + "github.com/cosmos/sdk-application-tutorial/hellochain/x/greeter" + gtypes "github.com/cosmos/sdk-application-tutorial/hellochain/x/greeter/types" ) const appName = "hellochain" diff --git a/hellochain/cmd/hccli/main.go b/hellochain/cmd/hccli/main.go index 3c8312d9c8..7ace7a86ba 100644 --- a/hellochain/cmd/hccli/main.go +++ b/hellochain/cmd/hccli/main.go @@ -3,9 +3,9 @@ package main import ( "github.com/tendermint/tendermint/libs/cli" - app "github.com/cosmos/hellochain" - "github.com/cosmos/hellochain/x/greeter" - "github.com/cosmos/sdk-tutorials/utils/starter" + app "github.com/cosmos/sdk-application-tutorial/hellochain" + "github.com/cosmos/sdk-application-tutorial/hellochain/utils/starter" + "github.com/cosmos/sdk-application-tutorial/hellochain/x/greeter" ) func main() { diff --git a/hellochain/cmd/hcd/main.go b/hellochain/cmd/hcd/main.go index fda89074f9..9fbf9c88d2 100644 --- a/hellochain/cmd/hcd/main.go +++ b/hellochain/cmd/hcd/main.go @@ -3,8 +3,8 @@ package main import ( "github.com/tendermint/tendermint/libs/cli" - app "github.com/cosmos/hellochain" - "github.com/cosmos/sdk-tutorials/utils/starter" + app "github.com/cosmos/sdk-application-tutorial/hellochain" + "github.com/cosmos/sdk-application-tutorial/hellochain/utils/starter" ) func main() { diff --git a/hellochain/go.mod b/hellochain/go.mod index 2eb7279bf7..2329107662 100644 --- a/hellochain/go.mod +++ b/hellochain/go.mod @@ -1,12 +1,10 @@ -module github.com/cosmos/hellochain +module github.com/cosmos/sdk-application-tutorial/hellochain go 1.12 require ( - github.com/cosmos/cosmos-sdk v0.36.0-rc1 - github.com/gogo/protobuf v1.2.1 + github.com/cosmos/cosmos-sdk v0.37.3 github.com/gorilla/mux v1.7.0 - github.com/magiconair/properties v1.8.1 // indirect github.com/mattn/go-isatty v0.0.8 // indirect github.com/onsi/ginkgo v1.8.0 // indirect github.com/onsi/gomega v1.5.0 // indirect @@ -16,15 +14,13 @@ require ( github.com/spf13/cobra v0.0.5 github.com/spf13/viper v1.4.0 github.com/tendermint/go-amino v0.15.0 - github.com/tendermint/tendermint v0.32.1 + github.com/tendermint/tendermint v0.32.6 + github.com/tendermint/tm-db v0.2.0 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 // indirect - golang.org/x/lint v0.0.0-20190409202823-959b441ac422 // indirect golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 // indirect golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // indirect golang.org/x/text v0.3.2 // indirect - golang.org/x/tools v0.0.0-20190822000311-fc82fb2afd64 // indirect google.golang.org/appengine v1.4.0 // indirect google.golang.org/genproto v0.0.0-20190611190212-a7e196e89fd3 // indirect - google.golang.org/grpc v1.21.1 // indirect - gopkg.in/yaml.v2 v2.2.2 + ) diff --git a/hellochain/go.sum b/hellochain/go.sum index 7705292c29..ef8ba341d6 100644 --- a/hellochain/go.sum +++ b/hellochain/go.sum @@ -4,6 +4,7 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= +github.com/Workiva/go-datastructures v1.0.50/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY= @@ -39,8 +40,8 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cosmos/cosmos-sdk v0.36.0-rc1 h1:hgSXNeVwNYxD0+O9DxRrxJcir9Z7Q5zreLV6G7GrjYA= -github.com/cosmos/cosmos-sdk v0.36.0-rc1/go.mod h1:UV765S3m9sxCg8rYaBr4XgeHZl2UP6y++Coz9mLlYFc= +github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= +github.com/cosmos/cosmos-sdk v0.37.3/go.mod h1:dAwYeOJ5ybRZg/OdRfiDy8q/cZq/GXQp9ZHAtz0E74I= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8 h1:Iwin12wRQtyZhH6FV3ykFcdGNlYEzoeR0jN8Vn+JWsI= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/ledger-cosmos-go v0.10.3 h1:Qhi5yTR5Pg1CaTpd00pxlGwNl4sFRdtK1J96OTjeFFc= @@ -58,6 +59,12 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8 github.com/etcd-io/bbolt v1.3.2/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= github.com/etcd-io/bbolt v1.3.3 h1:gSJmxrs37LgTqR/oyJBWok6k6SvXEUerFTbltIhXkBM= github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= +github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= +github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= +github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= +github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= +github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQDg5gKsWoLBOB0n+ZW8s599zru8FJ2/Y= +github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= @@ -68,6 +75,8 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/go-kit/kit v0.6.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= @@ -77,6 +86,8 @@ github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.0 h1:G8O7TerXerS4F6sx9OV7/nRfJdnXgHZu/S/7F2SN+UE= +github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk= @@ -90,7 +101,8 @@ github.com/golang/protobuf v1.3.0 h1:kbxbvI4Un1LUWKxufD+BiE6AEExYYgkQLQmLFqA1LFk github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= @@ -105,6 +117,8 @@ github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 h1:Iju5GlWwrvL6UBg4zJJt3btmonfrMlCDdsejg4CZE7c= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= @@ -118,7 +132,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jmhodges/levigo v0.0.0-20161115193449-c42d9e0ca023/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U= github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= @@ -128,6 +141,7 @@ github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwK github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= @@ -139,6 +153,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/libp2p/go-buffer-pool v0.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOSqcmlfs= +github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= @@ -176,8 +192,7 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740= -github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= +github.com/prometheus/client_golang v0.9.3 h1:9iH4JKXLzFbOAdtqv/a+j8aewx2Y8lAjAydhbaScPF8= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v0.9.4 h1:Y8E/JaaPbmFSW2V81Ab/d8yZFYQQGbni1b1jPcG9Y6A= github.com/prometheus/client_golang v0.9.4/go.mod h1:oCXIBxdI62A4cR6aTRJCgetEjecSIYzOEaeAn4iYEpM= @@ -186,30 +201,29 @@ github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.2.0 h1:kUZDBDTdBVBYBj5Tmh2NZLlF60mfjA27rM34b+cVwNU= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.0 h1:7etb9YClo3a6HjLzfl6rIQaU+FDfi0VSX39io3aQ+DM= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1 h1:K0MGApIoQvMw27RTdJkPbr3JZ7DNbtxQNyi5STVM6Kw= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190227231451-bbced9601137 h1:3l8oligPtjd4JuM+OZ+U8sjtwFGJs98cdWsqs6QZRWs= -github.com/prometheus/procfs v0.0.0-20190227231451-bbced9601137/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084 h1:sofwID9zm4tzrgykg80hfFph1mryUeLRsUfoocVVmRY= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rakyll/statik v0.1.4 h1:zCS/YQCxfo/fQjCtGVGIyWGFnRbQ18Y55mhS3XPE+Oo= -github.com/rakyll/statik v0.1.4/go.mod h1:OEi9wJV/fMUAGx1eNjq75DKDsJVuEv1U0oYdX6GX8Zs= +github.com/rakyll/statik v0.1.5 h1:Ly2UjURzxnsSYS0zI50fZ+srA+Fu7EbpV5hglvJvJG0= +github.com/rakyll/statik v0.1.5/go.mod h1:OEi9wJV/fMUAGx1eNjq75DKDsJVuEv1U0oYdX6GX8Zs= github.com/rcrowley/go-metrics v0.0.0-20180503174638-e2704e165165 h1:nkcn14uNmFEuGCb2mBZbBb24RdNRL08b/wb+xBOYpuk= github.com/rcrowley/go-metrics v0.0.0-20180503174638-e2704e165165/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI= github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= +github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa/go.mod h1:oJyF+mSPHbB5mVY2iO9KV3pTt/QbIkGaO8gQ2WrDbP4= github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -237,7 +251,10 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/syndtr/goleveldb v0.0.0-20181105012736-f9080354173f/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stumble/gorocksdb v0.0.3 h1:9UU+QA1pqFYJuf9+5p7z1IqdE5k0mma4UAeu2wmX8kA= +github.com/stumble/gorocksdb v0.0.3/go.mod h1:v6IHdFBXk5DJ1K4FZ0xi+eY737quiiBxYtSWXadLybY= github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965 h1:1oFLiOyVl+W7bnBzGhf7BbIv9loSFQcieWWYIjLqcAw= github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965/go.mod h1:9OrXJhf154huy1nPWmuSrkgjPUtUNhA+Zmy+6AESzuA= github.com/tendermint/btcd v0.1.1 h1:0VcxPfflS2zZ3RiOAHkBiFUcPvbtRj5O7zHmcJWHV7s= @@ -247,12 +264,15 @@ github.com/tendermint/crypto v0.0.0-20180820045704-3764759f34a5/go.mod h1:z4YtwM github.com/tendermint/go-amino v0.14.1/go.mod h1:i/UKE5Uocn+argJJBb12qTZsCDBcAYMbR92AaJVmKso= github.com/tendermint/go-amino v0.15.0 h1:TC4e66P59W7ML9+bxio17CPKnxW3nKIRAYskntMAoRk= github.com/tendermint/go-amino v0.15.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= -github.com/tendermint/iavl v0.12.3-0.20190712145259-c834d3192b52 h1:l3qTzz8KkhZZSeLTJGqh0+iONjGM/tS5vvbunXjAmnA= -github.com/tendermint/iavl v0.12.3-0.20190712145259-c834d3192b52/go.mod h1:A9IoWRVTibyXXlfZztHy52RloI85QOrIcsE9dyQh+DY= -github.com/tendermint/tendermint v0.31.7 h1:2xhlEqmrvm+wJxgPTFpUHb0wgT9KFyi3n3FVG+dOlKU= -github.com/tendermint/tendermint v0.31.7/go.mod h1:ymcPyWblXCplCPQjbOYbrF1fWnpslATMVqiGgWbZrlc= +github.com/tendermint/iavl v0.12.4 h1:hd1woxUGISKkfUWBA4mmmTwOua6PQZTJM/F0FDrmMV8= +github.com/tendermint/iavl v0.12.4/go.mod h1:8LHakzt8/0G3/I8FUU0ReNx98S/EP6eyPJkAUvEXT/o= github.com/tendermint/tendermint v0.32.1 h1:J8ddXMbCmG6GZjdCl/N1wgdXDU9uO91J2Y5CA9xYfGo= github.com/tendermint/tendermint v0.32.1/go.mod h1:jmPDAKuNkev9793/ivn/fTBnfpA9mGBww8MPRNPNxnU= +github.com/tendermint/tendermint v0.32.6 h1:HozXi0USWvKrWuEh5ratnJV10ykkTy4nwXUi0UvPVzg= +github.com/tendermint/tendermint v0.32.6/go.mod h1:D2+A3pNjY+Po72X0mTfaXorFhiVI8dh/Zg640FGyGtE= +github.com/tendermint/tm-db v0.1.1/go.mod h1:0cPKWu2Mou3IlxecH+MEUSYc1Ch537alLe6CpFrKzgw= +github.com/tendermint/tm-db v0.2.0 h1:rJxgdqn6fIiVJZy4zLpY1qVlyD0TU6vhkT4kEf71TQQ= +github.com/tendermint/tm-db v0.2.0/go.mod h1:0cPKWu2Mou3IlxecH+MEUSYc1Ch537alLe6CpFrKzgw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 h1:LnC5Kc/wtumK+WB441p7ynQJzVuNRJiqddSIE3IlSEQ= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= @@ -273,35 +293,29 @@ go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181126093934-9eb0be3963ea/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU= -golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a h1:YX8ljsm6wXlHZO+aRz9Exqr0evNhKRNe5K/gi+zKh4U= +golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422 h1:QzoH/1pFpZguR8NrRHLcO6jKqfv2zpuSqZLgdm7ZmjI= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc h1:a3CU5tJYVj92DY2LaA1kUkrsqD5/3mLDhx2NcNqyW+0= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd h1:HuTn7WObtcDo9uEEU7rEqL0jYthdXAmZ6PP+meazmaU= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 h1:dfGZHvZk057jK2MCeWus/TowKpJ8y4AmooUzdBSR9GU= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7 h1:rTIdg5QFRR7XCaK4LCjBiPbx8j4DQRpdYMnGn/bJUEU= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -320,8 +334,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190614084037-d442b75600c5 h1:tQrtnaPeNyfkuD2UMixVD6lAa7WngkIFvtWcdzNeq80= -golang.org/x/sys v0.0.0-20190614084037-d442b75600c5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= @@ -332,19 +344,19 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZe golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190822000311-fc82fb2afd64 h1:4EN1tY9aQxwLGYHWT5WdQN56Xzbwlg2UTINDbZ04l10= -golang.org/x/tools v0.0.0-20190822000311-fc82fb2afd64/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b h1:lohp5blsw53GBXtLyLNaTXPXS9pJ1tiTw61ZHUoE9Qw= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2 h1:67iHsV9djwGdZpdZNbLuQj6FOzCaZe3w+vhLjn5AcFA= google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190611190212-a7e196e89fd3 h1:0LGHEA/u5XLibPOx6D7D8FBT/ax6wT57vNKY0QckCwo= google.golang.org/genproto v0.0.0-20190611190212-a7e196e89fd3/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= @@ -352,8 +364,10 @@ google.golang.org/grpc v1.13.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmE google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.21.1 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.22.0 h1:J0UbZOIrCAl+fpTOf8YLs4dJo8L/owV4LYVtAXQoPkw= +google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1 h1:q4XQuHFC6I28BKZpo6IYyb3mNO+l7lSOxRuYTCiDfXk= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= @@ -368,3 +382,4 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/hellochain/tutorial/00-intro.md b/hellochain/tutorial/00-intro.md index 69ad2e1b45..de0a9dd6ef 100644 --- a/hellochain/tutorial/00-intro.md +++ b/hellochain/tutorial/00-intro.md @@ -15,7 +15,7 @@ functionality in the form of our `greeter` module. ### Starter To speed up this tutorial, A lot of basic functionality comes packaged for you -in the [starter](https://github.com/cosmos/hellochain/tree/master/starter) +in the [starter](https://github.com/cosmos/sdk-application-tutorial/hellochain/tree/master/starter) package. It will provide basic accounts, a bank, authentication, transaction (Tx) verification as well as some helper functions for building CLI tools. `starter` is your "crutch" for this tutorial. It is a heavily configured diff --git a/hellochain/tutorial/01-simple-app.md b/hellochain/tutorial/01-simple-app.md index b4cc818786..8f8849db34 100644 --- a/hellochain/tutorial/01-simple-app.md +++ b/hellochain/tutorial/01-simple-app.md @@ -21,10 +21,10 @@ package hellochain import ( sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/tendermint/tendermint/abci/types" - dbm "github.com/tendermint/tendermint/libs/db" + dbm "github.com/tendermint/tm-db" "github.com/tendermint/tendermint/libs/log" - "github.com/cosmos/sdk-tutorials/utils/starter" + "github.com/cosmos/sdk-application-tutorial/hellochain/utils/starter" ) const appName = "hellochain" diff --git a/hellochain/tutorial/02-simple-start.md b/hellochain/tutorial/02-simple-start.md index 6705de087a..00890f4e73 100644 --- a/hellochain/tutorial/02-simple-start.md +++ b/hellochain/tutorial/02-simple-start.md @@ -20,8 +20,8 @@ package main import ( "github.com/tendermint/tendermint/libs/cli" - app "github.com/cosmos/hellochain" - "github.com/cosmos/sdk-tutorials/utils/starter" + app "github.com/cosmos/sdk-application-tutorial/hellochain" + "github.com/cosmos/sdk-application-tutorial/hellochain/utils/starter" ) func main() { diff --git a/utils/starter/app_starter.go b/hellochain/utils/starter/app_starter.go similarity index 87% rename from utils/starter/app_starter.go rename to hellochain/utils/starter/app_starter.go index 1de70b120e..e51fe712eb 100644 --- a/utils/starter/app_starter.go +++ b/hellochain/utils/starter/app_starter.go @@ -7,11 +7,12 @@ import ( abci "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tendermint/libs/common" - dbm "github.com/tendermint/tendermint/libs/db" "github.com/tendermint/tendermint/libs/log" pvm "github.com/tendermint/tendermint/privval" tmtypes "github.com/tendermint/tendermint/types" + dbm "github.com/tendermint/tm-db" + bam "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/server" @@ -93,6 +94,21 @@ func (app *AppStarter) InitChainer(ctx sdk.Context, req abci.RequestInitChain) a panic(err) } + /* + ---------------------NOTICE----------------------- + vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv + + The code below is a hack to override the + functionality of tendermint. It is done here like + this so that you can focus on building fun custom + modules instead of all the necessary plumbing + required when building a production-ready app with + proof-of-stake. Don't worry about it now but + PLEASE NOTE that this is NOT BEST PRACTICE! + + vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv + --------------------------------------------------- + */ privValidator := pvm.LoadOrGenFilePV( config.PrivValidatorKeyFile(), config.PrivValidatorStateFile()) valPubKey := tmtypes.TM2PB.PubKey(privValidator.GetPubKey()) @@ -187,6 +203,7 @@ func NewAppStarter(appName string, logger log.Logger, db dbm.DB, moduleBasics .. app.accountKeeper, bankSupspace, bank.DefaultCodespace, + app.ModuleAccountAddrs(), ) app.supplyKeeper = supply.NewKeeper( @@ -194,7 +211,6 @@ func NewAppStarter(appName string, logger log.Logger, db dbm.DB, moduleBasics .. app.keySupply, app.accountKeeper, app.bankKeeper, - supply.DefaultCodespace, maccPerms) app.Mm = module.NewManager( @@ -218,6 +234,16 @@ func (app *AppStarter) GetCodec() *codec.Codec { return app.Cdc } +// ModuleAccountAddrs returns all the app's module account addresses. +func (app *AppStarter) ModuleAccountAddrs() map[string]bool { + modAccAddrs := make(map[string]bool) + for acc := range maccPerms { + modAccAddrs[supply.NewModuleAddress(acc).String()] = true + } + + return modAccAddrs +} + // InitializeStarter configures the app. NOTE ModuleBasics must be complete before calling this func (app *AppStarter) InitializeStarter() { @@ -264,7 +290,8 @@ func NewAppCreator(creator func(log.Logger, dbm.DB) abci.Application) server.App // NewAppExporter wraps and returns a function for exporting application state func NewAppExporter(creator func(log.Logger, dbm.DB) abci.Application) server.AppExporter { - return func(logger log.Logger, db dbm.DB, traceStore io.Writer, height int64, forZeroHeight bool, jailWhiteList []string) (json.RawMessage, []tmtypes.GenesisValidator, error) { + return func(logger log.Logger, db dbm.DB, traceStore io.Writer, height int64, + forZeroHeight bool, jailWhiteList []string) (json.RawMessage, []tmtypes.GenesisValidator, error) { return nil, nil, nil } } diff --git a/utils/starter/blank_module.go b/hellochain/utils/starter/blank_module.go similarity index 100% rename from utils/starter/blank_module.go rename to hellochain/utils/starter/blank_module.go diff --git a/utils/starter/cmd_starter.go b/hellochain/utils/starter/cmd_starter.go similarity index 97% rename from utils/starter/cmd_starter.go rename to hellochain/utils/starter/cmd_starter.go index ee6c132e9a..0799b9f973 100644 --- a/utils/starter/cmd_starter.go +++ b/hellochain/utils/starter/cmd_starter.go @@ -139,7 +139,8 @@ type ServerCommandParams struct { } // NewServerCommandParams collects the params for a server command -func NewServerCommandParams(name string, desc string, creator server.AppCreator, exporter server.AppExporter) ServerCommandParams { +func NewServerCommandParams(name string, desc string, creator server.AppCreator, + exporter server.AppExporter) ServerCommandParams { return ServerCommandParams{name, desc, creator, exporter} } @@ -167,7 +168,8 @@ func NewServerCommand(params ServerCommandParams) *cobra.Command { rootCmd.AddCommand( genutilcli.InitCmd(ctx, cdc, ModuleBasics, DefaultNodeHome), genutilcli.CollectGenTxsCmd(ctx, cdc, genaccounts.AppModuleBasic{}, DefaultNodeHome), - genutilcli.GenTxCmd(ctx, cdc, ModuleBasics, staking.AppModuleBasic{}, genaccounts.AppModuleBasic{}, DefaultNodeHome, DefaultCLIHome), + genutilcli.GenTxCmd(ctx, cdc, ModuleBasics, staking.AppModuleBasic{}, + genaccounts.AppModuleBasic{}, DefaultNodeHome, DefaultCLIHome), genutilcli.ValidateGenesisCmd(ctx, cdc, ModuleBasics), genaccscli.AddGenesisAccountCmd(ctx, cdc, DefaultNodeHome, DefaultCLIHome), ) diff --git a/hellochain/x/greeter/client/cli/query.go b/hellochain/x/greeter/client/cli/query.go index 8d8a5e2aab..37fb96ac5c 100644 --- a/hellochain/x/greeter/client/cli/query.go +++ b/hellochain/x/greeter/client/cli/query.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/codec" - types "github.com/cosmos/hellochain/x/greeter/types" + types "github.com/cosmos/sdk-application-tutorial/hellochain/x/greeter/types" ) // GetQueryCmd returns the parent query command for the greeter module diff --git a/hellochain/x/greeter/client/cli/tx.go b/hellochain/x/greeter/client/cli/tx.go index 4dafab8315..1e14fcee4a 100644 --- a/hellochain/x/greeter/client/cli/tx.go +++ b/hellochain/x/greeter/client/cli/tx.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" - gtypes "github.com/cosmos/hellochain/x/greeter/types" + gtypes "github.com/cosmos/sdk-application-tutorial/hellochain/x/greeter/types" ) // GetTxCmd returns the parent transaction command for the greeting module diff --git a/hellochain/x/greeter/handler.go b/hellochain/x/greeter/handler.go index eae0448f32..4b687f6bf3 100644 --- a/hellochain/x/greeter/handler.go +++ b/hellochain/x/greeter/handler.go @@ -2,8 +2,9 @@ package greeter import ( "fmt" + sdk "github.com/cosmos/cosmos-sdk/types" - gtypes "github.com/cosmos/hellochain/x/greeter/types" + gtypes "github.com/cosmos/sdk-application-tutorial/hellochain/x/greeter/types" ) // NewHandler returns a handler for "greeter" type messages. diff --git a/hellochain/x/greeter/keeper.go b/hellochain/x/greeter/keeper.go index d088bdf027..81aca0c90c 100644 --- a/hellochain/x/greeter/keeper.go +++ b/hellochain/x/greeter/keeper.go @@ -2,12 +2,13 @@ package greeter import ( "github.com/cosmos/cosmos-sdk/codec" - gtypes "github.com/cosmos/hellochain/x/greeter/types" + gtypes "github.com/cosmos/sdk-application-tutorial/hellochain/x/greeter/types" sdk "github.com/cosmos/cosmos-sdk/types" ) -// Keeper maintains the link to data storage and exposes getter/setter methods for the various parts of the state machine +// Keeper maintains the link to data storage and exposes getter/setter methods for the various +// parts of the state machine type Keeper struct { storeKey sdk.StoreKey // Unexposed key to access store from sdk.Context diff --git a/hellochain/x/greeter/module.go b/hellochain/x/greeter/module.go index 7040a05fbd..5b04b899dd 100644 --- a/hellochain/x/greeter/module.go +++ b/hellochain/x/greeter/module.go @@ -6,10 +6,10 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - gtypes "github.com/cosmos/hellochain/x/greeter/types" - starter "github.com/cosmos/sdk-tutorials/utils/starter" + "github.com/cosmos/sdk-application-tutorial/hellochain/utils/starter" + gtypes "github.com/cosmos/sdk-application-tutorial/hellochain/x/greeter/types" - "github.com/cosmos/hellochain/x/greeter/client/cli" + "github.com/cosmos/sdk-application-tutorial/hellochain/x/greeter/client/cli" ) // AppModuleBasic is the minimal struct for a module diff --git a/hellochain/x/greeter/querier.go b/hellochain/x/greeter/querier.go index e45ef1c0ac..337ed4819c 100644 --- a/hellochain/x/greeter/querier.go +++ b/hellochain/x/greeter/querier.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - gtypes "github.com/cosmos/hellochain/x/greeter/types" + gtypes "github.com/cosmos/sdk-application-tutorial/hellochain/x/greeter/types" ) // query endpoints supported by the hellochain Querier diff --git a/hellochain/x/greeter/types/types.go b/hellochain/x/greeter/types/types.go index 77a0c9ab83..619db2409d 100644 --- a/hellochain/x/greeter/types/types.go +++ b/hellochain/x/greeter/types/types.go @@ -21,7 +21,8 @@ var ( ModuleCdc = codec.New() ) -// struct containing the data of the Greeting. json and yaml tags are used to specify field names when marshalled to json +// struct containing the data of the Greeting. json and yaml tags are used to specify field names +// when marshalled to json type Greeting struct { Sender sdk.AccAddress `json:"sender" yaml:"sender"` // address of the account "sending" the greeting Recipient sdk.AccAddress `json:"receiver" yaml:"receiver"` // address of the account "receiving" the greeting diff --git a/nameservice/app.go b/nameservice/app.go index c8a91247cf..d5b6693293 100644 --- a/nameservice/app.go +++ b/nameservice/app.go @@ -25,7 +25,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" "github.com/cosmos/cosmos-sdk/x/supply" - "github.com/cosmos/sdk-application-tutorial/x/nameservice" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice" ) const appName = "nameservice" diff --git a/nameservice/cmd/nscli/main.go b/nameservice/cmd/nscli/main.go index 31fc61c8db..d451c6360a 100644 --- a/nameservice/cmd/nscli/main.go +++ b/nameservice/cmd/nscli/main.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/version" authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" bankcmd "github.com/cosmos/cosmos-sdk/x/bank/client/cli" - app "github.com/cosmos/sdk-application-tutorial" + app "github.com/cosmos/sdk-application-tutorial/nameservice" "github.com/spf13/cobra" "github.com/spf13/viper" amino "github.com/tendermint/go-amino" diff --git a/nameservice/cmd/nsd/main.go b/nameservice/cmd/nsd/main.go index ab22e09ba9..f0d2daf9f7 100644 --- a/nameservice/cmd/nsd/main.go +++ b/nameservice/cmd/nsd/main.go @@ -15,7 +15,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - app "github.com/cosmos/sdk-application-tutorial" + app "github.com/cosmos/sdk-application-tutorial/nameservice" abci "github.com/tendermint/tendermint/abci/types" tmtypes "github.com/tendermint/tendermint/types" dbm "github.com/tendermint/tm-db" diff --git a/nameservice/go.mod b/nameservice/go.mod index 20846d76ee..d4b4ae11be 100644 --- a/nameservice/go.mod +++ b/nameservice/go.mod @@ -1,4 +1,4 @@ -module github.com/cosmos/sdk-application-tutorial +module github.com/cosmos/sdk-application-tutorial/nameservice go 1.13 diff --git a/nameservice/tutorial/01-app-init.md b/nameservice/tutorial/01-app-init.md index ec9dd11756..1effeee2a5 100644 --- a/nameservice/tutorial/01-app-init.md +++ b/nameservice/tutorial/01-app-init.md @@ -28,7 +28,7 @@ import ( distr "github.com/cosmos/cosmos-sdk/x/distribution" "github.com/cosmos/cosmos-sdk/x/params" "github.com/cosmos/cosmos-sdk/x/staking" - "github.com/cosmos/sdk-application-tutorial/x/nameservice" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice" bam "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/nameservice/tutorial/02-keeper.md b/nameservice/tutorial/02-keeper.md index 706dba29be..0015f998ff 100644 --- a/nameservice/tutorial/02-keeper.md +++ b/nameservice/tutorial/02-keeper.md @@ -17,7 +17,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/bank" - "github.com/cosmos/sdk-application-tutorial/x/nameservice/types" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/types" ) // Keeper maintains the link to data storage and exposes getter/setter methods for the various parts of the state machine diff --git a/nameservice/tutorial/06-queriers.md b/nameservice/tutorial/06-queriers.md index 4d7fd543a7..861bcb0b45 100644 --- a/nameservice/tutorial/06-queriers.md +++ b/nameservice/tutorial/06-queriers.md @@ -47,7 +47,7 @@ package keeper import ( "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/sdk-application-tutorial/x/nameservice/internal/types" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/internal/types" sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/tendermint/tendermint/abci/types" diff --git a/nameservice/tutorial/08-cli.md b/nameservice/tutorial/08-cli.md index ff83785efc..3d9f6edd23 100644 --- a/nameservice/tutorial/08-cli.md +++ b/nameservice/tutorial/08-cli.md @@ -22,7 +22,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/sdk-application-tutorial/x/nameservice/types" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/types" "github.com/spf13/cobra" ) @@ -124,7 +124,7 @@ Notes on the above code: Now that the query interactions are defined, it is time to move on to transaction generation in `tx.go`: -> _*NOTE*_: Your application needs to import the code you just wrote. Here the import path is set to this repository (`github.com/cosmos/sdk-application-tutorial/x/nameservice`). If you are following along in your own repo you will need to change the import path to reflect that (`github.com/{ .Username }/{ .Project.Repo }/x/nameservice`). +> _*NOTE*_: Your application needs to import the code you just wrote. Here the import path is set to this repository (`github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice`). If you are following along in your own repo you will need to change the import path to reflect that (`github.com/{ .Username }/{ .Project.Repo }/x/nameservice`). ```go package cli @@ -138,7 +138,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/auth/client/utils" - "github.com/cosmos/sdk-application-tutorial/x/nameservice/types" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/types" ) func GetTxCmd(storeKey string, cdc *codec.Codec) *cobra.Command { diff --git a/nameservice/tutorial/09-rest.md b/nameservice/tutorial/09-rest.md index 2bddf77ab2..884fc1b77d 100644 --- a/nameservice/tutorial/09-rest.md +++ b/nameservice/tutorial/09-rest.md @@ -10,7 +10,7 @@ Your module can also expose a REST interface to allow programatic access to the Add in the `imports` and `const`s to get started: -> _*NOTE*_: Your application needs to import the code you just wrote. Here the import path is set to this repository (`github.com/cosmos/sdk-application-tutorial/x/nameservice`). If you are following along in your own repo you will need to change the import path to reflect that (`github.com/{ .Username }/{ .Project.Repo }/x/nameservice`). +> _*NOTE*_: Your application needs to import the code you just wrote. Here the import path is set to this repository (`github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice`). If you are following along in your own repo you will need to change the import path to reflect that (`github.com/{ .Username }/{ .Project.Repo }/x/nameservice`). ```go package rest @@ -20,7 +20,7 @@ import ( "net/http" "github.com/cosmos/cosmos-sdk/client/context" - "github.com/cosmos/sdk-application-tutorial/x/nameservice/types" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/nameservice/tutorial/10-app-complete.md b/nameservice/tutorial/10-app-complete.md index aa97b0b1a5..b5c599d72e 100644 --- a/nameservice/tutorial/10-app-complete.md +++ b/nameservice/tutorial/10-app-complete.md @@ -6,7 +6,7 @@ order: 10 Now that your module is ready, it can be incorporated in the `./app.go` file, along with the other two modules [`auth`](https://godoc.org/github.com/cosmos/cosmos-sdk/x/auth) and [`bank`](https://godoc.org/github.com/cosmos/cosmos-sdk/x/bank). Let's begin by adding your new nameservice module to the imports: -> _*NOTE*_: Your application needs to import the code you just wrote. Here the import path is set to this repository (`github.com/cosmos/sdk-application-tutorial/x/nameservice`). If you are following along in your own repo you will need to change the import path to reflect that (`github.com/{ .Username }/{ .Project.Repo }/x/nameservice`). +> _*NOTE*_: Your application needs to import the code you just wrote. Here the import path is set to this repository (`github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice`). If you are following along in your own repo you will need to change the import path to reflect that (`github.com/{ .Username }/{ .Project.Repo }/x/nameservice`). ```go package app @@ -35,7 +35,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" "github.com/cosmos/cosmos-sdk/x/supply" - "github.com/cosmos/sdk-application-tutorial/x/nameservice" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice" ) const appName = "nameservice" diff --git a/nameservice/tutorial/alias.md b/nameservice/tutorial/alias.md index d7669e4134..268bbfdb91 100644 --- a/nameservice/tutorial/alias.md +++ b/nameservice/tutorial/alias.md @@ -8,7 +8,7 @@ First start by importing the "types" folder you have created. package nameservice import ( - "github.com/cosmos/sdk-application-tutorial/x/nameservice/types" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/types" ) ``` diff --git a/nameservice/tutorial/cn/10-cli.md b/nameservice/tutorial/cn/10-cli.md index 0394216aad..83fa232246 100644 --- a/nameservice/tutorial/cn/10-cli.md +++ b/nameservice/tutorial/cn/10-cli.md @@ -18,7 +18,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/sdk-application-tutorial/x/nameservice" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice" "github.com/spf13/cobra" ) @@ -110,7 +110,7 @@ func GetCmdNames(queryRoute string, cdc *codec.Codec) *cobra.Command { 现在已经定义了查询交互，是时候继续在`tx.go`中的交易生成了： -> 你的应用程序需要导入你刚编写的代码。这里导入路径设置为此存储库（github.com/cosmos/sdk-application-tutorial/x/nameservice）。如果您是在自己的仓库中进行的前面的操作，则需要更改导入路径（github.com/{.Username}/{.Project.Repo}/x/nameservice）。 +> 你的应用程序需要导入你刚编写的代码。这里导入路径设置为此存储库（github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice）。如果您是在自己的仓库中进行的前面的操作，则需要更改导入路径（github.com/{.Username}/{.Project.Repo}/x/nameservice）。 ```go package cli @@ -121,7 +121,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/client/utils" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/sdk-application-tutorial/x/nameservice" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice" sdk "github.com/cosmos/cosmos-sdk/types" authtxb "github.com/cosmos/cosmos-sdk/x/auth/client/txbuilder" @@ -199,14 +199,14 @@ func GetCmdSetName(cdc *codec.Codec) *cobra.Command { 导出此功能的最后一部分称为`ModuleClient`，在`./x/nameservice/client/module_client.go`文件中实现。[Module Client](https://godoc.org/github.com/cosmos/cosmos-sdk/types#ModuleClients) 为模块提供了导出客户端功能的标准方法。 -> 注意：你的应用程序需要导入你刚编写的代码。这里导入路径设置为此仓库（github.com/cosmos/sdk-application-tutorial/x/nameservice）。如果你是在自己项目中编写的，则需要更改导入路径成（github.com/{.Username}/ {.Project.Repo}/x/nameservice）。 +> 注意：你的应用程序需要导入你刚编写的代码。这里导入路径设置为此仓库（github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice）。如果你是在自己项目中编写的，则需要更改导入路径成（github.com/{.Username}/ {.Project.Repo}/x/nameservice）。 ```go package client import ( "github.com/cosmos/cosmos-sdk/client" - nameservicecmd "github.com/cosmos/sdk-application-tutorial/x/nameservice/client/cli" + nameservicecmd "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/client/cli" "github.com/spf13/cobra" amino "github.com/tendermint/go-amino" ) diff --git a/nameservice/tutorial/cn/11-rest.md b/nameservice/tutorial/cn/11-rest.md index 9f5eaeaee4..8a605e59a2 100644 --- a/nameservice/tutorial/cn/11-rest.md +++ b/nameservice/tutorial/cn/11-rest.md @@ -6,7 +6,7 @@ 引入模块和定义常量： -> 你的应用程序需要导入你刚编写的代码。这里导入路径设置为此存储库（github.com/cosmos/sdk-application-tutorial/x/nameservice）。如果您是在自己的仓库中进行的前面的操作，则需要更改导入路径（github.com/{.Username}/{.Project.Repo}/x/nameservice）。 +> 你的应用程序需要导入你刚编写的代码。这里导入路径设置为此存储库（github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice）。如果您是在自己的仓库中进行的前面的操作，则需要更改导入路径（github.com/{.Username}/{.Project.Repo}/x/nameservice）。 ```go package rest @@ -20,7 +20,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/rest" - "github.com/cosmos/sdk-application-tutorial/x/nameservice" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice" "github.com/gorilla/mux" ) diff --git a/nameservice/tutorial/cn/12-app-complete.md b/nameservice/tutorial/cn/12-app-complete.md index 11bb155491..1a10bec746 100644 --- a/nameservice/tutorial/cn/12-app-complete.md +++ b/nameservice/tutorial/cn/12-app-complete.md @@ -2,7 +2,7 @@ 现在你的模块已就绪，它可以和其它两个模块[`auth`](https://godoc.org/github.com/cosmos/cosmos-sdk/x/auth)和[`bank`](https://godoc.org/github.com/cosmos/cosmos-sdk/x/bank)被合并到`./app.go`文件中: -> 你的应用程序需要导入你刚编写的代码。这里导入路径设置为此存储库（github.com/cosmos/sdk-application-tutorial/x/nameservice）。如果您是在自己的仓库中进行的前面的操作，则需要更改导入路径（github.com/{.Username}/{.Project.Repo}/x/nameservice）。 +> 你的应用程序需要导入你刚编写的代码。这里导入路径设置为此存储库（github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice）。如果您是在自己的仓库中进行的前面的操作，则需要更改导入路径（github.com/{.Username}/{.Project.Repo}/x/nameservice）。 ```go package app @@ -17,7 +17,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/bank" "github.com/cosmos/cosmos-sdk/x/params" "github.com/cosmos/cosmos-sdk/x/staking" - "github.com/cosmos/sdk-application-tutorial/x/nameservice" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice" bam "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/nameservice/tutorial/cn/13-entrypoint.md b/nameservice/tutorial/cn/13-entrypoint.md index dd1f7f8e60..22c5263b69 100644 --- a/nameservice/tutorial/cn/13-entrypoint.md +++ b/nameservice/tutorial/cn/13-entrypoint.md @@ -287,8 +287,8 @@ import ( bankcmd "github.com/cosmos/cosmos-sdk/x/bank/client/cli" bank "github.com/cosmos/cosmos-sdk/x/bank/client/rest" app "github.com/cosmos/sdk-application-tutorial" - nsclient "github.com/cosmos/sdk-application-tutorial/x/nameservice/client" - nsrest "github.com/cosmos/sdk-application-tutorial/x/nameservice/client/rest" + nsclient "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/client" + nsrest "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/client/rest" ) var defaultCLIHome = os.ExpandEnv("$HOME/.nscli") diff --git a/nameservice/tutorial/module.md b/nameservice/tutorial/module.md index c2d50490bf..000f34a320 100644 --- a/nameservice/tutorial/module.md +++ b/nameservice/tutorial/module.md @@ -18,8 +18,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/bank" - "github.com/cosmos/sdk-application-tutorial/x/nameservice/client/cli" - "github.com/cosmos/sdk-application-tutorial/x/nameservice/client/rest" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/client/cli" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/client/rest" "github.com/cosmos/cosmos-sdk/client/context" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/nameservice/x/nameservice/alias.go b/nameservice/x/nameservice/alias.go index bd306bf6dd..969bb0959a 100644 --- a/nameservice/x/nameservice/alias.go +++ b/nameservice/x/nameservice/alias.go @@ -1,8 +1,8 @@ package nameservice import ( - "github.com/cosmos/sdk-application-tutorial/x/nameservice/internal/keeper" - "github.com/cosmos/sdk-application-tutorial/x/nameservice/internal/types" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/internal/keeper" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/internal/types" ) const ( diff --git a/nameservice/x/nameservice/client/cli/query.go b/nameservice/x/nameservice/client/cli/query.go index abf4ffb6cd..9c9b2b6474 100644 --- a/nameservice/x/nameservice/client/cli/query.go +++ b/nameservice/x/nameservice/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/sdk-application-tutorial/x/nameservice/internal/types" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/internal/types" "github.com/spf13/cobra" ) diff --git a/nameservice/x/nameservice/client/cli/tx.go b/nameservice/x/nameservice/client/cli/tx.go index 5efeb6af2f..e7963930c7 100644 --- a/nameservice/x/nameservice/client/cli/tx.go +++ b/nameservice/x/nameservice/client/cli/tx.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/auth/client/utils" - "github.com/cosmos/sdk-application-tutorial/x/nameservice/internal/types" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/internal/types" ) func GetTxCmd(storeKey string, cdc *codec.Codec) *cobra.Command { diff --git a/nameservice/x/nameservice/client/rest/tx.go b/nameservice/x/nameservice/client/rest/tx.go index 6d12fa7c6c..87b56c8bc8 100644 --- a/nameservice/x/nameservice/client/rest/tx.go +++ b/nameservice/x/nameservice/client/rest/tx.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/cosmos/cosmos-sdk/client/context" - "github.com/cosmos/sdk-application-tutorial/x/nameservice/internal/types" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/internal/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/rest" diff --git a/nameservice/x/nameservice/handler.go b/nameservice/x/nameservice/handler.go index d7329696e2..6ce89af1f3 100644 --- a/nameservice/x/nameservice/handler.go +++ b/nameservice/x/nameservice/handler.go @@ -3,7 +3,7 @@ package nameservice import ( "fmt" - "github.com/cosmos/sdk-application-tutorial/x/nameservice/internal/types" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/internal/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/nameservice/x/nameservice/internal/keeper/keeper.go b/nameservice/x/nameservice/internal/keeper/keeper.go index cb5a46e553..4e450694d0 100644 --- a/nameservice/x/nameservice/internal/keeper/keeper.go +++ b/nameservice/x/nameservice/internal/keeper/keeper.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/bank" - "github.com/cosmos/sdk-application-tutorial/x/nameservice/internal/types" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/internal/types" ) // Keeper maintains the link to storage and exposes getter/setter methods for the various parts of the state machine diff --git a/nameservice/x/nameservice/internal/keeper/querier.go b/nameservice/x/nameservice/internal/keeper/querier.go index 6160382829..276614f39b 100644 --- a/nameservice/x/nameservice/internal/keeper/querier.go +++ b/nameservice/x/nameservice/internal/keeper/querier.go @@ -2,7 +2,7 @@ package keeper import ( "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/sdk-application-tutorial/x/nameservice/internal/types" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/internal/types" sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/tendermint/tendermint/abci/types" diff --git a/nameservice/x/nameservice/module.go b/nameservice/x/nameservice/module.go index 2d52a9b662..8afddf51a9 100644 --- a/nameservice/x/nameservice/module.go +++ b/nameservice/x/nameservice/module.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/bank" - "github.com/cosmos/sdk-application-tutorial/x/nameservice/client/cli" - "github.com/cosmos/sdk-application-tutorial/x/nameservice/client/rest" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/client/cli" + "github.com/cosmos/sdk-application-tutorial/nameservice/x/nameservice/client/rest" "github.com/cosmos/cosmos-sdk/client/context" sdk "github.com/cosmos/cosmos-sdk/types"