mirror of
https://github.com/kaspanet/kaspad.git
synced 2025-03-30 15:08:33 +00:00

* [NOD-1319] Create the protorpc package. * [NOD-1319] Use a general ClientStream in closeSend. * [NOD-1319] Decouple p2pServer from gRPCServer. * [NOD-1319] Begin implementing rpcServer. * [NOD-1319] Move grpcStream to grpc_connection.go. * [NOD-1319] Fold the rpc messages.proto into a common message.proto. * [NOD-1319] Remove code duplication in MessageStream. * [NOD-1319] Rename methods in netadapter. * [NOD-1319] Rename message_xxx to p2p_xxx. * [NOD-1319] Section off p2p messages from rpc messages in messages.proto. * [NOD-1319] Split toPayload to a p2p part and and rpc part. * [NOD-1319] Rename msgxxx.go to p2p_msgxx.go in the appmessage package. * [NOD-1319] Implement GetCurrentVersionRequestMessage and GetCurrentVersionResponseMessage. * [NOD-1319] Implement toAppMessage and fromAppMessage for getCurrentNetwork * [NOD-1319] Make a temporary workaround so that tests pass. * [NOD-1319] Begin implementing the rpc manager. * [NOD-1319] Implement an initial routerInitializer for rpc. * [NOD-1319] Rename the spawn in routerInitializer. * [NOD-1319] Implement an RPC context. * [NOD-1319] Move the actual handlers to a separate package. * [NOD-1319] Use the correct value for the GetCurrentNetwork response. * [NOD-1319] Fix some names. * [NOD-1319] Begin implementing a cli rpc client. * [NOD-1319] Implement connecting to the RPC server. * [NOD-1319] Make sure that connecting to the server and sending/receiving messages works. * [NOD-1319] Make kaspactl2 speak in json strings. * [NOD-1319] Finish implementing kaspactl2. * [NOD-1319] Remove debug messages. * [NOD-1319] Properly handle errors in rpc.go. * [NOD-1319] Move the grpc client to a separate package. * [NOD-1319] Extract Post out of PostString. * [NOD-1319] Implement PostAppMessage. * [NOD-1319] Stub out submitBlock. * [NOD-1319] Stub out getBlockTemplate. * [NOD-1319] Combine request and reponse files. * [NOD-1319] Implement submitBlock. * [NOD-1319] Implement returning errors from RPC. * [NOD-1319] Begin implementing getBlockTemplate. * [NOD-1319] Add missing field in GetBlockTemplateRequestMessage. * [NOD-1319] Implement a minimal getBlockTemplate. * [NOD-1319] Add getBlockTemplate stuff to grpc. * [NOD-1319] Implement the rest of getBlockTemplate. * [NOD-1319] Add block/transaction added handlers to the protocol manager. * [NOD-1319] Implement NotifyTransactionAddedToMempool. * [NOD-1319] Implement NotifyBlockAddedToDAG. * [NOD-1319] Connect block/transaction added handlers. * [NOD-1319] Add notifyBlockAdded. * [NOD-1319] Add a notification system. * [NOD-1319] Improve the notification system. * [NOD-1319] Add a block added listener stub. * [NOD-1319] Add BlockAddedNotificationMessage. * [NOD-1319] Finish implementing HandleNotifyBlockAdded. * [NOD-1319] Println instead of Print in kaspactl2. * [NOD-1319] Remove unused flags in kaspactl2. * [NOD-1319] Make kaspaminer work with the new RPC. * [NOD-1319] Fix a bad log. * [NOD-1319] Make kaspaminer work. * [NOD-1319] Disconnect the old RPC. * [NOD-1319] Move grpcclient.go. * [NOD-1319] Begin generalizing the rpcClient. * [NOD-1319] Move errors to the side of the payload. * [NOD-1319] Add errors to appmessage. * [NOD-1319] Move AttachRouter to grpcclient. * [NOD-1319] Fix kaspaminer not handling responses. * [NOD-1319] Properly handle blockAddedNotifications. * [NOD-1319] Move errors into individual response objects. * [NOD-1319] Begin replacing the RPC client in the integration tests. * [NOD-1319] Implement GetPeerAddresses. * [NOD-1319] Implement GetPeerAddresses. * [NOD-1319] Fix setOnBlockAddedHandler. * [NOD-1319] Remove the old kaspactl. * [NOD-1319] Move ConvertGetBlockTemplateResultToBlock to the mining package. * [NOD-1319] Implement getSelectedTipHash. * [NOD-1319] Simplify testRPCRouter. * [NOD-1319] Write stubs for the required test RPC commands. * [NOD-1319] Implement a minimal getMempoolEntry. * [NOD-1319] Implement a minimal getMempoolEntry. * [NOD-1319] Implement getConnectedPeerInfo. * [NOD-1319] Delete the old RPC. * [NOD-1319] Fix a fromAppMessage. * [NOD-1319] Implement connectToPeer. * [NOD-1319] Fix a bug in registerForBlockAddedNotifications. * [NOD-1319] Fix a deadlock in closing notification listeners. * [NOD-1319] Fix merge errors. * [NOD-1319] Fix an import. * [NOD-1319] Properly handle errors in grpcclient. * [NOD-1319] Fix TestIBD. * [NOD-1319] Prevent kaspaminer from running when not connected. * [NOD-1319] Implement sendRawTransaction. * [NOD-1319] Implement sendRawTransaction in the client. * [NOD-1319] Extract a general RPC client from the integration test RPC client. * [NOD-1319] Use the general RPC client for the miner. * [NOD-1319] Move the rpcclient package out of netadapter. * [NOD-1319] Normalize onBlockAdded. * [NOD-1319] Begin implementing notifyChainChanged. * [NOD-1319] Implement the model for notifyChainChanged. * [NOD-1319] Implement conversions for notifyChainChanged. * [NOD-1319] Implement HandleNotifyChainChanged. * [NOD-1319] Normalize notifications. * [NOD-1319] Implement RegisterForChainChangedNotifications. * [NOD-1319] Begin connecting blockdag's chain-changed notification with the RPC. * [NOD-1319] Finish implementing notifyChainChanged. * [NOD-1319] Implement getBlockHex. * [NOD-1319] Rename getBlockHex to getBlock. * [NOD-1319] Implement the verbose model for getBlock. * [NOD-1319] Implement buildBlockVerboseData. * [NOD-1319] Implement buildTransactionVerboseData. * [NOD-1319] Move verboseData stuff to verbosedata.go. * [NOD-1319] Add includeTransactionVerboseData. * [NOD-1319] Begin implementing getSubnetwork. * [NOD-1319] Finish implementing getSubnetwork. * [NOD-1319] Begin implementing getChainFromBlock. * [NOD-1319] Finish implementing getChainFromBlock. * [NOD-1319] Begin implementing getBlocks. * [NOD-1319] Finish implementing getBlocks. * [NOD-1319] Fix bad responses in HandleNotifyChainChanged. * [NOD-1319] Fix bugs in verbosedata.go. * [NOD-1319] Fix more bugs in verbosedata.go. * [NOD-1319] Make go vet happy. * [NOD-1319] Extract handleBlockDAGNotifications to a method. * [NOD-1319] Add a newline. * [NOD-1319] Use peers instead of connections to check if connected. * [NOD-1319] Add a comment. * [NOD-1319] Lock the dag lock in getBlock. * [NOD-1319] Rename netAdapter.connections to p2pConnections. * [NOD-1319] In protowire, rename wireXXX to protoXXX. * [NOD-1319] Rename PostString to PostJSON. * [NOD-1319] Disallow empty transactions in SendRawTransaction. * [NOD-1319] Disallow empty blocks in SubmitBlocks. * [NOD-1319] Add SetLogger. * [NOD-1319] Fix an error message. * [NOD-1319] Fix an error message. * [NOD-1319] Rename testTimeout to rpcTimeout. * [NOD-1319] Rename SendRawTransaction to SubmitTransaction. * [NOD-1319] Rename ConnectToPeer to AddPeer. * [NOD-1319] Add missing longPollID to request. * [NOD-1319] Rename ChainChangedChainBlock to ChainBlock. * [NOD-1319] Rename Vin and Vout. * [NOD-1319] Implement RPCErrorf. * [NOD-1319] Fix RPCErrorf's comment. * [NOD-1319] Remove unused flags in kaspaminer.
71 lines
1.6 KiB
Go
71 lines
1.6 KiB
Go
package integration
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
func connect(t *testing.T, incoming, outgoing *appHarness) {
|
|
err := outgoing.rpcClient.AddPeer(incoming.p2pAddress, false)
|
|
if err != nil {
|
|
t.Fatalf("Error connecting the nodes")
|
|
}
|
|
|
|
onConnectedChan := make(chan struct{})
|
|
abortConnectionChan := make(chan struct{})
|
|
defer close(abortConnectionChan)
|
|
|
|
spawn("integration.connect-Wait for connection", func() {
|
|
ticker := time.NewTicker(10 * time.Millisecond)
|
|
defer ticker.Stop()
|
|
|
|
for range ticker.C {
|
|
if isConnected(t, incoming, outgoing) {
|
|
close(onConnectedChan)
|
|
return
|
|
}
|
|
|
|
select {
|
|
case <-abortConnectionChan:
|
|
return
|
|
default:
|
|
}
|
|
}
|
|
})
|
|
|
|
select {
|
|
case <-onConnectedChan:
|
|
case <-time.After(defaultTimeout):
|
|
t.Fatalf("Timed out waiting for the apps to connect")
|
|
}
|
|
}
|
|
func isConnected(t *testing.T, appHarness1, appHarness2 *appHarness) bool {
|
|
connectedPeerInfo1, err := appHarness1.rpcClient.GetConnectedPeerInfo()
|
|
if err != nil {
|
|
t.Fatalf("Error getting connected peer info for app1: %+v", err)
|
|
}
|
|
connectedPeerInfo2, err := appHarness2.rpcClient.GetConnectedPeerInfo()
|
|
if err != nil {
|
|
t.Fatalf("Error getting connected peer info for app2: %+v", err)
|
|
}
|
|
|
|
var incomingConnected, outgoingConnected bool
|
|
app1ID, app2ID := appHarness1.app.P2PNodeID().String(), appHarness2.app.P2PNodeID().String()
|
|
|
|
for _, connectedPeer := range connectedPeerInfo1.Infos {
|
|
if connectedPeer.ID == app2ID {
|
|
incomingConnected = true
|
|
break
|
|
}
|
|
}
|
|
|
|
for _, connectedPeer := range connectedPeerInfo2.Infos {
|
|
if connectedPeer.ID == app1ID {
|
|
outgoingConnected = true
|
|
break
|
|
}
|
|
}
|
|
|
|
return incomingConnected && outgoingConnected
|
|
}
|