Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
plugin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
plugin
Commits
5a0b57b3
Commit
5a0b57b3
authored
Sep 04, 2019
by
张振华
Browse files
Options
Browse Files
Download
Plain Diff
update
parents
a70c378e
d19a436b
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
40 additions
and
22 deletions
+40
-22
consensus_state.go
plugin/consensus/dpos/consensus_state.go
+2
-1
dpos.go
plugin/consensus/dpos/dpos.go
+3
-2
ticker_test.go
plugin/consensus/dpos/ticker_test.go
+2
-1
dpos_msg.pb.go
plugin/consensus/dpos/types/dpos_msg.pb.go
+7
-3
genesis_test.go
plugin/consensus/dpos/types/genesis_test.go
+3
-2
priv_validator_test.go
plugin/consensus/dpos/types/priv_validator_test.go
+5
-4
signable.go
plugin/consensus/dpos/types/signable.go
+2
-1
signable_test.go
plugin/consensus/dpos/types/signable_test.go
+1
-0
util_test.go
plugin/consensus/dpos/types/util_test.go
+3
-2
validator_set_test.go
plugin/consensus/dpos/types/validator_set_test.go
+3
-2
validator_manager.go
plugin/consensus/dpos/validator_manager.go
+1
-0
validator_manager_test.go
plugin/consensus/dpos/validator_manager_test.go
+1
-0
vote.go
plugin/dapp/dposvote/commands/vote.go
+2
-1
dposvotedb.go
plugin/dapp/dposvote/executor/dposvotedb.go
+3
-3
exec_local.go
plugin/dapp/dposvote/executor/exec_local.go
+1
-0
const.go
plugin/dapp/dposvote/types/const.go
+0
-0
dposvote.pb.go
plugin/dapp/dposvote/types/dposvote.pb.go
+0
-0
msg.go
plugin/dapp/dposvote/types/msg.go
+1
-0
guess.pb.go
plugin/dapp/guess/types/guess.pb.go
+0
-0
No files found.
plugin/consensus/dpos/consensus_state.go
View file @
5a0b57b3
...
...
@@ -10,13 +10,14 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/33cn/chain33/types"
"reflect"
"runtime/debug"
"sync"
"sync/atomic"
"time"
"github.com/33cn/chain33/types"
"github.com/33cn/chain33/common/crypto"
dpostype
"github.com/33cn/plugin/plugin/consensus/dpos/types"
ttypes
"github.com/33cn/plugin/plugin/consensus/dpos/types"
...
...
plugin/consensus/dpos/dpos.go
View file @
5a0b57b3
...
...
@@ -8,11 +8,12 @@ import (
"bytes"
"encoding/hex"
"fmt"
"github.com/33cn/chain33/common/address"
"github.com/33cn/chain33/util"
"strings"
"time"
"github.com/33cn/chain33/common/address"
"github.com/33cn/chain33/util"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/common/log/log15"
"github.com/33cn/chain33/common/merkle"
...
...
plugin/consensus/dpos/ticker_test.go
View file @
5a0b57b3
package
dpos
import
(
"github.com/stretchr/testify/assert"
"testing"
"time"
"github.com/stretchr/testify/assert"
)
func
TestTicker
(
t
*
testing
.
T
)
{
...
...
plugin/consensus/dpos/types/dpos_msg.pb.go
View file @
5a0b57b3
...
...
@@ -18,9 +18,13 @@ It has these top-level messages:
*/
package
types
import
proto
"github.com/golang/protobuf/proto"
import
fmt
"fmt"
import
math
"math"
import
(
fmt
"fmt"
proto
"github.com/golang/protobuf/proto"
math
"math"
)
// Reference imports to suppress errors if they are not otherwise used.
var
_
=
proto
.
Marshal
...
...
plugin/consensus/dpos/types/genesis_test.go
View file @
5a0b57b3
package
types
import
(
"os"
"testing"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"os"
"testing"
)
const
(
...
...
plugin/consensus/dpos/types/priv_validator_test.go
View file @
5a0b57b3
...
...
@@ -5,16 +5,17 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"io"
"os"
"sort"
"strings"
"testing"
"time"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
const
(
...
...
plugin/consensus/dpos/types/signable.go
View file @
5a0b57b3
...
...
@@ -9,10 +9,11 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/33cn/chain33/common/address"
"io"
"time"
"github.com/33cn/chain33/common/address"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/common/log/log15"
)
...
...
plugin/consensus/dpos/types/signable_test.go
View file @
5a0b57b3
...
...
@@ -2,6 +2,7 @@ package types
import
(
"encoding/json"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/types"
"github.com/stretchr/testify/assert"
...
...
plugin/consensus/dpos/types/util_test.go
View file @
5a0b57b3
...
...
@@ -3,14 +3,15 @@ package types
import
(
"bytes"
"fmt"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"os"
"os/signal"
"strings"
"sync"
"testing"
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func
init
()
{
...
...
plugin/consensus/dpos/types/validator_set_test.go
View file @
5a0b57b3
...
...
@@ -4,12 +4,13 @@ import (
"bytes"
"encoding/hex"
"fmt"
"strings"
"testing"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"strings"
"testing"
)
const
(
...
...
plugin/consensus/dpos/validator_manager.go
View file @
5a0b57b3
...
...
@@ -8,6 +8,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"github.com/33cn/chain33/common/address"
ttypes
"github.com/33cn/plugin/plugin/consensus/dpos/types"
dty
"github.com/33cn/plugin/plugin/dapp/dposvote/types"
...
...
plugin/consensus/dpos/validator_manager_test.go
View file @
5a0b57b3
...
...
@@ -3,6 +3,7 @@ package dpos
import
(
"bytes"
"encoding/hex"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/types"
ttypes
"github.com/33cn/plugin/plugin/consensus/dpos/types"
...
...
plugin/dapp/dposvote/commands/vote.go
View file @
5a0b57b3
...
...
@@ -10,12 +10,13 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
"github.com/33cn/chain33/common/crypto"
"math/rand"
"strconv"
"strings"
"time"
"github.com/33cn/chain33/common/crypto"
vrf
"github.com/33cn/chain33/common/vrf/secp256k1"
jsonrpc
"github.com/33cn/chain33/rpc/jsonclient"
rpctypes
"github.com/33cn/chain33/rpc/types"
...
...
plugin/dapp/dposvote/executor/dposvotedb.go
View file @
5a0b57b3
...
...
@@ -8,6 +8,9 @@ import (
"bytes"
"encoding/hex"
"fmt"
"sort"
"strings"
"github.com/33cn/chain33/account"
"github.com/33cn/chain33/common"
"github.com/33cn/chain33/common/db"
...
...
@@ -15,8 +18,6 @@ import (
"github.com/33cn/chain33/system/dapp"
"github.com/33cn/chain33/types"
dty
"github.com/33cn/plugin/plugin/dapp/dposvote/types"
"sort"
"strings"
)
const
(
...
...
@@ -99,7 +100,6 @@ func queryVrfByTime(kvdb db.KVDB, req *dty.DposVrfQuery) (types.Message, error)
return
queryVrfByCycle
(
kvdb
,
req
)
}
func
getJSONVrfs
(
vrfs
[]
*
dty
.
VrfInfo
)
[]
*
dty
.
JSONVrfInfo
{
var
jsonVrfs
[]
*
dty
.
JSONVrfInfo
for
i
:=
0
;
i
<
len
(
vrfs
);
i
++
{
...
...
plugin/dapp/dposvote/executor/exec_local.go
View file @
5a0b57b3
...
...
@@ -6,6 +6,7 @@ package executor
import
(
"fmt"
"github.com/33cn/chain33/types"
dty
"github.com/33cn/plugin/plugin/dapp/dposvote/types"
)
...
...
plugin/dapp/dposvote/types/const.go
View file @
5a0b57b3
plugin/dapp/dposvote/types/dposvote.pb.go
View file @
5a0b57b3
This diff is collapsed.
Click to expand it.
plugin/dapp/dposvote/types/msg.go
View file @
5a0b57b3
...
...
@@ -5,6 +5,7 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
"github.com/33cn/chain33/common/crypto"
ttypes
"github.com/33cn/plugin/plugin/consensus/dpos/types"
)
...
...
plugin/dapp/guess/types/guess.pb.go
View file @
5a0b57b3
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment