Skip to content

Commit

Permalink
remove redis, achieve 43.6% of avg binary reduction, autorelay error?
Browse files Browse the repository at this point in the history
  • Loading branch information
Simbad Marino authored and Simbad Marino committed Sep 28, 2023
1 parent 60f054b commit 451cfde
Show file tree
Hide file tree
Showing 114 changed files with 313 additions and 830 deletions.
3 changes: 2 additions & 1 deletion autoupdate/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import (

"github.com/bittorrent/go-btfs/logger"

"github.com/bittorrent/go-btfs-api"
//"github.com/bittorrent/go-btfs-api"
//"github.com/simbadMarino/go-btfs-api"
)

var log = logger.InitLogger("update.log").Sugar()
Expand Down
Binary file modified cmd/btfs/.DS_Store
Binary file not shown.
3 changes: 2 additions & 1 deletion cmd/btfs/autoupdate.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import (
"time"

btfs_version "github.com/bittorrent/go-btfs"
"github.com/bittorrent/go-btfs-api"
//"github.com/bittorrent/go-btfs-api"
"github.com/simbadMarino/go-btfs-api"
//"github.com/mholt/archiver/v3"
"github.com/pkg/errors"
"gopkg.in/yaml.v2"
Expand Down
2 changes: 1 addition & 1 deletion cmd/btfs/btfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

commands "github.com/bittorrent/go-btfs/core/commands"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
)

// This is the CLI root, used for executing commands accessible to CLI clients.
Expand Down
2 changes: 1 addition & 1 deletion cmd/btfs/chain_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"gotest.tools/assert"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
Cfg "github.com/bittorrent/go-btfs-config"
//"github.com/bittorrent/go-btfs/chain"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/btfs/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
//"github.com/bittorrent/go-btfs/guide"

version "github.com/bittorrent/go-btfs"
cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
config "github.com/bittorrent/go-btfs-config"
cserial "github.com/bittorrent/go-btfs-config/serialize"
"github.com/bittorrent/go-btfs/bindata"
Expand Down
2 changes: 1 addition & 1 deletion cmd/btfs/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/bittorrent/go-btfs/namesys"
fsrepo "github.com/bittorrent/go-btfs/repo/fsrepo"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
config "github.com/bittorrent/go-btfs-config"
files "github.com/bittorrent/go-btfs-files"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/btfs/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
repo "github.com/bittorrent/go-btfs/repo"
fsrepo "github.com/bittorrent/go-btfs/repo/fsrepo"

cmds "github.com/bittorrent/go-btfs-cmds"
"github.com/bittorrent/go-btfs-cmds/cli"
cmdhttp "github.com/bittorrent/go-btfs-cmds/http"
cmds "github.com/simbadMarino/go-btfs-cmds"
"github.com/simbadMarino/go-btfs-cmds/cli"
cmdhttp "github.com/simbadMarino/go-btfs-cmds/http"
config "github.com/bittorrent/go-btfs-config"
u "github.com/ipfs/go-ipfs-util"
logging "github.com/ipfs/go-log"
Expand Down
3 changes: 2 additions & 1 deletion cmd/btfs_lib/autoupdate.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import (
"time"

btfs_version "github.com/bittorrent/go-btfs"
"github.com/bittorrent/go-btfs-api"
//"github.com/bittorrent/go-btfs-api"
"github.com/simbadMarino/go-btfs-api"
//"github.com/mholt/archiver/v3"
"github.com/pkg/errors"
"gopkg.in/yaml.v2"
Expand Down
2 changes: 1 addition & 1 deletion cmd/btfs_lib/btfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

commands "github.com/bittorrent/go-btfs/core/commands"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
)

// This is the CLI root, used for executing commands accessible to CLI clients.
Expand Down
2 changes: 1 addition & 1 deletion cmd/btfs_lib/chain_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"gotest.tools/assert"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
Cfg "github.com/bittorrent/go-btfs-config"
//"github.com/bittorrent/go-btfs/chain"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/btfs_lib/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
//"github.com/bittorrent/go-btfs/guide"

