Merge PR #1705: baseapp: Allow alphanumerics in routes

Previously only alphabetic characters were allowed.
cosmos · Jul 17, 2018 · f88d644 · f88d644
1 parent d6969c1
commit f88d644
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,14 @@
 # Changelog
 
-## TBD
+## PENDING
 
 BREAKING CHANGES
 
 FEATURES
 * [lcd] Can now query governance proposals by ProposalStatus
 
 IMPROVEMENTS
+* [baseapp] Allow any alphanumeric character in route
 
 BUG FIXES
 

diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go
@@ -290,7 +290,7 @@ func (tx txTest) GetMsgs() []sdk.Msg { return tx.Msgs }
 
 const (
 	typeMsgCounter  = "msgCounter"
-	typeMsgCounter2 = "msgCounterTwo" // NOTE: no numerics (?)
+	typeMsgCounter2 = "msgCounter2"
 )
 
 // ValidateBasic() fails on negative counters.

diff --git a/baseapp/router.go b/baseapp/router.go
@@ -31,12 +31,12 @@ func NewRouter() *router {
 	}
 }
 
-var isAlpha = regexp.MustCompile(`^[a-zA-Z]+$`).MatchString
+var isAlphaNumeric = regexp.MustCompile(`^[a-zA-Z0-9]+$`).MatchString
 
 // AddRoute - TODO add description
 func (rtr *router) AddRoute(r string, h sdk.Handler) Router {
-	if !isAlpha(r) {
-		panic("route expressions can only contain alphabet characters")
+	if !isAlphaNumeric(r) {
+		panic("route expressions can only contain alphanumeric characters")
 	}
 	rtr.routes = append(rtr.routes, route{r, h})