Merge pull request #19 from danl5/pkg_access

The internal implementation should be more accessible
danl5 · May 10, 2024 · 2601e19 · 2601e19
2 parents e1bafb0 + ab6187d
commit 2601e19
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 22 deletions.
diff --git a/cmd/tool/visualize/visualize.go b/cmd/tool/visualize/visualize.go
@@ -6,9 +6,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/danl5/goelect/internal/config"
-	"github.com/danl5/goelect/internal/consensus"
-	"github.com/danl5/goelect/internal/model"
+	"github.com/danl5/goelect/pkg/config"
+	"github.com/danl5/goelect/pkg/consensus"
+	"github.com/danl5/goelect/pkg/model"
 )
 
 var (

diff --git a/elect.go b/elect.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"time"
 
-	"github.com/danl5/goelect/internal/config"
-	"github.com/danl5/goelect/internal/consensus"
-	"github.com/danl5/goelect/internal/log"
-	"github.com/danl5/goelect/internal/model"
-	"github.com/danl5/goelect/internal/rpc"
+	"github.com/danl5/goelect/pkg/config"
+	"github.com/danl5/goelect/pkg/consensus"
+	"github.com/danl5/goelect/pkg/log"
+	"github.com/danl5/goelect/pkg/model"
+	"github.com/danl5/goelect/pkg/rpc"
 )
 
 const (

diff --git a/examples/onenode/node.go b/examples/onenode/node.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/danl5/goelect"
-	"github.com/danl5/goelect/internal/model"
+	"github.com/danl5/goelect/pkg/model"
 )
 
 var (

diff --git a/internal/common/message.go → pkg/common/message.go b/internal/common/message.go → pkg/common/message.go
diff --git a/internal/common/rpc_handler.go → pkg/common/rpc_handler.go b/internal/common/rpc_handler.go → pkg/common/rpc_handler.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/danl5/goelect/internal/model"
+	"github.com/danl5/goelect/pkg/model"
 )
 
 type RpcHandler interface {

diff --git a/internal/config/config.go → pkg/config/config.go b/internal/config/config.go → pkg/config/config.go
diff --git a/internal/consensus/consensus.go → pkg/consensus/consensus.go b/internal/consensus/consensus.go → pkg/consensus/consensus.go
@@ -11,10 +11,10 @@ import (
 	"github.com/looplab/fsm"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/danl5/goelect/internal/config"
-	"github.com/danl5/goelect/internal/log"
-	"github.com/danl5/goelect/internal/model"
-	"github.com/danl5/goelect/internal/rpc"
+	"github.com/danl5/goelect/pkg/config"
+	"github.com/danl5/goelect/pkg/log"
+	"github.com/danl5/goelect/pkg/model"
+	"github.com/danl5/goelect/pkg/rpc"
 )
 
 func NewConsensus(cfg *config.Config, logger log.Logger, node model.ElectNode) (*Consensus, error) {

diff --git a/internal/consensus/consensus_rpc.go → pkg/consensus/consensus_rpc.go b/internal/consensus/consensus_rpc.go → pkg/consensus/consensus_rpc.go
@@ -1,10 +1,10 @@
 package consensus
 
 import (
-	"github.com/danl5/goelect/internal/common"
-	"github.com/danl5/goelect/internal/config"
-	"github.com/danl5/goelect/internal/log"
-	"github.com/danl5/goelect/internal/model"
+	"github.com/danl5/goelect/pkg/common"
+	"github.com/danl5/goelect/pkg/config"
+	"github.com/danl5/goelect/pkg/log"
+	"github.com/danl5/goelect/pkg/model"
 )
 
 func NewConsensusRpcHandler(cfg *config.Config, logger log.Logger, node model.ElectNode) (*RpcHandler, error) {

diff --git a/internal/consensus/consensus_test.go → pkg/consensus/consensus_test.go b/internal/consensus/consensus_test.go → pkg/consensus/consensus_test.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/danl5/goelect/internal/common"
-	"github.com/danl5/goelect/internal/log"
-	"github.com/danl5/goelect/internal/model"
+	"github.com/danl5/goelect/pkg/common"
+	"github.com/danl5/goelect/pkg/log"
+	"github.com/danl5/goelect/pkg/model"
 )
 
 func TestConsensus_HeartBeat(t *testing.T) {

diff --git a/internal/log/log.go → pkg/log/log.go b/internal/log/log.go → pkg/log/log.go
diff --git a/internal/model/command.go → pkg/model/command.go b/internal/model/command.go → pkg/model/command.go
diff --git a/internal/model/event.go → pkg/model/event.go b/internal/model/event.go → pkg/model/event.go
diff --git a/internal/model/node.go → pkg/model/node.go b/internal/model/node.go → pkg/model/node.go
diff --git a/internal/model/state.go → pkg/model/state.go b/internal/model/state.go → pkg/model/state.go
diff --git a/internal/rpc/helper.go → pkg/rpc/helper.go b/internal/rpc/helper.go → pkg/rpc/helper.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/silenceper/pool"
 
-	"github.com/danl5/goelect/internal/log"
+	"github.com/danl5/goelect/pkg/log"
 )
 
 const (
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ import ( @@
     	"time"
     	"github.com/danl5/goelect"
-    	"github.com/danl5/goelect/internal/model"
+    	"github.com/danl5/goelect/pkg/model"
     )
     var (
@@ Expand Down @@