version "github.com/bittorrent/go-btfs"
cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
config "github.com/bittorrent/go-btfs-config"
cserial "github.com/bittorrent/go-btfs-config/serialize"
"github.com/bittorrent/go-btfs/bindata"
Expand Down
2 changes: 1 addition & 1 deletion cmd/btfs_lib/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/bittorrent/go-btfs/namesys"
fsrepo "github.com/bittorrent/go-btfs/repo/fsrepo"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
config "github.com/bittorrent/go-btfs-config"
files "github.com/bittorrent/go-btfs-files"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/btfs_lib/main_lib.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
repo "github.com/bittorrent/go-btfs/repo"
fsrepo "github.com/bittorrent/go-btfs/repo/fsrepo"

cmds "github.com/bittorrent/go-btfs-cmds"
"github.com/bittorrent/go-btfs-cmds/cli"
cmdhttp "github.com/bittorrent/go-btfs-cmds/http"
cmds "github.com/simbadMarino/go-btfs-cmds"
"github.com/simbadMarino/go-btfs-cmds/cli"
cmdhttp "github.com/simbadMarino/go-btfs-cmds/http"
config "github.com/bittorrent/go-btfs-config"
u "github.com/ipfs/go-ipfs-util"
logging "github.com/ipfs/go-log"
Expand Down
2 changes: 1 addition & 1 deletion commands/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
coreapi "github.com/bittorrent/go-btfs/core/coreapi"
loader "github.com/bittorrent/go-btfs/plugin/loader"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
config "github.com/bittorrent/go-btfs-config"
coreiface "github.com/bittorrent/interface-go-btfs-core"
options "github.com/bittorrent/interface-go-btfs-core/options"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/active.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

oldcmds "github.com/bittorrent/go-btfs/commands"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion core/commands/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/bittorrent/go-btfs/core/commands/cmdenv"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
files "github.com/bittorrent/go-btfs-files"
coreiface "github.com/bittorrent/interface-go-btfs-core"
"github.com/bittorrent/interface-go-btfs-core/options"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/bitswap.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
cmdenv "github.com/bittorrent/go-btfs/core/commands/cmdenv"
e "github.com/bittorrent/go-btfs/core/commands/e"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
humanize "github.com/dustin/go-humanize"
bitswap "github.com/ipfs/go-bitswap"
decision "github.com/ipfs/go-bitswap/decision"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/block.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
util "github.com/bittorrent/go-btfs/blocks/blockstoreutil"
cmdenv "github.com/bittorrent/go-btfs/core/commands/cmdenv"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
files "github.com/bittorrent/go-btfs-files"
options "github.com/bittorrent/interface-go-btfs-core/options"
path "github.com/bittorrent/interface-go-btfs-core/path"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
repo "github.com/bittorrent/go-btfs/repo"
fsrepo "github.com/bittorrent/go-btfs/repo/fsrepo"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
config "github.com/bittorrent/go-btfs-config"
peer "github.com/libp2p/go-libp2p/core/peer"
ma "github.com/multiformats/go-multiaddr"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/cat.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/bittorrent/go-btfs/core/commands/cmdenv"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
files "github.com/bittorrent/go-btfs-files"
iface "github.com/bittorrent/interface-go-btfs-core"
"github.com/bittorrent/interface-go-btfs-core/options"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/cid.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"unicode"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
cid "github.com/ipfs/go-cid"
cidutil "github.com/ipfs/go-cidutil"
verifcid "github.com/ipfs/go-verifcid"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/cmdenv/cidbase.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
cid "github.com/ipfs/go-cid"
cidenc "github.com/ipfs/go-cidutil/cidenc"
mbase "github.com/multiformats/go-multibase"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/cmdenv/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/bittorrent/go-btfs/commands"
"github.com/bittorrent/go-btfs/core"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
config "github.com/bittorrent/go-btfs-config"
coreiface "github.com/bittorrent/interface-go-btfs-core"
options "github.com/bittorrent/interface-go-btfs-core/options"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/cmdenv/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
gopath "path"
"strings"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
config "github.com/bittorrent/go-btfs-config"
files "github.com/bittorrent/go-btfs-files"
"github.com/bittorrent/go-btfs/core"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"sort"
"strings"

"github.com/bittorrent/go-btfs-cmds"
"github.com/simbadMarino/go-btfs-cmds"
)

type commandEncoder struct {
Expand Down
2 changes: 1 addition & 1 deletion core/commands/commands_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"
"testing"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
)

