Merge branch 'issues-971' of https://github.com/icehawk-hyb/plugin into issues-971

84133166 · heyubin · 71dcbc92 · a4e8f1fa · 84133166 · 84133166
Commit 84133166 authored Jan 18, 2021 by heyubin
Showing with 1 addition and 1 deletion

go.sum go.sum +1 -0

state.go plugin/consensus/tendermint/state.go +0 -0

vote_test.go plugin/dapp/dposvote/commands/vote_test.go +0 -0

hashlock_unit_test.go plugin/dapp/hashlock/executor/hashlock_unit_test.go +0 -1

No files found.
--- a/go.sum
+++ b/go.sum
@@ -82,6 +82,7 @@ github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8Nz
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=

--- a/plugin/consensus/tendermint/state.go
+++ b/plugin/consensus/tendermint/state.go
--- a/plugin/dapp/dposvote/commands/vote_test.go
+++ b/plugin/dapp/dposvote/commands/vote_test.go
--- a/plugin/dapp/hashlock/executor/hashlock_unit_test.go
+++ b/plugin/dapp/hashlock/executor/hashlock_unit_test.go
@@ -127,7 +127,6 @@ func constructHashlockInstance() drivers.Driver {

 func ConstructLockTx() *types.Transaction {

-
 	var lockAmount int64 = 90
 	var locktime int64 = 70
 	var fee int64 = 1e6