Merge pull request #375 from anandrgitnirman/meter

Isseu 374: Sender can also be a potential signer

escrow/validation.go

@@ -82,9 +82,9 @@ func (validator *ChannelPaymentValidator) Validate(payment *Payment, channel *Pa
 	}
 
 	log = log.WithField("signerAddress", blockchain.AddressToHex(signerAddress))
-	if *signerAddress != channel.Signer {
-		log.WithField("signerAddress", blockchain.AddressToHex(signerAddress)).Warn("Channel signer is not equal to payment signer")
-		return NewPaymentError(Unauthenticated, "payment is not signed by channel signer")
+	if *signerAddress != channel.Signer && *signerAddress != channel.Sender  {
+		log.WithField("signerAddress", blockchain.AddressToHex(signerAddress)).Warn("Channel signer is not equal to payment signer/sender")
+		return NewPaymentError(Unauthenticated, "payment is not signed by channel signer/sender")
 	}
 	currentBlock, e := validator.currentBlock()
 	if e != nil {

escrow/validation_test.go

@@ -193,7 +193,7 @@ func (suite *ValidationTestSuite) TestValidatePaymentIncorrectSigner() {
 
 	err := suite.validator.Validate(payment, suite.channel())
 
-	assert.Equal(suite.T(), NewPaymentError(Unauthenticated, "payment is not signed by channel signer"), err)
+	assert.Equal(suite.T(), NewPaymentError(Unauthenticated, "payment is not signed by channel signer/sender"), err)
 }
 
 func (suite *ValidationTestSuite) TestValidatePaymentChannelCannotGetCurrentBlock() {

ratelimit/rateLimit.go

@@ -4,6 +4,7 @@ import (
 	"github.com/singnet/snet-daemon/config"
 	"golang.org/x/time/rate"
 	"math"
+	"strconv"
 	"time"
 )
 
@@ -19,7 +20,13 @@ func NewRateLimiter() rate.Limiter {
 }
 
 func getLimit() rate.Limit {
-	ratePerMin := config.GetInt(config.RateLimitPerMinute)
+
+
+	ratePerMin, err := strconv.ParseFloat(config.GetString(config.RateLimitPerMinute), 32)
+	if err != nil {
+		return rate.Inf
+	}
+
 	//If the rate limit parameter Value is not defined we will assume it to be Infinity ( no Rate Limiting) ,
 	if ratePerMin == 0 {
 		return rate.Inf

scripts/test

@@ -24,5 +24,5 @@ for d in */ ; do
 done
 echo "mode: set">>coverage.out
 grep -h -v "mode: set" *.part >>coverage.out
-# /go/bin/goveralls -coverprofile=coverage.out -service=circleci -repotoken ${COVERALLS_REPO_TOKEN}
+ /go/bin/goveralls -coverprofile=coverage.out -service=circleci -repotoken ${COVERALLS_REPO_TOKEN}
 popd