Skip to content

Commit

Permalink
all: remove license handling code
Browse files Browse the repository at this point in the history
Signed-off-by: Jacob Howard <jacob@mutagen.io>
  • Loading branch information
xenoscopic committed Jan 30, 2024
1 parent 32f76b4 commit 8e04d2b
Show file tree
Hide file tree
Showing 36 changed files with 10 additions and 2,602 deletions.
12 changes: 0 additions & 12 deletions cmd/mutagen/daemon/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,6 @@ func runMain(_ *cobra.Command, _ []string) error {
}
logger := logging.NewLogger(logLevel, os.Stderr)

// Initialize the licensing manager and defer its shutdown. This must be
// done before creating forwarding and synchronization session managers
// because those sessions may depend on a Mutagen Pro license. Both of these
// operations are no-ops in non-SSPL builds.
if err := initializeLicenseManager(logger.Sublogger("license")); err != nil {
return fmt.Errorf("unable to initialize license manager: %w", err)
}
defer shutdownLicenseManager()

// Create a forwarding session manager and defer its shutdown.
forwardingManager, err := forwarding.NewManager(logger.Sublogger("forward"))
if err != nil {
Expand Down Expand Up @@ -94,9 +85,6 @@ func runMain(_ *cobra.Command, _ []string) error {
defer daemonServer.Shutdown()
daemonsvc.RegisterDaemonServer(server, daemonServer)

// Register the licensing service. This is a no-op in non-SSPL builds.
registerLicensingService(server)

// Create and register the prompt server.
promptingsvc.RegisterPromptingServer(server, promptingsvc.NewServer())

Expand Down
28 changes: 0 additions & 28 deletions cmd/mutagen/daemon/run_nosspl.go

This file was deleted.

47 changes: 0 additions & 47 deletions cmd/mutagen/daemon/run_sspl.go

This file was deleted.

1 change: 0 additions & 1 deletion cmd/mutagen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ func init() {
legalCommand,
generateCommand,
)
registerLicenseCommand()

// Enable color output support for all commands in the hierarchy.
rootCommand.SetOut(color.Output)
Expand Down
7 changes: 0 additions & 7 deletions cmd/mutagen/main_nosspl.go

This file was deleted.

13 changes: 0 additions & 13 deletions cmd/mutagen/main_sspl.go

This file was deleted.

5 changes: 5 additions & 0 deletions pkg/synchronization/compression/zstandard_sspl.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ import (
"github.com/mutagen-io/mutagen/sspl/pkg/compression/zstd"
)

// zstandardSupportStatus returns Zstandard compression support status.
func zstandardSupportStatus() AlgorithmSupportStatus {
return AlgorithmSupportStatusSupported
}

// compressZstandard implements compression for Zstandard streams.
func compressZstandard(compressed io.Writer) stream.WriteFlushCloser {
return zstd.NewCompressor(compressed)
Expand Down
16 changes: 0 additions & 16 deletions pkg/synchronization/compression/zstandard_sspl_cli.go

This file was deleted.

8 changes: 0 additions & 8 deletions pkg/synchronization/compression/zstandard_sspl_other.go

This file was deleted.

5 changes: 5 additions & 0 deletions pkg/synchronization/hashing/xxh128_sspl.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ import (
"github.com/mutagen-io/mutagen/sspl/pkg/hashing/xxh128"
)

// xxh128SupportStatus returns XXH128 hashing support status.
func xxh128SupportStatus() AlgorithmSupportStatus {
return AlgorithmSupportStatusSupported
}

// newXXH128Factory creates a new hasher factory for XXH128 hashers.
func newXXH128Factory() func() hash.Hash {
return xxh128.New
Expand Down
16 changes: 0 additions & 16 deletions pkg/synchronization/hashing/xxh128_sspl_cli.go

This file was deleted.

8 changes: 0 additions & 8 deletions pkg/synchronization/hashing/xxh128_sspl_other.go

This file was deleted.

94 changes: 0 additions & 94 deletions sspl/cmd/mutagen/license/activate.go

This file was deleted.

84 changes: 0 additions & 84 deletions sspl/cmd/mutagen/license/deactivate.go

This file was deleted.

Loading

0 comments on commit 8e04d2b

Please sign in to comment.