updates

cmd/gofs/main.go

@@ -267,8 +267,8 @@ func Pin(ctx context.Context, rpcURL string, contract common.Address, pk *ecdsa.
  case types.ReceiptStatusFailed:
  return fmt.Errorf("tx %s failed", h.Hex())
  case types.ReceiptStatusSuccessful:
- fmt.Printf("Purchased %d GigaByte Hours of storage for %s.\n", dur, ci)
- fmt.Printf(`https://testnet-explorer.gochain.io/tx/%s`, h.Hex())
+ fmt.Printf("Purchased %d GigaByteHours of storage for %s.\n", dur, ci)
+ fmt.Printf("https://testnet-explorer.gochain.io/tx/%s\n", h.Hex())
  return nil
  default:
  return fmt.Errorf("tx %s unrecognized receipt status: %d", h.Hex(), r.Status)

gofs.go

@@ -1,6 +1,7 @@
 package gofs
 
 import (
+ "bytes"
  "context"
  "crypto/ecdsa"
  "errors"
@@ -23,7 +24,7 @@ import (
 
 var (
  pinnerABI abi.ABI
- pinInputs abi.Arguments
+ pinMethod abi.Method
 )
 
 func init() {
@@ -32,7 +33,7 @@ func init() {
  panic(fmt.Sprintf("failed to parse generated abi: %v", err))
  }
  pinnerABI = parsed
- pinInputs = pinnerABI.Methods["pin"].Inputs
+ pinMethod = pinnerABI.Methods["pin"]
 }
 
 func Rate(ctx context.Context, rpcURL string, contract common.Address) (*big.Int, error) {
@@ -157,12 +158,15 @@ type EventFilter struct {
 }
 
 type PinInputs struct {
- CID []byte
- GBH *big.Int
+ CID []byte `abi:"cid"`
+ GBH *big.Int `abi:"gbh"`
 }
 
+// UnpackPinInputs returns arguments from a pin call.
+// Handles full tx data, or plain inputs.
 func UnpackPinInputs(data []byte) (pi PinInputs, err error) {
- err = pinInputs.Unpack(&pinInputs, data)
+ data = bytes.TrimPrefix(data, pinMethod.Id())
+ err = pinMethod.Inputs.Unpack(&pi, data)
  return
 }
 

gofs_test.go

@@ -0,0 +1,37 @@
+package gofs
+
+import (
+ "bytes"
+ "math/big"
+ "testing"
+)
+
+func TestUnpackPinInputs(t *testing.T) {
+ cid, gbh := []byte("test"), big.NewInt(10)
+ data, err := pinMethod.Inputs.Pack(cid, gbh)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ pi, err := UnpackPinInputs(data)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if !bytes.Equal(cid, pi.CID) {
+ t.Error("cid wrong")
+ }
+ if pi.GBH.Cmp(gbh) != 0 {
+ t.Error("gbh wrong")
+ }
+
+ pi, err = UnpackPinInputs(append(pinMethod.Id(), data...))
+ if err != nil {
+ t.Fatal(err)
+ }
+ if !bytes.Equal(cid, pi.CID) {
+ t.Error("cid wrong")
+ }
+ if pi.GBH.Cmp(gbh) != 0 {
+ t.Error("gbh wrong")
+ }
+}