Skip to content

Commit

Permalink
fix: aepp-sdk-go was importing v1 of itself, causing havoc for module…
Browse files Browse the repository at this point in the history
… support. Now v5 should be totally standalone.
  • Loading branch information
randomshinichi committed Sep 13, 2019
1 parent 8732f08 commit 852dc24
Show file tree
Hide file tree
Showing 137 changed files with 383 additions and 215 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ When using the `Helper` methods in `helpers.go`, chores like getting the TTL, Ac
When using the `Context` methods in `helpers.go`, additional conveniences for AENS like Commitment ID calculation, Namehashing, are done for you.
For a painless experience when building transactions, use the `Context` methods.
```
import "github.com/aeternity/aepp-sdk-go/aeternity"
import "github.com/aeternity/aepp-sdk-go/v5/aeternity"
...
// create a Context for the address you're going to sign the transaction
Expand Down
4 changes: 2 additions & 2 deletions aeternity/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"reflect"

"github.com/aeternity/aepp-sdk-go/swagguard/node/client/external"
"github.com/aeternity/aepp-sdk-go/swagguard/node/models"
"github.com/aeternity/aepp-sdk-go/v5/swagguard/node/client/external"
"github.com/aeternity/aepp-sdk-go/v5/swagguard/node/models"
)

// getErrorReason parses the external.*BadRequest structs returned by the
Expand Down
6 changes: 3 additions & 3 deletions aeternity/compiler.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package aeternity

import (
compiler_client "github.com/aeternity/aepp-sdk-go/swagguard/compiler/client"
"github.com/aeternity/aepp-sdk-go/swagguard/compiler/client/operations"
models "github.com/aeternity/aepp-sdk-go/swagguard/compiler/models"
compiler_client "github.com/aeternity/aepp-sdk-go/v5/swagguard/compiler/client"
"github.com/aeternity/aepp-sdk-go/v5/swagguard/compiler/client/operations"
models "github.com/aeternity/aepp-sdk-go/v5/swagguard/compiler/models"
httptransport "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt"
)
Expand Down
2 changes: 1 addition & 1 deletion aeternity/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package aeternity
import (
"math/big"

"github.com/aeternity/aepp-sdk-go/utils"
"github.com/aeternity/aepp-sdk-go/v5/utils"
)

// Acceptable values for various parameters
Expand Down
2 changes: 1 addition & 1 deletion aeternity/hashing.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"math/big"
"strings"

"github.com/aeternity/aepp-sdk-go/utils"
"github.com/aeternity/aepp-sdk-go/v5/utils"
"github.com/btcsuite/btcutil/base58"
rlp "github.com/randomshinichi/rlpae"
uuid "github.com/satori/go.uuid"
Expand Down
4 changes: 2 additions & 2 deletions aeternity/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package aeternity
import (
"testing"

"github.com/aeternity/aepp-sdk-go/swagguard/node/models"
"github.com/aeternity/aepp-sdk-go/utils"
"github.com/aeternity/aepp-sdk-go/v5/swagguard/node/models"
"github.com/aeternity/aepp-sdk-go/v5/utils"
)

type mockClient struct {
Expand Down
2 changes: 1 addition & 1 deletion aeternity/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package aeternity
import (
"strings"

apiclient "github.com/aeternity/aepp-sdk-go/swagguard/node/client"
apiclient "github.com/aeternity/aepp-sdk-go/v5/swagguard/node/client"
httptransport "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt"
)
Expand Down
2 changes: 1 addition & 1 deletion aeternity/transactions.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io"
"math/big"

"github.com/aeternity/aepp-sdk-go/utils"
"github.com/aeternity/aepp-sdk-go/v5/utils"
rlp "github.com/randomshinichi/rlpae"
)

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

"github.com/aeternity/aepp-sdk-go/utils"
"github.com/aeternity/aepp-sdk-go/v5/utils"
)

func getRLPSerialized(tx1 string, tx2 string) ([]interface{}, []interface{}) {
Expand Down
4 changes: 2 additions & 2 deletions aeternity/tx_aens.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"io"
"math/big"

"github.com/aeternity/aepp-sdk-go/swagguard/node/models"
"github.com/aeternity/aepp-sdk-go/utils"
"github.com/aeternity/aepp-sdk-go/v5/swagguard/node/models"
"github.com/aeternity/aepp-sdk-go/v5/utils"
rlp "github.com/randomshinichi/rlpae"
)

Expand Down
2 changes: 1 addition & 1 deletion aeternity/tx_aens_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"reflect"
"testing"

"github.com/aeternity/aepp-sdk-go/utils"
"github.com/aeternity/aepp-sdk-go/v5/utils"
rlp "github.com/randomshinichi/rlpae"
)

Expand Down
4 changes: 2 additions & 2 deletions aeternity/tx_contracts.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"io"
"math/big"

"github.com/aeternity/aepp-sdk-go/swagguard/node/models"
"github.com/aeternity/aepp-sdk-go/utils"
"github.com/aeternity/aepp-sdk-go/v5/swagguard/node/models"
"github.com/aeternity/aepp-sdk-go/v5/utils"
rlp "github.com/randomshinichi/rlpae"
)

Expand Down
2 changes: 1 addition & 1 deletion aeternity/tx_contracts_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"reflect"
"testing"

"github.com/aeternity/aepp-sdk-go/utils"
"github.com/aeternity/aepp-sdk-go/v5/utils"
)

func TestContractTx(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions aeternity/tx_oracles.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"io"
"math/big"

"github.com/aeternity/aepp-sdk-go/swagguard/node/models"
"github.com/aeternity/aepp-sdk-go/utils"
"github.com/aeternity/aepp-sdk-go/v5/swagguard/node/models"
"github.com/aeternity/aepp-sdk-go/v5/utils"
rlp "github.com/randomshinichi/rlpae"
)

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

"github.com/aeternity/aepp-sdk-go/utils"
"github.com/aeternity/aepp-sdk-go/v5/utils"
)

func TestOracleTx(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions aeternity/tx_spend.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"io"
"math/big"

"github.com/aeternity/aepp-sdk-go/swagguard/node/models"
"github.com/aeternity/aepp-sdk-go/utils"
"github.com/aeternity/aepp-sdk-go/v5/swagguard/node/models"
"github.com/aeternity/aepp-sdk-go/v5/utils"
rlp "github.com/randomshinichi/rlpae"
)

Expand Down
2 changes: 1 addition & 1 deletion aeternity/tx_spend_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"reflect"
"testing"

"github.com/aeternity/aepp-sdk-go/utils"
"github.com/aeternity/aepp-sdk-go/v5/utils"
rlp "github.com/randomshinichi/rlpae"
)

Expand Down
4 changes: 2 additions & 2 deletions api/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -2486,7 +2486,7 @@
"minimum": 0,
"x-go-type": {
"import": {
"package": "github.com/aeternity/aepp-sdk-go/utils"
"package": "github.com/aeternity/aepp-sdk-go/v5/utils"
},
"type": "BigInt"
}
Expand All @@ -2508,7 +2508,7 @@
"minimum": -1,
"x-go-type": {
"import": {
"package": "github.com/aeternity/aepp-sdk-go/utils"
"package": "github.com/aeternity/aepp-sdk-go/v5/utils"
},
"type": "BigInt"
}
Expand Down
2 changes: 1 addition & 1 deletion api/updatedict.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def add_definitions(data):
"minimum": 0,
"x-go-type": {
"import": {
"package": "github.com/aeternity/aepp-sdk-go/utils"
"package": "github.com/aeternity/aepp-sdk-go/v5/utils"
},
"type": "BigInt"
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"runtime"
"sync"

"github.com/aeternity/aepp-sdk-go/aeternity"
"github.com/aeternity/aepp-sdk-go/v5/aeternity"

"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/account_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"os"
"testing"

"github.com/aeternity/aepp-sdk-go/aeternity"
"github.com/aeternity/aepp-sdk-go/v5/aeternity"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"errors"
"fmt"

"github.com/aeternity/aepp-sdk-go/aeternity"
"github.com/aeternity/aepp-sdk-go/v5/aeternity"
"github.com/spf13/cobra"
)

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

"github.com/aeternity/aepp-sdk-go/aeternity"
"github.com/aeternity/aepp-sdk-go/v5/aeternity"
)

// Prefixing each test with Example makes go-test check the stdout
Expand Down
2 changes: 1 addition & 1 deletion cmd/contract.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io/ioutil"
"os"

"github.com/aeternity/aepp-sdk-go/aeternity"
"github.com/aeternity/aepp-sdk-go/v5/aeternity"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/contract_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"os"
"testing"

"github.com/aeternity/aepp-sdk-go/aeternity"
"github.com/aeternity/aepp-sdk-go/v5/aeternity"
)

func Test_compileFunc(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/inspect.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"strconv"
"strings"

"github.com/aeternity/aepp-sdk-go/aeternity"
"github.com/aeternity/aepp-sdk-go/v5/aeternity"

"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/inspect_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
"testing"

"github.com/aeternity/aepp-sdk-go/aeternity"
"github.com/aeternity/aepp-sdk-go/v5/aeternity"
)

func Test_printNameEntry(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/mocks_test.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cmd

import (
compilermodels "github.com/aeternity/aepp-sdk-go/swagguard/compiler/models"
models "github.com/aeternity/aepp-sdk-go/swagguard/node/models"
compilermodels "github.com/aeternity/aepp-sdk-go/v5/swagguard/compiler/models"
models "github.com/aeternity/aepp-sdk-go/v5/swagguard/node/models"
)

type mockGetHeighter struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/name.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"

"github.com/aeternity/aepp-sdk-go/aeternity"
"github.com/aeternity/aepp-sdk-go/v5/aeternity"

"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"fmt"
"os"

"github.com/aeternity/aepp-sdk-go/aeternity"
"github.com/aeternity/aepp-sdk-go/v5/aeternity"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/terminal.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"time"

"github.com/aeternity/aepp-sdk-go/aeternity"
"github.com/aeternity/aepp-sdk-go/v5/aeternity"
)

func times(str string, n int) (out string) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/terminal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"testing"

"github.com/aeternity/aepp-sdk-go/utils"
"github.com/aeternity/aepp-sdk-go/v5/utils"
)

func Test_printIf_BigIntBalancePrinted(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/test_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"
"testing"

"github.com/aeternity/aepp-sdk-go/aeternity"
"github.com/aeternity/aepp-sdk-go/v5/aeternity"
)

func setPrivateNetParams() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"math/big"

"github.com/aeternity/aepp-sdk-go/utils"
"github.com/aeternity/aepp-sdk-go/v5/utils"

"github.com/aeternity/aepp-sdk-go/aeternity"
"github.com/aeternity/aepp-sdk-go/v5/aeternity"

"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/tx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
"testing"

"github.com/aeternity/aepp-sdk-go/aeternity"
"github.com/aeternity/aepp-sdk-go/v5/aeternity"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/validation.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cmd

import (
"github.com/aeternity/aepp-sdk-go/aeternity"
"github.com/aeternity/aepp-sdk-go/v5/aeternity"
)

// IsAddress does some minor checks to ensure that the string is an ak_ address
Expand Down

0 comments on commit 852dc24

Please sign in to comment.