func collectPaths(prefix string, cmd *cmds.Command, out map[string]struct{}) {
Expand Down
2 changes: 1 addition & 1 deletion core/commands/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/bittorrent/go-btfs/repo/fsrepo"
"github.com/ethereum/go-ethereum/common"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
config "github.com/bittorrent/go-btfs-config"
"github.com/elgris/jsondiff"
)
Expand Down
2 changes: 1 addition & 1 deletion core/commands/dag/dag.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/bittorrent/go-btfs/core/coredag"
iface "github.com/bittorrent/interface-go-btfs-core"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
files "github.com/bittorrent/go-btfs-files"
"github.com/bittorrent/interface-go-btfs-core/options"
path "github.com/bittorrent/interface-go-btfs-core/path"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/dag/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
cid "github.com/ipfs/go-cid"
ipld "github.com/ipfs/go-ipld-format"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
gocar "github.com/ipld/go-car"
selectorparse "github.com/ipld/go-ipld-prime/traversal/selector/parse"
)
Expand Down
2 changes: 1 addition & 1 deletion core/commands/dht.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

cmdenv "github.com/bittorrent/go-btfs/core/commands/cmdenv"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
cid "github.com/ipfs/go-cid"
ipld "github.com/ipfs/go-ipld-format"
dag "github.com/ipfs/go-merkledag"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/diag.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package commands

import (
cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
)

var DiagCmd = &cmds.Command{
Expand Down
2 changes: 1 addition & 1 deletion core/commands/dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
namesys "github.com/bittorrent/go-btfs/namesys"
nsopts "github.com/bittorrent/interface-go-btfs-core/options/namesys"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion core/commands/external.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os/exec"
"strings"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
)

func ExternalBinary(instructions string) *cmds.Command {
Expand Down
2 changes: 1 addition & 1 deletion core/commands/extra.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package commands

import cmds "github.com/bittorrent/go-btfs-cmds"
import cmds "github.com/simbadMarino/go-btfs-cmds"

func CreateCmdExtras(opts ...func(e *cmds.Extra)) *cmds.Extra {
e := new(cmds.Extra)
Expand Down
2 changes: 1 addition & 1 deletion core/commands/files.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/bittorrent/go-btfs/core"
"github.com/bittorrent/go-btfs/core/commands/cmdenv"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
"github.com/bittorrent/go-mfs"
ft "github.com/bittorrent/go-unixfs"
iface "github.com/bittorrent/interface-go-btfs-core"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/filestore.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io"
"os"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
core "github.com/bittorrent/go-btfs/core"
cmdenv "github.com/bittorrent/go-btfs/core/commands/cmdenv"
e "github.com/bittorrent/go-btfs/core/commands/e"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"time"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
"github.com/bittorrent/go-btfs/core/commands/cmdenv"
"github.com/bittorrent/go-btfs/core/commands/e"

Expand Down
2 changes: 1 addition & 1 deletion core/commands/get_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
)

func TestGetOutputPath(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion core/commands/helptext_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"
"testing"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
)

func checkHelptextRecursive(t *testing.T, name []string, c *cmds.Command) {
Expand Down
4 changes: 2 additions & 2 deletions core/commands/id.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import (
"strings"

version "github.com/bittorrent/go-btfs"
cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
////"github.com/bittorrent/go-btfs/chain"
"github.com/bittorrent/go-btfs/core"
"github.com/bittorrent/go-btfs/core/commands/cmdenv"
ke "github.com/bittorrent/go-btfs/core/commands/keyencode"

"github.com/bittorrent/go-btfs-common/crypto"
"github.com/simbadMarino/go-btfs-common/crypto"
kb "github.com/libp2p/go-libp2p-kbucket"
ic "github.com/libp2p/go-libp2p/core/crypto"
"github.com/libp2p/go-libp2p/core/host"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/keyencode/keyencode.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package keyencode

import (
cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
peer "github.com/libp2p/go-libp2p/core/peer"
mbase "github.com/multiformats/go-multibase"
)
Expand Down
2 changes: 1 addition & 1 deletion core/commands/keystore.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
cmdenv "github.com/bittorrent/go-btfs/core/commands/cmdenv"
ke "github.com/bittorrent/go-btfs/core/commands/keyencode"

cmds "github.com/bittorrent/go-btfs-cmds"
cmds "github.com/simbadMarino/go-btfs-cmds"
options "github.com/bittorrent/interface-go-btfs-core/options"
)

Expand Down
Loading

0 comments on commit 451cfde

Please sign in to comment.