Updated package structure

keep-network · May 2, 2024 · 9b1786a · 9b1786a
1 parent abad9ad
commit 9b1786a
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 8 deletions.
diff --git a/pkg/chain/ethereum/tbtc.go b/pkg/chain/ethereum/tbtc.go
@@ -25,10 +25,10 @@ import (
 	"github.com/keep-network/keep-core/pkg/internal/byteutils"
 	"github.com/keep-network/keep-core/pkg/operator"
 	"github.com/keep-network/keep-core/pkg/protocol/group"
+	"github.com/keep-network/keep-core/pkg/protocol/inactivity"
 	"github.com/keep-network/keep-core/pkg/subscription"
 	"github.com/keep-network/keep-core/pkg/tbtc"
 	"github.com/keep-network/keep-core/pkg/tecdsa/dkg"
-	"github.com/keep-network/keep-core/pkg/tecdsa/inactivity"
 )
 
 // Definitions of contract names.

diff --git a/pkg/tecdsa/inactivity/claim.go → pkg/protocol/inactivity/claim.go b/pkg/tecdsa/inactivity/claim.go → pkg/protocol/inactivity/claim.go
diff --git a/pkg/tecdsa/inactivity/gen/pb/message.pb.go → pkg/protocol/inactivity/gen/pb/message.pb.go b/pkg/tecdsa/inactivity/gen/pb/message.pb.go → pkg/protocol/inactivity/gen/pb/message.pb.go
diff --git a/pkg/tecdsa/inactivity/gen/pb/message.proto → pkg/protocol/inactivity/gen/pb/message.proto b/pkg/tecdsa/inactivity/gen/pb/message.proto → pkg/protocol/inactivity/gen/pb/message.proto
diff --git a/pkg/tecdsa/inactivity/inactivity.go → pkg/protocol/inactivity/inactivity.go b/pkg/tecdsa/inactivity/inactivity.go → pkg/protocol/inactivity/inactivity.go
diff --git a/pkg/tecdsa/inactivity/marshalling.go → pkg/protocol/inactivity/marshalling.go b/pkg/tecdsa/inactivity/marshalling.go → pkg/protocol/inactivity/marshalling.go
@@ -6,7 +6,7 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	"github.com/keep-network/keep-core/pkg/protocol/group"
-	"github.com/keep-network/keep-core/pkg/tecdsa/inactivity/gen/pb"
+	"github.com/keep-network/keep-core/pkg/protocol/inactivity/gen/pb"
 )
 
 func validateMemberIndex(protoIndex uint32) error {

diff --git a/pkg/tecdsa/inactivity/marshalling_test.go → pkg/protocol/inactivity/marshalling_test.go b/pkg/tecdsa/inactivity/marshalling_test.go → pkg/protocol/inactivity/marshalling_test.go
diff --git a/pkg/tecdsa/inactivity/member.go → pkg/protocol/inactivity/member.go b/pkg/tecdsa/inactivity/member.go → pkg/protocol/inactivity/member.go
diff --git a/pkg/tecdsa/inactivity/message.go → pkg/protocol/inactivity/message.go b/pkg/tecdsa/inactivity/message.go → pkg/protocol/inactivity/message.go
diff --git a/pkg/tecdsa/inactivity/states.go → pkg/protocol/inactivity/states.go b/pkg/tecdsa/inactivity/states.go → pkg/protocol/inactivity/states.go
diff --git a/pkg/tbtc/chain.go b/pkg/tbtc/chain.go
@@ -9,10 +9,10 @@ import (
 	"github.com/keep-network/keep-core/pkg/chain"
 	"github.com/keep-network/keep-core/pkg/operator"
 	"github.com/keep-network/keep-core/pkg/protocol/group"
+	"github.com/keep-network/keep-core/pkg/protocol/inactivity"
 	"github.com/keep-network/keep-core/pkg/sortition"
 	"github.com/keep-network/keep-core/pkg/subscription"
 	"github.com/keep-network/keep-core/pkg/tecdsa/dkg"
-	"github.com/keep-network/keep-core/pkg/tecdsa/inactivity"
 )
 
 type DKGState int

diff --git a/pkg/tbtc/chain_test.go b/pkg/tbtc/chain_test.go
@@ -22,9 +22,9 @@ import (
 	"github.com/keep-network/keep-core/pkg/chain/local_v1"
 	"github.com/keep-network/keep-core/pkg/operator"
 	"github.com/keep-network/keep-core/pkg/protocol/group"
+	"github.com/keep-network/keep-core/pkg/protocol/inactivity"
 	"github.com/keep-network/keep-core/pkg/subscription"
 	"github.com/keep-network/keep-core/pkg/tecdsa/dkg"
-	"github.com/keep-network/keep-core/pkg/tecdsa/inactivity"
 )
 
 const localChainOperatorID = chain.OperatorID(1)

diff --git a/pkg/tbtc/inactivity.go b/pkg/tbtc/inactivity.go
@@ -15,7 +15,7 @@ import (
 	"github.com/keep-network/keep-core/pkg/generator"
 	"github.com/keep-network/keep-core/pkg/net"
 	"github.com/keep-network/keep-core/pkg/protocol/group"
-	"github.com/keep-network/keep-core/pkg/tecdsa/inactivity"
+	"github.com/keep-network/keep-core/pkg/protocol/inactivity"
 )
 
 const (
@@ -47,7 +47,6 @@ type inactivityClaimExecutor struct {
 	waitForBlockFn waitForBlockFn
 }
 
-// TODO Consider moving all inactivity-related code to pkg/protocol/inactivity.
 func newInactivityClaimExecutor(
 	chain Chain,
 	signers []*signer,

diff --git a/pkg/tbtc/inactivity_submit.go b/pkg/tbtc/inactivity_submit.go
@@ -7,7 +7,7 @@ import (
 	"github.com/ipfs/go-log/v2"
 	"github.com/keep-network/keep-core/pkg/bitcoin"
 	"github.com/keep-network/keep-core/pkg/protocol/group"
-	"github.com/keep-network/keep-core/pkg/tecdsa/inactivity"
+	"github.com/keep-network/keep-core/pkg/protocol/inactivity"
 )
 
 // inactivityClaimSigner is responsible for signing the inactivity claim and

diff --git a/pkg/tbtc/node.go b/pkg/tbtc/node.go
@@ -18,7 +18,7 @@ import (
 	"github.com/keep-network/keep-core/pkg/net"
 	"github.com/keep-network/keep-core/pkg/protocol/announcer"
 	"github.com/keep-network/keep-core/pkg/protocol/group"
-	"github.com/keep-network/keep-core/pkg/tecdsa/inactivity"
+	"github.com/keep-network/keep-core/pkg/protocol/inactivity"
 	"github.com/keep-network/keep-core/pkg/tecdsa/signing"
 )