Skip to content

Commit

Permalink
Merge pull request #30 from omisego/lint_all_the_things
Browse files Browse the repository at this point in the history
[plasma-cli] Fix linter errors
  • Loading branch information
JBunCE authored Mar 2, 2019
2 parents 9bbda1a + 8adbc8c commit 42caf5a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
package main

// Copyright 2019 OmiseGO Pte Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -12,8 +14,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package main

import (
"github.com/omisego/plasma-cli/parser"
"github.com/omisego/plasma-cli/util"
Expand Down
2 changes: 1 addition & 1 deletion parser/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package parser
import (
"os"

"github.com/ethereum/go-ethereum/common"
"github.com/omisego/plasma-cli/plasma"
"github.com/omisego/plasma-cli/util"
"github.com/ethereum/go-ethereum/common"
log "github.com/sirupsen/logrus"
"gopkg.in/alecthomas/kingpin.v2"
)
Expand Down
6 changes: 2 additions & 4 deletions plasma/plasma.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import (
"net/http"
"strings"

"github.com/omisego/plasma-cli/rootchain"
"github.com/omisego/plasma-cli/util"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/rlp"
"github.com/omisego/plasma-cli/rootchain"
"github.com/omisego/plasma-cli/util"
log "github.com/sirupsen/logrus"
)

Expand Down Expand Up @@ -671,5 +671,3 @@ func ProcessExits(numberExitsToProcess int64, p ProcessExit) {
log.Info("Process exits request to Plasma MoreVP sent. Transaction: ", tx.Hash().Hex())
}
}


7 changes: 3 additions & 4 deletions util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ package util

import (
"encoding/hex"
"strings"
"strconv"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/rlp"
log "github.com/sirupsen/logrus"
"strconv"
"strings"
)

type DepositParent struct {
Expand Down Expand Up @@ -171,7 +171,7 @@ func BuildRLPInput(address string, value uint64) []byte {
UTXOOutputs = append(UTXOOutputs, ownership)

NULL_OUTPUT := OutputUTXO{Currency1: cur, Currency2: cur, Value: 0}
for i := 0; i <=3; i++ {
for i := 0; i <= 3; i++ {
UTXOOutputs = append(UTXOOutputs, NULL_OUTPUT)
}
deposit.UTXOOutputs = UTXOOutputs
Expand All @@ -193,4 +193,3 @@ func LogFormatter() {
}
log.SetFormatter(formatter)
}

0 comments on commit 42caf5a

Please sign in to comment.