PoS_EVM
/
woop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge conflict

Browse Source
pull/182/head
Rongjian Lan 6 years ago
parent 4578cc6331 15020e14af
commit 118c74fd39
3 changed files with 3 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      benchmark.go
  2. 3
      consensus/consensus_validator.go
  3. 0
      internal/attack/attack.go

2
benchmark.go
Unescape View File

@ -11,9 +11,9 @@ import (
"github.com/harmony-one/harmony/p2p/p2pimpl" "github.com/harmony-one/harmony/p2p/p2pimpl"
"github.com/harmony-one/harmony/attack"
"github.com/harmony-one/harmony/consensus" "github.com/harmony-one/harmony/consensus"
"github.com/harmony-one/harmony/db" "github.com/harmony-one/harmony/db"
"github.com/harmony-one/harmony/internal/attack"
"github.com/harmony-one/harmony/log" "github.com/harmony-one/harmony/log"
pkg_newnode "github.com/harmony-one/harmony/newnode" pkg_newnode "github.com/harmony-one/harmony/newnode"
"github.com/harmony-one/harmony/node" "github.com/harmony-one/harmony/node"

3
consensus/consensus_validator.go
Unescape View File

@ -2,12 +2,13 @@ package consensus
import ( import (
"bytes" "bytes"
"github.com/dedis/kyber/sign/schnorr" "github.com/dedis/kyber/sign/schnorr"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
consensus_proto "github.com/harmony-one/harmony/api/consensus" consensus_proto "github.com/harmony-one/harmony/api/consensus"
"github.com/harmony-one/harmony/attack"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/crypto" "github.com/harmony-one/harmony/crypto"
"github.com/harmony-one/harmony/internal/attack"
"github.com/harmony-one/harmony/log" "github.com/harmony-one/harmony/log"
proto_consensus "github.com/harmony-one/harmony/proto/consensus" proto_consensus "github.com/harmony-one/harmony/proto/consensus"
"github.com/harmony-one/harmony/utils" "github.com/harmony-one/harmony/utils"

0
attack/attack.go → internal/attack/attack.go
Unescape View File

Write Preview
Loading…
Cancel
Save