Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(dot/network): Implement time based handle transaction #1942

Merged
merged 18 commits into from
Nov 26, 2021
Merged

fix(dot/network): Implement time based handle transaction #1942

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9384f18
Implement time based batch processing of transcation message.
arijitAD Nov 2, 2021
5df9fe6
Address comments.
arijitAD Nov 9, 2021
37af18d
Fix failing tests.
arijitAD Nov 10, 2021
e90aed8
Address comments.
arijitAD Nov 10, 2021
14e6563
Address comments.
arijitAD Nov 11, 2021
96de6ff
Merge remote-tracking branch 'origin/development' into time-based-han…
arijitAD Nov 12, 2021
bbe1b89
Fix build
arijitAD Nov 12, 2021
61910bc
Address comments
arijitAD Nov 23, 2021
0fb0be2
Merge remote-tracking branch 'origin/development' into time-based-han…
arijitAD Nov 23, 2021
85fc57d
Address lint issues
arijitAD Nov 23, 2021
45d69c2
Minor nit
arijitAD Nov 23, 2021
464f2bc
Increase slot duration time in test
arijitAD Nov 23, 2021
07f1a35
Address comments
arijitAD Nov 24, 2021
85d1620
Merge remote-tracking branch 'origin/development' into time-based-han…
arijitAD Nov 26, 2021
3dd07ab
Address comments.
arijitAD Nov 26, 2021
993b423
Fix mock
arijitAD Nov 26, 2021
a5dcfde
Fix mock
arijitAD Nov 26, 2021
a297154
Fix lint
arijitAD Nov 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dot/network/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ type Config struct {

batchSize int // internal option

// SlotDuration is slot duration to produce block
// SlotDuration is the slot duration to produce a block
SlotDuration time.Duration
}

Expand Down
14 changes: 7 additions & 7 deletions dot/network/mock_transaction_handler.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions dot/network/transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,12 @@ func (s *Service) startTxnBatchProcessing(txnBatchCh chan *BatchMessage) {
case <-s.ctx.Done():
return
case <-ticker.C:
timeOut := time.NewTimer(s.cfg.SlotDuration / 3)
var completed bool
for !completed {
timer := time.NewTimer(s.cfg.SlotDuration / 3)
var timedOut bool
for !timedOut {
select {
case <-timeOut.C:
completed = true
case <-timer.C:
timedOut = true
case txnMsg := <-txnBatchCh:
propagate, err := s.handleTransactionMessage(txnMsg.peer, txnMsg.msg)
if err != nil {
Expand Down
3 changes: 2 additions & 1 deletion dot/network/transaction_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ package network
import (
"testing"

"github.com/libp2p/go-libp2p-core/peer"

"github.com/ChainSafe/gossamer/dot/types"
"github.com/ChainSafe/gossamer/lib/utils"
"github.com/libp2p/go-libp2p-core/peer"

"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
Expand Down
1 change: 1 addition & 0 deletions dot/services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ func createNetworkService(cfg *Config, stateSrvc *state.Service) (*network.Servi
PersistentPeers: cfg.Network.PersistentPeers,
DiscoveryInterval: cfg.Network.DiscoveryInterval,
SlotDuration: slotDuration,
PublicIP: cfg.Network.PublicIP,
}

networkSrvc, err := network.NewService(&networkConfig)
Expand Down
5 changes: 3 additions & 2 deletions lib/grandpa/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ package grandpa
import (
"math/big"

"github.com/libp2p/go-libp2p-core/peer"
"github.com/libp2p/go-libp2p-core/protocol"

"github.com/ChainSafe/gossamer/dot/network"
"github.com/ChainSafe/gossamer/dot/types"
"github.com/ChainSafe/gossamer/lib/common"
"github.com/libp2p/go-libp2p-core/peer"
"github.com/libp2p/go-libp2p-core/protocol"
)

// BlockState is the interface required by GRANDPA into the block state
Expand Down
9 changes: 5 additions & 4 deletions tests/stress/stress_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@ import (
"testing"
"time"

gosstypes "github.com/ChainSafe/gossamer/dot/types"
"github.com/ChainSafe/gossamer/internal/log"
"github.com/ChainSafe/gossamer/lib/common"
"github.com/ChainSafe/gossamer/tests/utils"
gsrpc "github.com/centrifuge/go-substrate-rpc-client/v3"
"github.com/centrifuge/go-substrate-rpc-client/v3/signature"
"github.com/centrifuge/go-substrate-rpc-client/v3/types"
"github.com/gorilla/websocket"
"github.com/stretchr/testify/require"

gosstypes "github.com/ChainSafe/gossamer/dot/types"
"github.com/ChainSafe/gossamer/internal/log"
"github.com/ChainSafe/gossamer/lib/common"
"github.com/ChainSafe/gossamer/tests/utils"
)

func TestMain(m *testing.M) {
Expand Down