#216 Link msg bandwidth cost doesn't take into account links count

cybercongress · Jan 29, 2019 · b3e5416 · b3e5416
1 parent 4890ecb
commit b3e5416
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/types/errors.go b/types/errors.go
@@ -13,6 +13,7 @@ const (
 	CodeCidNotFound        sdk.CodeType = 3
 	CodeNotEnoughBandwidth sdk.CodeType = 4
 	CodeDuplicatedLink     sdk.CodeType = 5
+	CodeZeroLinks          sdk.CodeType = 6
 
 	// Code space
 	CodespaceCbd sdk.CodespaceType = "cyberd"
@@ -30,6 +31,8 @@ func codeToDefaultMsg(code sdk.CodeType) string {
 		return "not enough bandwidth to make transaction"
 	case CodeDuplicatedLink:
 		return "duplicated link"
+	case CodeZeroLinks:
+		return "no links found"
 	default:
 		return fmt.Sprintf("unknown error: code %d", code)
 	}
@@ -54,6 +57,10 @@ func ErrDuplicatedLink() sdk.Error {
 	return newError(CodespaceCbd, CodeDuplicatedLink)
 }
 
+func ErrZeroLinks() sdk.Error {
+	return newError(CodespaceCbd, CodeZeroLinks)
+}
+
 func newError(codespace sdk.CodespaceType, code sdk.CodeType) sdk.Error {
 	msg := codeToDefaultMsg(code)
 	return sdk.NewError(codespace, code, msg)

diff --git a/x/bandwidth/cost.go b/x/bandwidth/cost.go
@@ -8,7 +8,8 @@ import (
 func MsgBandwidthCosts(msg sdk.Msg) int64 {
 	switch msg.(type) {
 	case link.Msg:
-		return LinkMsgCost
+		linkMsg := msg.(link.Msg)
+		return int64(len(linkMsg.Links)) * LinkMsgCost
 	default:
 		return NonLinkMsgCost
 	}

diff --git a/x/link/msgs.go b/x/link/msgs.go
@@ -29,6 +29,10 @@ func (msg Msg) ValidateBasic() sdk.Error {
 		return sdk.ErrInvalidAddress(msg.Address.String())
 	}
 
+	if len(msg.Links) == 0 {
+		return cbd.ErrZeroLinks()
+	}
+
 	var filter = make(CidsFilter)
 
 	for _, link := range msg.Links {